aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorBen Gardiner <bengardiner@nanometrics.ca>2011-03-17 00:50:35 +0000
committerTom Rini <tom_rini@mentor.com>2011-03-17 11:08:00 -0700
commitc3810ae0df1dc13b4ceb04de3f4ed2de78cc49cd (patch)
tree872d9356577c30c41c312d454c46a35de151770d /conf
parentbea53b82ce187c30729efde6ea974aca5ee7f7d0 (diff)
downloadopenembedded-c3810ae0df1dc13b4ceb04de3f4ed2de78cc49cd.tar.gz
openembedded-c3810ae0df1dc13b4ceb04de3f4ed2de78cc49cd.tar.bz2
openembedded-c3810ae0df1dc13b4ceb04de3f4ed2de78cc49cd.zip
bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi
The current IMAGE_CMD_ubi creates an interim image with a .rootfs.ubifs extension. The ubifs image created is not considered a valid rootfs without a UBI container. Change the filename of the iterim ubifs image used by IMAGE_CMD_ubi to .ubifs.img to match the IMAGE_CMD_ubifs command. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Acked-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Tom Rini <tom_rini@mentor.com> (backported from commit 7308e68fc26cdbffa08d311a2319c8d1c3b2805f -- some changes were needed since commit 312b42bcf2cc9b11266ba497ade68e8ddabb3007 bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables has not been applied to 2011.03-maintenance) Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Acked-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1002c01a06..01b9321c23 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -399,7 +399,7 @@ IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio
IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}"
IMAGE_CMD_cpio.gz.u-boot = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}; mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz.u-boot"
IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
+IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
EXTRA_IMAGECMD = ""