Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Dengler <martin@martindengler.com>2009-06-27 21:59:27 (GMT)
committer Martin Dengler <martin@martindengler.com>2009-06-27 21:59:27 (GMT)
commitf5b47533e733e408555bf8311719c1b18040a541 (patch)
tree1559d2f0f916a9a222a99702dcc1d73c06626c71
parentbde9f61052adfb69453ac8dbd4de1171c2eba1b4 (diff)
build tarball before making jffs2 image and remove livesys files from
jffs2 image
-rwxr-xr-xlivecd-iso-to-xo.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/livecd-iso-to-xo.sh b/livecd-iso-to-xo.sh
index 7f28c3e..1c298d5 100755
--- a/livecd-iso-to-xo.sh
+++ b/livecd-iso-to-xo.sh
@@ -49,14 +49,20 @@ if [ ! -e $ROOT/boot/olpc.fth ] ; then
exit 1
fi
+echo "Build tarball..."
+
+tar -c -C $ROOT . | lzma -1 > $(basename ${IMG} .img)-files.tar.lzma
+
+
echo "Build jffs2 image..."
+echo "(removing livesys scripts from image because they'll really foul it up if they run)"
+rm -f $ROOT/etc/init.d/livesys*
+
mkfs.jffs2 -n -e128KiB -r $ROOT -o $IMG.tmp
sumtool -n -p -e 128KiB -i $IMG.tmp -o $IMG
rm $IMG.tmp
crcimg $IMG
-tar -c -C $ROOT . | lzma -1 > images/$(basename ${IMG} .img)-files.tar.lzma
-
echo "Done."
cleanup