[oe-commits] Frans Meulenbroeks : kernel. bbclass only install image in do_deploy if not installing from packaged staging

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 61acb940a7436a43d0894284d25e8d106f461c23
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=61acb940a7436a43d0894284d25e8d106f461c23

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Fri Jan 29 21:56:00 2010 +0100

kernel.bbclass only install image in do_deploy if not installing from packaged staging

kernel.bbclass do_deploy has:
install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
which expands to
install -m 0644 arch/arm/boot/uImage .../deploy/glibc/images/beagleboard/uImage-2.6.29-r51-beagleboard.bin
but in packaged staging  arch/arm/boot/uImage does not exist so we get the error:
install: cannot stat `arch/arm/boot/uImage': No such file or directory
This patch only installs uImage if not using packaged staging

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 classes/kernel.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 53ea252..d666f04 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -537,7 +537,9 @@ MODULES_IMAGE_BASE_NAME ?= modules-${PV}-${PR}-${MACHINE}
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	if [ x"${PSTAGING_ACTIVE}" != x"1" ]; then
+	    install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	fi
 	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 
 	if [ -d "${PKGD}/lib" ]; then