From 422c6b5ae112f0ddd4a41ef58dd1518240376225 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Fri, 2 Dec 2016 12:59:14 +0530
Subject: update.sh: Do not deploy the rootfs.ext3

Now that we split the rootfs file by default for both Ethernet as
well as SD card update, it is no longer required to deploy the
rootfs.ext3 file which also saves space. Only deploy the split
rootfs files.

Signed-off-by: Sanchayan Maity <sanchayan.maity@toradex.com>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-images/images/files/library/imx6/update.sh  |  9 +++++----
 recipes-images/images/files/library/tegra/update.sh | 13 ++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'recipes-images')

diff --git a/recipes-images/images/files/library/imx6/update.sh b/recipes-images/images/files/library/imx6/update.sh
index 6914438..6781f78 100755
--- a/recipes-images/images/files/library/imx6/update.sh
+++ b/recipes-images/images/files/library/imx6/update.sh
@@ -299,16 +299,17 @@ sudo $LOCPATH/genext3fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} ||
 
 #copy to $OUT_DIR
 sudo cp ${BINARIES}/${U_BOOT_BINARY} ${BINARIES}/${SPL_BINARY} ${BINARIES}/${KERNEL_IMAGETYPE} ${BINARIES}/mbr.bin \
-	${BINARIES}/boot.vfat ${BINARIES}/${IMAGEFILE} ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR"
+	${BINARIES}/boot.vfat ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR"
 sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img"
 sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img"
 sudo cp ${BINARIES}/fwd_mmc.img "$OUT_DIR/../flash_mmc.img"
-#cleanup intermediate files
-sudo rm ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat ${BINARIES}/${IMAGEFILE} ${BINARIES}/versions.txt
 
 if [ "$SPLIT" -ge 1 ] ; then
-sudo split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 "$OUT_DIR/root.ext3" "$OUT_DIR/root.ext3-"
+sudo split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 ${BINARIES}/${IMAGEFILE} "$OUT_DIR/root.ext3-"
 fi
+
+#cleanup intermediate files
+sudo rm ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat ${BINARIES}/${IMAGEFILE} ${BINARIES}/versions.txt
 sync
 
 #Remove trap and report success!
diff --git a/recipes-images/images/files/library/tegra/update.sh b/recipes-images/images/files/library/tegra/update.sh
index a3ae741..0032540 100755
--- a/recipes-images/images/files/library/tegra/update.sh
+++ b/recipes-images/images/files/library/tegra/update.sh
@@ -439,19 +439,22 @@ fi
 #copy to $OUT_DIR
 OUT_DIR=`readlink -f $OUT_DIR`
 cd ${BINARIES}
-sudo cp ${CBOOT_IMAGE} ${KERNEL_IMAGETYPE} ${EMMC_PARTS} ${IMAGEFILE}* flash*.img versions.txt "$OUT_DIR"
+sudo cp ${CBOOT_IMAGE} ${KERNEL_IMAGETYPE} ${EMMC_PARTS} flash*.img versions.txt "$OUT_DIR"
 sudo cp fwd_blk.img "$OUT_DIR/../flash_blk.img"
 sudo cp fwd_eth.img "$OUT_DIR/../flash_eth.img"
 sudo cp fwd_mmc.img "$OUT_DIR/../flash_mmc.img"
-#cleanup intermediate files
-sudo rm ${CBOOT_IMAGE} ${EMMC_PARTS} ${IMAGEFILE}* versions.txt
-cd ..
 
 if [ "${IMAGEFILE}" = "root.ext3" ] ; then
 	if [ "$SPLIT" -ge 1 ] ; then
-		sudo split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 "$OUT_DIR/root.ext3" "$OUT_DIR/root.ext3-"
+		sudo split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 ${IMAGEFILE} "$OUT_DIR/root.ext3-"
 	fi
+else
+	sudo cp ${IMAGEFILE}* "$OUT_DIR"
 fi
+
+#cleanup intermediate files
+sudo rm ${CBOOT_IMAGE} ${EMMC_PARTS} ${IMAGEFILE}* versions.txt
+cd ..
 sync
 
 #Remove trap and report success!
-- 
cgit v1.2.3