diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2016-06-15 09:38:04 -0700 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2016-06-15 09:38:04 -0700 |
| commit | c8966476a1b9443b8b433fb14a1f64832fe726a7 (patch) | |
| tree | 530ed0e32eeef4cf9b7e0bee897a318f43aeb42b /squashfs_utils | |
| parent | aabbbfde4831c2a9c9c50a3bf38b2a3ff346b8f4 (diff) | |
| parent | 7354c0e18bac5247494b9c5d76d5d8dcb9100d20 (diff) | |
| download | extras-c8966476a1b9443b8b433fb14a1f64832fe726a7.tar.gz | |
resolve merge conflicts of 7354c0e to nyc-mr1-dev
Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41
Diffstat (limited to 'squashfs_utils')
| -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 9dae51b8..74c612df 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] [-t COMPRESS_THRESHOLD] +${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] [-t COMPRESS_THRESHOLD] 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 @@ -93,6 +99,9 @@ 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 @@ -100,7 +109,7 @@ if [ -n "$COMPRESS_THRESHOLD" ]; then OPT="$OPT -t $COMPRESS_THRESHOLD" fi -MAKE_SQUASHFS_CMD="mksquashfs $SRC_DIR/ $OUTPUT_FILE -no-progress -comp $COMPRESSOR $COMPRESSOR_OPT -no-exports -noappend -no-recovery -android-fs-config -no-fragments $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 |