[oe-commits] Denis 'GNUtoo' Carikli : linux-leviathan: fix the "empty.gz already exists" message
git version control
git at git.openembedded.org
Sun Jun 13 14:29:01 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4a2af9d82d4dea4e9f8c2b66fc4f8bcc0f32db69
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4a2af9d82d4dea4e9f8c2b66fc4f8bcc0f32db69
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date: Sun Jun 13 16:13:32 2010 +0200
linux-leviathan: fix the "empty.gz already exists" message
if we don't check if empty and empty.gz already exist,
The fist time empty.gz is copied to the deploy dir,
then the second build we have:
gzip: empty.gz already exists; not overwritten
And it fails.
so we need to touch and gzip only if empty.gz not already present.
---
recipes/linux/linux-leviathan_git.bb | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb
index bc8a477..f5a7d21 100644
--- a/recipes/linux/linux-leviathan_git.bb
+++ b/recipes/linux/linux-leviathan_git.bb
@@ -2,7 +2,7 @@ require linux.inc
DEPENDS += "android-image-utils-native"
PV = "2.6.32+${PR}+gitr${SRCREV}"
-PR = "r18"
+PR = "r19"
COMPATIBLE_MACHINE = "htcdream"
CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
@@ -17,8 +17,12 @@ SRC_URI = "\
S = "${WORKDIR}/git"
do_deploy_append() {
- touch -f empty
- gzip empty
+ if [ ! -e empty.gz ];then
+ if [ ! -e empty ];then
+ touch empty
+ fi
+ gzip empty
+ fi
mkbootimg --kernel ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin \
--ramdisk empty.gz \
--cmdline "${CMDLINE}" \
More information about the Openembedded-commits
mailing list