[poky] [OE-core] [PATCH 1/2] kernel.bbclass: omit vmlinux from rpm file when it is the alternative image

[michel.thebeau at windriver.com]

From: Michel Thebeau <michel.thebeau at windriver.com>

For routerstationpro, setting vmlinux as KERNEL_ALT_IMAGETYPE would
cause both the default KERNEL_IMAGETYPE and the alternate to be
inserted into the kernel rpm file.  This is because copying "vmlinux"
is hardcoded.

RSP is presently the only board that specifies vmlinux as the alternate
image.

Testing KERNEL_ALT_IMAGETYPE to disable this install of vmlinux will
cause the vmlinux output to not appear in the kernel rpm file.

[YOCTO #3515]

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Michel Thebeau <michel.thebeau at windriver.com>
---
 meta/classes/kernel.bbclass |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index d57d1f5..6f988e7 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -111,7 +111,14 @@ kernel_do_install() {
 	install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 	install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
 	install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
-	install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
+
+	# if vmlinux is the alternate image type, then do not install it
+	# in the deployed rpm.  The default will install instead, above
+	# via the variable KERNEL_OUTPUT (KERNEL_IMAGETYPE)
+	if [ ! ${KERNEL_ALT_IMAGETYPE} == "vmlinux" ]; then
+		install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
+	fi
+
 	[ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
 	install -d ${D}${sysconfdir}/modules-load.d
 	install -d ${D}${sysconfdir}/modprobe.d
-- 
1.7.9.7