[oe] [PATCH] om-gta01: remove /boot directory from jffs2/ubi/ubifs images

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 conf/machine/om-gta01.conf |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index ccd2b7a..578e90c 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -57,6 +57,11 @@ ROOT_FLASH_SIZE = "60"
 
 IMAGE_FSTYPES += "tar.gz jffs2 ubi"
 
+# We don't want /boot directory in jffs2/ubi/ubifs images
+IMAGE_CMD_jffs2 = "cp -ra ${IMAGE_ROOTFS} ${IMAGE_ROOTFS}-no-boot && rm -rf ${IMAGE_ROOTFS}-no-boot/boot && mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS}-no-boot --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD} && rm -rf ${IMAGE_ROOTFS}-no-boot"
+IMAGE_CMD_ubi = "cp -ra ${IMAGE_ROOTFS} ${IMAGE_ROOTFS}-no-boot && rm -rf ${IMAGE_ROOTFS}-no-boot/boot && 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 && rm -rf ${IMAGE_ROOTFS}-no-boot"
+IMAGE_CMD_ubifs = "cp -ra ${IMAGE_ROOTFS} ${IMAGE_ROOTFS}-no-boot && rm -rf ${IMAGE_ROOTFS}-no-boot/boot && mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && rm -rf ${IMAGE_ROOTFS}-no-boot"
+
 # extra jffs2 tweaks
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
-- 
1.7.0