[oe-commits] Andrea Adami : zaurus-2.6.inc: fix for KERNEL_IMAGETYPE (and allow uImage)
GIT User account
git at amethyst.openembedded.net
Sun Mar 29 21:36:01 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: acc50bd8c1c2f5930c318fe2dcae85b2e6d715f2
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=acc50bd8c1c2f5930c318fe2dcae85b2e6d715f2
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Sun Mar 29 22:58:53 2009 +0200
zaurus-2.6.inc: fix for KERNEL_IMAGETYPE (and allow uImage)
---
conf/machine/include/zaurus-2.6.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 29f21c4..5ce1cdc 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -38,6 +38,8 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
KERNEL_IMAGE_MAXSIZE = "1294336"
+KERNEL_IMAGETYPE ?= "zImage"
+
MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
zaurus_make_installkit () {
@@ -45,13 +47,13 @@ zaurus_make_installkit () {
rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
mkdir ${IMAGE_NAME}-installkit/
- # Get the latest kernel using the zImage-<machine>.bin symlink
+ # Get the latest kernel using the ${KERNEL_IMAGETYPE}-<machine>.bin symlink
if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then
- [ -f "zImage-kexecboot-${MACHINE}.bin" ] && cp zImage-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+ [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
# we need also tgz for mmc or cf cards
cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz
else
- cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+ cp ${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
fi
if [ "${MACHINE}" = "spitz" ]; then
@@ -69,6 +71,4 @@ zaurus_make_installkit () {
rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
}
-KERNEL_IMAGETYPE ?= "zImage"
-
require conf/machine/include/kexecboot.inc
More information about the Openembedded-commits
mailing list