cleanup in target/

[openwrt.git] / openwrt / target / linux / linux-2.4 / Makefile

diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile
index c9b61a6..acbd2e1 100644 (file)
--- a/openwrt/target/linux/linux-2.4/Makefile
+++ b/openwrt/target/linux/linux-2.4/Makefile
@@ -24,7 +24,6 @@ LINUX_KCONFIG:=./config/$(BOARD)
 LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-2.4-$(BOARD)
 LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root
 LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
-LINUX_IMAGE:=$(LINUX_BUILD_DIR)/kernel-image
 LINUX_FORMAT=zImage
 LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
        -e 's/mipsel/mips/' \
@@ -40,16 +39,19 @@ MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
 TARGET_MODULES_DIR := $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)
 IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
 
+PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
+PKG_RELEASE := 1
+
+KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk
+KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
+
 include $(LINUX_KCONFIG)
 ifeq ($(BOARD),brcm)
 include ./broadcom.mk
 endif
 
-PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
-PKG_RELEASE := 1
-
 TARGETS := 
-INSTALL_TARGETS := 
+INSTALL_TARGETS := $(KERNEL_IPKG)
 
 $(eval $(call KMOD_template,DIAG,diag,\
        $(MODULES_DIR)/kernel/drivers/net/diag/diag.o \
@@ -74,7 +76,7 @@ $(eval $(call KMOD_template,IPTABLES_V4_EXTRA,iptables-extra,\
 ))
 $(eval $(call KMOD_template,IPTABLES_V6,ip6tables,\
        $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \
-,CONFIG_IP6_NF_IPTABLES))
+,CONFIG_IP6_NF_IPTABLES,kmod-ipv6))
 $(eval $(call KMOD_template,IPV6,ipv6,\
        $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
 ,CONFIG_IPV6))
@@ -91,13 +93,13 @@ $(eval $(call KMOD_template,USB,usb-core,\
 ,CONFIG_USB))
 $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\
        $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \
-,CONFIG_USB_UHCI_ALT))
+,CONFIG_USB_UHCI_ALT,kmod-usb-core))
 $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\
        $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \
-,CONFIG_USB_OHCI))
+,CONFIG_USB_OHCI,kmod-usb-core))
 $(eval $(call KMOD_template,USB2,usb2,\
        $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \
-,CONFIG_USB_EHCI_HCD))
+,CONFIG_USB_EHCI_HCD,kmod-usb-core))
 $(eval $(call KMOD_template,USB_STORAGE,usb-storage,\
        $(MODULES_DIR)/kernel/drivers/scsi/*.o \
        $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \
@@ -193,9 +195,6 @@ $(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
        cp -fa $< $@ 
        touch -c $(LINUX_KERNEL)
        
-$(LINUX_IMAGE): $(LINUX_KERNEL)
-       cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false)
-
 $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)
        rm -rf $(LINUX_BUILD_DIR)/modules
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
@@ -210,17 +209,28 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
 $(TARGET_MODULES_DIR): 
        -mkdir -p $(TARGET_MODULES_DIR)
 
+$(KERNEL_IPKG):
+       rm -rf $(KERNEL_IDIR)
+       mkdir -p $(KERNEL_IDIR)/etc
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH)
+       if [ -f ./config/$(BOARD).modules ]; then \
+               cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
+       fi
+       $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
+
 source: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(LINUX_DIR)/.configured
 compile: $(LINUX_DIR)/.modules_done $(TARGETS)
        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
        $(MAKE) -C $(TOPDIR)/target/linux/package \
+               BOARD="$(BOARD)" \
                TARGET_DIR="$(LINUX_TARGET_DIR)" \
                BUILD_DIR="$(LINUX_BUILD_DIR)" \
                KERNEL_DIR="$(LINUX_SOURCE_DIR)" \
-               LINUX_VERSION="$(LINUX_VERSION)"
+               LINUX_VERSION="$(LINUX_VERSION)" \
+               KERNEL_RELEASE="$(PKG_RELEASE)"
 
-install: compile $(TARGET_MODULES_DIR)
+install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
        rm -rf $(LINUX_BUILD_DIR)/root*
        cp -a $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
        echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf