From: Chris Larson Date: Sat, 20 Nov 2004 18:15:52 +0000 (+0000) Subject: oe.conf: minor bugfix, when ext2 and ext2.gz are both in IMAGE_FSTYPES, don't allow... X-Git-Tag: Release-2010-05/1~16083 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34bab9633669ed8980f5d9b5c21e9e875b6ee9cd;p=openembedded.git oe.conf: minor bugfix, when ext2 and ext2.gz are both in IMAGE_FSTYPES, don't allow them to step on one another. BKrev: 419f89d8_fxGGpIOiVkKZiZSMSUQNQ --- diff --git a/conf/oe.conf b/conf/oe.conf index f32baceae7..1b1562b946 100644 --- a/conf/oe.conf +++ b/conf/oe.conf @@ -153,7 +153,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${EXTRA_IMAGECMD}" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2.gz = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2" +IMAGE_CMD_ext2.gz = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new; mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." EXTRA_IMAGECMD = ""