change the build order in target/linux so that it's possible to link the kernel with...

[openwrt.git] / target / linux / kernel.mk

diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index 78c1a24..22c6d84 100644 (file)
--- a/target/linux/kernel.mk
+++ b/target/linux/kernel.mk
@@ -28,7 +28,7 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
          $(LINUX_DIR)/Makefile  \
          $(LINUX_DIR)/arch/*/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
          $(LINUX_DIR)/Makefile  \
          $(LINUX_DIR)/arch/*/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile

-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h $(MAKE_TRACE)
+       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h $(MAKE_TRACE)

        touch $@
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
        touch $@
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured


@@ -38,40 +38,47 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched

-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig $(MAKE_TRACE)
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare $(MAKE_TRACE)

        touch $@
 endif
 
        touch $@
 endif
 

-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.configured
+$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile

        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(MAKE_TRACE)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
        $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(MAKE_TRACE)
        touch -c $(LINUX_KERNEL)
 
        $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(MAKE_TRACE)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
        $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(MAKE_TRACE)
        touch -c $(LINUX_KERNEL)
 

-$(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)
+$(LINUX_DIR)/.modules_done:

        rm -rf $(LINUX_BUILD_DIR)/modules
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules $(MAKE_TRACE)
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
        touch $(LINUX_DIR)/.modules_done
 
        rm -rf $(LINUX_BUILD_DIR)/modules
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules $(MAKE_TRACE)
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
        touch $(LINUX_DIR)/.modules_done
 

-$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-       mkdir -p $(STAGING_DIR)/include
-       tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-       tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
+# $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
+#      mkdir -p $(STAGING_DIR)/include
+#      tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
+#      tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/

 
 

-$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
-       @mkdir -p $(STAMP_DIR)
-       @$(MAKE) $(TARGETS)
-       ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
-       @$(TRACE) target/linux/package
+$(STAMP_DIR)/.linux-compile:
+       @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
+       ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
+       @$(TRACE) target/linux/package/compile

        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                compile
        touch $@
 
        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                compile
        touch $@
 

-$(TARGET_MODULES_DIR): 
-       -mkdir -p $(TARGET_MODULES_DIR)
+.PHONY: pkg-install
+pkg-install:
+       @mkdir -p $(TARGET_MODULES_DIR)
+       @rm -rf $(LINUX_BUILD_DIR)/root*
+       @cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
+       echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
+       $(MAKE) -C $(TOPDIR)/target/linux/package \
+               $(KPKG_MAKEOPTS) \
+               install
+       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true; } $(MAKE_TRACE) 

 
 $(KERNEL_IPKG):
        rm -rf $(KERNEL_IDIR)
 
 $(KERNEL_IPKG):
        rm -rf $(KERNEL_IDIR)


@@ -83,25 +90,23 @@ $(KERNEL_IPKG):
        $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE)
 
 source: $(DL_DIR)/$(LINUX_SOURCE)
        $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE)
 
 source: $(DL_DIR)/$(LINUX_SOURCE)

-prepare: $(PACKAGE_DIR) $(LINUX_DIR)/.configured
-compile:
-       $(MAKE) $(STAMP_DIR)/.linux-compile $(MAKE_TRACE)
+prepare: 
+       @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
+       @$(MAKE) $(LINUX_DIR)/.configured $(MAKE_TRACE)

 
 

-install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
-       rm -rf $(LINUX_BUILD_DIR)/root*
-       cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
-       echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
-       $(MAKE) -C $(TOPDIR)/target/linux/package \
-               $(KPKG_MAKEOPTS) \
-               install
-       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true; } $(MAKE_TRACE) 
+compile: prepare $(STAMP_DIR)/.linux-compile
+
+install: compile
+       @$(TRACE) target/linux/package/install
+       $(MAKE) pkg-install $(MAKE_TRACE)
+       $(MAKE) $(LINUX_KERNEL) $(MAKE_TRACE)

 
 mostlyclean:
        rm -f $(STAMP_DIR)/.linux-compile
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean $(MAKE_TRACE)
 
 mostlyclean:
        rm -f $(STAMP_DIR)/.linux-compile
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean $(MAKE_TRACE)

-       rm -f $(LINUX_KERNEL) $(LINUX_IMAGE)
+       rm -f $(LINUX_KERNEL)

 
 rebuild:
        -$(MAKE) mostlyclean
 
 rebuild:
        -$(MAKE) mostlyclean