move $(MAKE) packages from .linux-compile: to compile:

[openwrt-10.03/.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index a8c9e7fd25ea0139fdb5d33cbc5328007b4dad7a..c5b3668481b2e24c3af435be54b0dc004dba4d92 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -63,7 +63,7 @@ else
 endif
 
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) 
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
        $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
@@ -71,8 +71,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
 
 $(LINUX_DIR)/.modules_done:
        rm -rf $(KERNEL_BUILD_DIR)/modules
-       $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules
-       $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
+       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
        touch $(LINUX_DIR)/.modules_done
 
 modules: $(LINUX_DIR)/.modules_done
@@ -82,7 +82,6 @@ $(LINUX_DIR)/.linux-compile:
        @rm -f $(BUILD_DIR)/linux
        ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
        @$(MAKE) modules
-       @$(MAKE) packages
        touch $@
 
 $(KERNEL_IPKG):
@@ -94,10 +93,11 @@ $(KERNEL_IPKG):
        fi
        $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
 
-$(TOPDIR)/.kernel.mk:
-       echo "BOARD:=$(BOARD)" > $@
-       echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
-       echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
+       echo "CONFIG_BOARD:=$(BOARD)" > $@
+       echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
+       echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
+       echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
 
 pkg-install: FORCE
        @for pkg in $(INSTALL_TARGETS); do \
@@ -109,6 +109,7 @@ prepare: $(LINUX_DIR)/.configured
        @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR)
 
 compile: prepare $(LINUX_DIR)/.linux-compile
+       @$(MAKE) packages
 
 install: compile $(LINUX_KERNEL)