diff --git a/MakeIMAGE.sh b/MakeIMAGE.sh index 1f919e2..4935386 100755 --- a/MakeIMAGE.sh +++ b/MakeIMAGE.sh @@ -6,6 +6,8 @@ export LC_ALL=C BUILD=`cat ../GfA/board/GfA/Display001/BUILD` IMAGEFILE=../Display001_Build_$BUILD-img +ROOTFSMNT=/tmp/XXXRootFs + echo "Image: $IMAGEFILE" #-- build imagefile dd if=/dev/zero ibs=1M count=1 > $IMAGEFILE @@ -63,7 +65,6 @@ cp ./output/images/*.dtb /tmp/boot cp ./output/images/uImage /tmp/boot cp ./output/images/MLO /tmp/boot cp ./output/images/u-boot.img /tmp/boot -#cp ./output/images/rootfs.tar.gz /tmp/boot ls -alh /tmp/boot @@ -72,8 +73,22 @@ mkfs.ext3 -L "rootfs" ${DRIVE2} mount ${DRIVE2} /tmp/rootfs du -h ${DRIVE2} -sleep 10 -tar -C /tmp/rootfs --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz +sleep 5 + +umount ${ROOTFSMNT} +rm -rf ${ROOTFSMNT} +mkdir -p ${ROOTFSMNT} +echo "Mount ====>> " ${ROOTFSMNT} +mount -o loop ./output/images/rootfs.ext2 ${ROOTFSMNT} + +WRKDIR=`pwd` +cd ${ROOTFSMNT} +tar cf - . | (cd /tmp/rootfs && tar xBf -) + +cd ${WRKDIR} +umount ${ROOTFSMNT} +#tar -C /tmp/rootfs --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz + echo "" sync @@ -88,4 +103,4 @@ rm $IMAGEFILE.zip zip -j $IMAGEFILE.zip $IMAGEFILE export LC_ALL=$SAVE_LC - \ No newline at end of file + diff --git a/MakeRootfsUpdate.sh b/MakeRootfsUpdate.sh index df6e200..99b77c9 100755 --- a/MakeRootfsUpdate.sh +++ b/MakeRootfsUpdate.sh @@ -5,6 +5,14 @@ UPDATE_BINARY=$WRKDIR/dest/UpdateRootfs.tar.Z UPDATE_FILENAME="../UpdateDisplay001_$BUILD.sh" UPDATE_IN_SCRIPT="UpdateRootfs.sh.in" +ROOTFSMNT=/tmp/XXXRootFs + +sudo umount $ROOTFSMNT +sudo rm -rf $ROOTFSMNT +sudo mkdir -p $ROOTFSMNT + +sudo mount -o loop ./output/images/rootfs.ext2 $ROOTFSMNT + rm -rf $WRKDIR mkdir -p $WRKDIR/dest @@ -12,7 +20,10 @@ cp ./output/images/*.dtb $WRKDIR cp ./output/images/uImage $WRKDIR cp ./output/images/MLO $WRKDIR cp ./output/images/u-boot.img $WRKDIR -cp ./output/images/rootfs.tar.gz $WRKDIR + +sudo tar -C $ROOTFSMNT -czvf $WRKDIR/rootfs.tar.gz ./ +sudo umount $ROOTFSMNT +#cp ./output/images/rootfs.tar.gz $WRKDIR tar -C $WRKDIR --exclude=./dest -czvf $WRKDIR/dest/UpdateRootfs.tar.Z ./