Module: narcissus
Branch: master
Commit: 461cd5e7b87745da04977ee4455287e43c773cbb

Author: Koen Kooi <k...@dominion.thruhere.net>
Date:   Sun Jun 12 10:43:25 2011 +0200

narcissus: also fix fakeroot issues with ext2 and jffs2 images

Signed-off-by: Koen Kooi <k...@dominion.thruhere.net>

---

 scripts/assemble-image.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/assemble-image.sh b/scripts/assemble-image.sh
index 5e652e6..6043bde 100755
--- a/scripts/assemble-image.sh
+++ b/scripts/assemble-image.sh
@@ -189,7 +189,7 @@ function do_ubifs()
 function do_jffs2()
 {
        echo "creating jffs2 image"
-       mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime 
--output=${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.jffs2 ${EXTRA_IMAGECMD_jffs2}
+       ${FAKEROOT} mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime 
--output=${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.jffs2 ${EXTRA_IMAGECMD_jffs2}
 }
 
 function do_ext2()
@@ -197,7 +197,7 @@ function do_ext2()
        echo "creating ext2 image"
        export ROOTFS_SIZE="$(du -ks ${IMAGE_ROOTFS} | awk '{print 65536 + 
$1}')"
        echo "running: genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} 
${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.ext2 ${EXTRA_IMAGECMD_ext2}"
-       genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} 
${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.ext2 ${EXTRA_IMAGECMD_ext2}
+       ${FAKEROOT} genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} 
${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.ext2 ${EXTRA_IMAGECMD_ext2}
 }
 
 function print_header()


_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel

Reply via email to