diff options
| -rw-r--r-- | target/linux/Makefile.in | 14 | ||||
| -rw-r--r-- | target/linux/Makefile.in.advanced | 8 | ||||
| -rw-r--r-- | target/u-boot/Makefile.in | 2 |
3 files changed, 11 insertions, 13 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: diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index 83c692edd..240a251e3 100644 --- a/target/linux/Makefile.in.advanced +++ b/target/linux/Makefile.in.advanced @@ -138,7 +138,6 @@ ifeq ($(LINUX26_FORMAT),vmlinux) ifeq ($(LINUX26_BINLOC),) LINUX26_BINLOC:=$(LINUX26_FORMAT) endif -KERNEL_EXT:= endif # -------------- @@ -149,7 +148,6 @@ LINUX26_MKIMAGE_DEP:=$(LINUX26_MKIMAGE_DIR)/mkimage ifeq ($(LINUX26_BINLOC),) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) endif -KERNEL_EXT:=.gz endif # -------------- @@ -158,7 +156,6 @@ ifeq ($(LINUX26_FORMAT),zImage) ifeq ($(LINUX26_BINLOC),) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) endif -KERNEL_EXT:=.z endif # -------------- @@ -167,14 +164,13 @@ ifeq ($(LINUX26_FORMAT),bzImage) ifeq ($(LINUX26_BINLOC),) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage endif -KERNEL_EXT:=.bz endif ROOTFS_STRIPPED_SUFFIX=$(strip $(subst ",,$(ROOTFS_SUFFIX))) #")) # ----------------------------------------------------------------------------- # File name for the Linux kernel binary -LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)$(ROOTFS_STRIPPED_SUFFIX)$(KERNEL_EXT) +LINUX26_KERNEL_NAME:=$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX) ifeq ($(BOARD_NAME),) @@ -182,7 +178,7 @@ BOARD_NAME=$(ARCH) endif ifndef LINUX26_KERNEL -LINUX26_KERNEL:=$(BINARIES_DIR)/$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT) +LINUX26_KERNEL:=$(BINARIES_DIR)/$(LINUX26_KERNEL_NAME) endif # for packages that need it diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in index be13fb802..5b975db8f 100644 --- a/target/u-boot/Makefile.in +++ b/target/u-boot/Makefile.in @@ -243,7 +243,7 @@ endif ifneq ($(TARGET_UBOOT_NETMASK),) echo setenv netmask $(TARGET_UBOOT_NETMASK) >> $(U_BOOT_AUTOSCRIPT) endif - echo setenv linux $(LINUX26_KERNEL_NAME).gz >> $(U_BOOT_AUTOSCRIPT) + echo setenv linux $(LINUX26_KERNEL_NAME) >> $(U_BOOT_AUTOSCRIPT) echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT) echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT) echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT) |