summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2015-06-24 22:48:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-24 22:48:03 +0000
commitee3d4d49ddcd8cd100c150091ffa85ae25e756fb (patch)
tree6dd7ff1a3b3dfdfb12f3881979803acb01b6fc45
parent720fd497f2fa1ea9c2621b5632ccf999dc8ed086 (diff)
parentb4cf7b309e8d8dc2ebbc6501ef205091322ab659 (diff)
downloadextras-ee3d4d49ddcd8cd100c150091ffa85ae25e756fb.tar.gz
am b4cf7b30: Add switches for compressor
* commit 'b4cf7b309e8d8dc2ebbc6501ef205091322ab659': Add switches for compressor
-rwxr-xr-xsquashfs_utils/mksquashfsimage.sh17
1 files changed, 15 insertions, 2 deletions
diff --git a/squashfs_utils/mksquashfsimage.sh b/squashfs_utils/mksquashfsimage.sh
index 7f96cb1f..06860926 100755
--- a/squashfs_utils/mksquashfsimage.sh
+++ b/squashfs_utils/mksquashfsimage.sh
@@ -5,7 +5,7 @@
function usage() {
cat<<EOT
Usage:
-${0##*/} SRC_DIR OUTPUT_FILE [-m MOUNT_POINT] [-c FILE_CONTEXTS] [-b BLOCK_SIZE]
+${0##*/} SRC_DIR OUTPUT_FILE [-m MOUNT_POINT] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT]
EOT
}
@@ -42,6 +42,19 @@ if [[ "$1" == "-b" ]]; then
shift; shift
fi
+COMPRESSOR="lz4"
+COMPRESSOR_OPT="-Xhc"
+if [[ "$1" == "-z" ]]; then
+ COMPRESSOR=$2
+ COMPRESSOR_OPT=
+ shift; shift
+fi
+
+if [[ "$1" == "-zo" ]]; then
+ COMPRESSOR_OPT=$2
+ shift; shift
+fi
+
OPT=""
if [ -n "$MOUNT_POINT" ]; then
OPT="$OPT -mount-point $MOUNT_POINT"
@@ -53,7 +66,7 @@ if [ -n "$BLOCK_SIZE" ]; then
OPT="$OPT -b $BLOCK_SIZE"
fi
-MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR $OUTPUT_FILE -no-progress -comp lz4 -Xhc -no-exports -noappend -no-recovery -android-fs-config $OPT"
+MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -android-fs-config $OPT"
echo $MAKE_SQUASHFS_CMD
$MAKE_SQUASHFS_CMD
if [ $? -ne 0 ]; then