diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-29 21:56:00 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-29 21:56:00 +0100 |
| commit | 61acb940a7436a43d0894284d25e8d106f461c23 (patch) | |
| tree | 2706f4bd7176bb6a46a48f93f8b2675b7c8cea74 /classes | |
| parent | c89fe1cc6dd8f04be093c9d30d3f454e1912cc3e (diff) | |
| download | openembedded-61acb940a7436a43d0894284d25e8d106f461c23.tar.gz | |
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@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
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 |