From d16f8bf2cdf1b39cce2e44a317954d139f3258f4 Mon Sep 17 00:00:00 2001
From: "Thiago A. Corrêa" <thiago.correa@gmail.com>
Date: Fri, 6 Feb 2009 17:38:05 +0000
Subject: Simplify kernel naming scheme. Only use kernel name plus the rootfs
 suffix if one is provided

---
 target/linux/Makefile.in.advanced | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'target/linux/Makefile.in.advanced')

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
-- 
cgit v1.2.3