aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Bollinger <seth.boll@gmail.com>2013-04-22 07:23:45 -0500
committerAndrei Gherzan <andrei@gherzan.ro>2013-05-02 14:11:32 +0200
commit770b88b2ce696fddd2fdb99bbcd894a43b519f48 (patch)
treed4c5f37bc0c2a7196e8440d7b161fee54c3c0be5
parentc5f81306b58e91f1c845da063c2476733cdb5bf5 (diff)
downloadmeta-raspberrypi-dylan.tar.gz
meta-raspberrypi-dylan.tar.bz2
meta-raspberrypi-dylan.zip
sdcard_image-rpi.bbclass: Fix error in conditional testdylan
When the shell tests for rootfs type I was seeing "[[: not found". I use echo and egrep to test for the xz rootfs type to work around this error. Signed-off-by: Seth Bollinger <seth.boll@gmail.com> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r--classes/sdcard_image-rpi.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 05087b5..a2fcd52 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -101,7 +101,7 @@ IMAGE_CMD_rpi-sdimg () {
# Burn Partitions
dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
# If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
- if [[ "$SDIMG_ROOTFS_TYPE" == *.xz ]]
+ if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
then
xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
else