Merge lp:~matteo-mattei/project-rootstock/main into lp:project-rootstock

[Matteo Mattei]

I've added the possibility to create tar.bz2 archive instead of only tar.gz and I've also added a filter that allow comments (with #) into manifest file.

Unmerged revisions

130. By Matteo Mattei <email address hidden> on 2011-03-15

Add support for tar.bz2 archive and add filter for comments in manifest file

=== modified file 'rootstock'
--- rootstock	2011-02-28 06:06:33 +0000
+++ rootstock	2011-03-15 16:50:50 +0000
@@ -188,6 +188,9 @@
 
 -q --quiet
     Quiet operation, only write to log
+-a --archive <option>
+    Select archive type (tgz or tar.bz2)
+    (default: tgz)
 
 Advanced:
 
@@ -652,10 +655,10 @@
     mount_image
 
     cd $MOUNTPOINT >>$LOG 2>&1
-    LANG=C tar czvf ../armel-rootfs-$STAMP.tgz . >>$LOG 2>&1
-    mv ../armel-rootfs-$STAMP.tgz $DIR >>$LOG 2>&1
+	LANG=C tar c${ARCHIVE_FLAG}vf ../armel-rootfs-$STAMP.$ARCHIVE . >>$LOG 2>&1
+	mv ../armel-rootfs-$STAMP.$ARCHIVE $DIR >>$LOG 2>&1
 
-    echo "I: ARM rootfs created as $DIR/armel-rootfs-$STAMP.tgz"
+	echo "I: ARM rootfs created as $DIR/armel-rootfs-$STAMP.$ARCHIVE"
 
     cd - >/dev/null 2>&1
 
@@ -724,6 +727,8 @@
 DIR="$(pwd)"
 NOSWAP=1
 SWAPSIZE=256
+ARCHIVE="tgz"
+ARCHIVE_FLAG="z"
 
 # general defaults
 LOG="$BUILDDIR/${PROGRAM}-$STAMP.log"
@@ -736,10 +741,10 @@
 CHROOT="eval TMPDIR=/tmp chroot"
 
 # parse commandline options
-GETOPT=`getopt -o hf:l:p:n:s:i:g:m:c:t:x:d:q --long help,fqdn:,login:,\
+GETOPT=`getopt -o h:f:l:p:n:s:i:g:m:c:t:x:d:q:a --long help:,fqdn:,login:,\
 password:,fullname:,seed:,imagesize:,manifest:,mirror:,components:,timezone:,\
 kblayout:,kbmodel:,kbvariant:,kboptions:,locale:,keepimage,notarball,script:,\
-serial:,doswap,swapsize:,dist:,quiet,kernel-image:,copy-package-cache,\
+serial:,doswap,swapsize:,dist:,quiet,archive:,kernel-image:,copy-package-cache,\
 restore-package-cache,clean-package-cache,extra-mirror:,no-root,version \
 -n "$PROGRAM" -- "$@"`
 if [ $? != 0 ]; then usage; exit 1; fi
@@ -782,7 +787,7 @@
             shift 2
             ;;
         -g|--manifest)
-            SELECTION="$(cat "${2}" | sed ':a;N;$!ba;s/\n/ /g')"
+            SELECTION="$(cat "${2}" | sed "{s/#.*//g}" | grep "^[^ ]" | sed ':a;N;$!ba;s/\n/ /g')"
             shift 2
             ;;
         -m|--mirror)
@@ -859,6 +864,15 @@
             QUIET=1
             shift
             ;;
+        -a|--archive)
+            ARCHIVE="$2"
+            if [ "${ARCHIVE}" = "tar.bz2" ];then
+                ARCHIVE_FLAG="j"
+            else
+                ARCHIVE_FLAG="z"
+            fi
+            shift 2
+            ;;
         --kernel-image)
             KERNEL_IMAGE=1
             KERNEL_URL="$2"