aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-01-13 23:15:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-01-13 23:15:16 +0000
commit8c50d6d080062307e94f0f6e95f43d731e09716b (patch)
tree96ed2e86abc7ef9e7b147f3f243aaf62eefb280a
parent906c99b375548ea219a78133af801d61597f7c07 (diff)
downloadupstream-8c50d6d080062307e94f0f6e95f43d731e09716b.tar.gz
upstream-8c50d6d080062307e94f0f6e95f43d731e09716b.tar.bz2
upstream-8c50d6d080062307e94f0f6e95f43d731e09716b.zip
change the build order in target/linux so that it's possible to link the kernel with a ramdisk image
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2963 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/kernel.mk59
1 files changed, 32 insertions, 27 deletions
diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk
index 78c1a24a04..22c6d84124 100644
--- 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
- $(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
@@ -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
- $(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
-$(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)
-$(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
-$(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 $@
-$(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)
@@ -83,25 +90,23 @@ $(KERNEL_IPKG):
$(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)
- rm -f $(LINUX_KERNEL) $(LINUX_IMAGE)
+ rm -f $(LINUX_KERNEL)
rebuild:
-$(MAKE) mostlyclean