linux-leviathan: fix the "empty.gz already exists" message
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Sun, 13 Jun 2010 14:13:32 +0000 (16:13 +0200)
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Sun, 13 Jun 2010 14:27:56 +0000 (16:27 +0200)
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

index bc8a477..f5a7d21 100644 (file)
@@ -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}" \