diff options
| author | Thiago A. Corrêa <thiago.correa@gmail.com> | 2009-02-06 17:38:05 +0000 |
|---|---|---|
| committer | Thiago A. Corrêa <thiago.correa@gmail.com> | 2009-02-06 17:38:05 +0000 |
| commit | d16f8bf2cdf1b39cce2e44a317954d139f3258f4 (patch) | |
| tree | ec9188990b5c8de50e4381870cfbf99c519fa2da /target/linux/Makefile.in | |
| parent | 2f72570992fa3765ea21ebde75a76edfc4a60261 (diff) | |
| download | buildroot-novena-d16f8bf2cdf1b39cce2e44a317954d139f3258f4.tar.gz buildroot-novena-d16f8bf2cdf1b39cce2e44a317954d139f3258f4.zip | |
Simplify kernel naming scheme. Only use kernel name plus the rootfs suffix if one is provided
Diffstat (limited to 'target/linux/Makefile.in')
| -rw-r--r-- | target/linux/Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in index 30ef3b92a..1a9aea3a4 100644 --- a/target/linux/Makefile.in +++ b/target/linux/Makefile.in @@ -67,9 +67,11 @@ endif endif endif +ROOTFS_STRIPPED_SUFFIX=$(strip $(subst ",,$(ROOTFS_SUFFIX))) +#")) # File name for the Linux kernel binary ifndef LINUX26_KERNEL -LINUX26_KERNEL=$(BINARIES_DIR)/linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH) +LINUX26_KERNEL_NAME=$(BINARIES_DIR)/$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX) endif # Version of Linux AFTER patches @@ -78,7 +80,7 @@ LINUX26_DIR=$(PROJECT_BUILD_DIR)/linux-$(LINUX26_VERSION) # for packages that need it LINUX_VERSION:=$(LINUX26_VERSION) LINUX_DIR=$(LINUX26_DIR) -LINUX_KERNEL=$(LINUX26_KERNEL) +LINUX_KERNEL=$(LINUX26_KERNEL_NAME) # kernel patches ifeq ($(strip $(LINUX26_PATCH_DIR)),) @@ -192,11 +194,11 @@ $(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare touch $@ -$(LINUX26_KERNEL): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \ +$(LINUX26_KERNEL_NAME): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \ $(LINUX26_DIR)/.depend_done $(MAKE) $(LINUX26_MAKE_FLAGS) \ -C $(LINUX26_DIR) $(LINUX26_FORMAT) - cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL) + cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL_NAME) touch -c $@ $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_DIR)/.configured @@ -227,7 +229,7 @@ linux26-xconfig: $(LINUX26_DIR)/.patched host-sed $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured -linux26: $(LINUX26_KERNEL) +linux26: $(LINUX26_KERNEL_NAME) $(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep touch $@ @@ -249,7 +251,7 @@ linux26-force: # This has been renamed so we do _NOT_ by default run this on 'make clean' linux26clean: - rm -f $(LINUX26_KERNEL) $(LINUX26_DIR)/.configured + rm -f $(LINUX26_KERNEL_NAME) $(LINUX26_DIR)/.configured -$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean linux26-dirclean: |