aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-29 23:29:20 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-01-29 23:30:27 +0100
commit744a3e0a304e766b69321791b41a2c7284f46f60 (patch)
treeb96d2588dd5a5012ca72b7c25f68d5b1823bb534
parent9a3aceee4861e3b79ad8c73a01b4e4a93e421c0b (diff)
downloadopenembedded-744a3e0a304e766b69321791b41a2c7284f46f60.tar.gz
openembedded-744a3e0a304e766b69321791b41a2c7284f46f60.tar.bz2
openembedded-744a3e0a304e766b69321791b41a2c7284f46f60.zip
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 <fransmeulenbroeks@gmail.com>
-rw-r--r--classes/kernel.bbclass4
1 files changed, 1 insertions, 3 deletions
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