[oe-commits] Frans Meulenbroeks : Revert "kernel. bbclass only install image in do_deploy if not installing from packaged staging "
git version control
git at git.openembedded.org
Fri Jan 29 22:30:58 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 744a3e0a304e766b69321791b41a2c7284f46f60
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=744a3e0a304e766b69321791b41a2c7284f46f60
Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date: Fri Jan 29 23:29:20 2010 +0100
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 at gmail.com>
---
classes/kernel.bbclass | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index d666f04..53ea252 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
More information about the Openembedded-commits
mailing list