merge in mnc-dr-release history after reset to mnc-dr-dev
diff --git a/squashfs_utils/mksquashfsimage.sh b/squashfs_utils/mksquashfsimage.sh
index 7f96cb1..260a0fd 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 [-s] [-m MOUNT_POINT] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT]
EOT
}
@@ -24,6 +24,12 @@
OUTPUT_FILE=$2
shift; shift
+SPARSE=false
+if [[ "$1" == "-s" ]]; then
+ SPARSE=true
+ shift;
+fi
+
MOUNT_POINT=
if [[ "$1" == "-m" ]]; then
MOUNT_POINT=$2
@@ -42,6 +48,19 @@
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,9 +72,20 @@
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
exit 4
fi
+
+SPARSE_SUFFIX=".sparse"
+if [ "$SPARSE" = true ]; then
+ img2simg $OUTPUT_FILE $OUTPUT_FILE$SPARSE_SUFFIX
+ if [ $? -ne 0 ]; then
+ exit 4
+ fi
+ mv $OUTPUT_FILE$SPARSE_SUFFIX $OUTPUT_FILE
+fi
+