From 06b9e7abe73fa0fa2db1bc990ff590313b711586 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sun, 11 Jan 2009 20:43:24 +0000 Subject: [PATCH] Move kernel localversion files to TARGET_DIR/boot to allow packages which assumes that LINUX26_DIR and the /lib/modules/LINUX_VERSION use the consistent version numbering to build. Create a file ".linux-version" containing the real linux version in $(PROJECT_B UILD_DIR) to allow packages to read the correct linux version --- target/linux/Makefile.in.advanced | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index 51ddf41132..15dff261e1 100644 --- a/target/linux/Makefile.in.advanced +++ b/target/linux/Makefile.in.advanced @@ -223,7 +223,7 @@ endif # ----------------------------------------------------------------------------- -LINUX26_TARGETS+=$(LINUX26_KERNEL) +LINUX26_TARGETS+=$(LINUX26_KERNEL) linux26-version ifeq ($(BR2_LINUX_COPYTO_ROOTFS),y) LINUX26_TARGETS+=$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME) @@ -386,6 +386,7 @@ endif # ----------------------------------------------------------------------------- $(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(LINUX26_MKIMAGE_DEP) + -mv $(LINUX26_DIR)/localversion* $(TARGET_DIR)/boot $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $@ @@ -457,12 +458,18 @@ $(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL) cp -dpf $(LINUX26_KERNEL) $(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME) endif +$(PROJECT_BUILD_DIR)/.linux-version: + echo $(LINUX26_VERSION_PROBED) > $(PROJECT_BUILD_DIR)/.linux-version + echo LINUX_MODULES=$(LINUX26_VERSION_PROBED) + linux26-mkimage: u-boot mkdir -p $(LINUX26_MKIMAGE_DIR) cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR) linux26: $(LINUX26_TARGETS) +linux26-version: $(PROJECT_BUILD_DIR)/.linux-version + linux26-modules: cross-depmod26 $(PROJECT_BUILD_DIR)/autotools-stamps/linux_modules_target_installed linux26-source: $(DL_DIR)/$(LINUX26_SOURCE) -- 2.30.2