diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2016-06-15 16:03:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-15 16:03:08 +0000 |
| commit | 7354c0e18bac5247494b9c5d76d5d8dcb9100d20 (patch) | |
| tree | c2bf0ad7b5fed78b49db76a0425eeab89da937c2 | |
| parent | 4d9e9c66fbc82b5f024b6457de591fe75e4a417e (diff) | |
| parent | 1908b380f17cfd7eebcf9356c501521902d60e94 (diff) | |
| download | extras-7354c0e18bac5247494b9c5d76d5d8dcb9100d20.tar.gz | |
Merge changes from topic 'squashfs_ota_incrementals' into nyc-dev
* changes:
Disable fragments and duplicates detection for squashfs
mksquashfsimage.sh: Add support for passing block map files
| -rwxr-xr-x | squashfs_utils/mksquashfsimage.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/squashfs_utils/mksquashfsimage.sh b/squashfs_utils/mksquashfsimage.sh index 5f8cfeab..05ca4e0b 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 [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] +${0##*/} SRC_DIR OUTPUT_FILE [-s] [-m MOUNT_POINT] [-d PRODUCT_OUT] [-C FS_CONFIG ] [-c FILE_CONTEXTS] [-B BLOCK_MAP_FILE] [-b BLOCK_SIZE] [-z COMPRESSOR] [-zo COMPRESSOR_OPT] EOT } @@ -54,6 +54,12 @@ if [[ "$1" == "-c" ]]; then shift; shift fi +BLOCK_MAP_FILE= +if [[ "$1" == "-B" ]]; then + BLOCK_MAP_FILE=$2 + shift; shift +fi + BLOCK_SIZE=131072 if [[ "$1" == "-b" ]]; then BLOCK_SIZE=$2 @@ -86,11 +92,14 @@ fi if [ -n "$FILE_CONTEXTS" ]; then OPT="$OPT -context-file $FILE_CONTEXTS" fi +if [ -n "$BLOCK_MAP_FILE" ]; then + OPT="$OPT -block-map $BLOCK_MAP_FILE" +fi if [ -n "$BLOCK_SIZE" ]; then OPT="$OPT -b $BLOCK_SIZE" fi -MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -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 -no-fragments -no-duplicates -android-fs-config $OPT" echo $MAKE_SQUASHFS_CMD $MAKE_SQUASHFS_CMD |