From 744a3e0a304e766b69321791b41a2c7284f46f60 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 29 Jan 2010 23:29:20 +0100 Subject: Revert "kernel.bbclass only install image in do_deploy if not installing from packaged staging" This reverts commit 61acb940a7436a43d0894284d25e8d106f461c23. This patch is not as robust as I thought, will reassess the issue at hand later Signed-off-by: Frans Meulenbroeks --- classes/kernel.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d666f04e6b..53ea252b0e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -537,9 +537,7 @@ MODULES_IMAGE_BASE_NAME ?= modules-${PV}-${PR}-${MACHINE} do_deploy() { install -d ${DEPLOY_DIR_IMAGE} - if [ x"${PSTAGING_ACTIVE}" != x"1" ]; then - install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin - fi + install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin if [ -d "${PKGD}/lib" ]; then -- cgit 1.2.3-korg