From 61acb940a7436a43d0894284d25e8d106f461c23 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 29 Jan 2010 21:56:00 +0100 Subject: 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 --- classes/kernel.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 53ea252b0e..d666f04e6b 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 -- cgit 1.2.3-korg