diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2016-06-16 13:17:32 -0700 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2016-06-16 13:17:32 -0700 |
| commit | 0c2c44bfac3cef379470c78038eab73ce8fa6b58 (patch) | |
| tree | c64d66babf560fc46c241f0f9c5438b1be638702 /squashfs_utils | |
| parent | 5ac3592d7f026c4af9b7f6e1207db116cbaf9d7e (diff) | |
| parent | 041bdd8e102e20cc8345560f037a8b032bd132e8 (diff) | |
| download | extras-0c2c44bfac3cef379470c78038eab73ce8fa6b58.tar.gz | |
resolve merge conflicts of 041bdd8 to nyc-mr1-dev
Change-Id: I8b9b227f8afedb1eb77de8be9de689e3c621003e
Diffstat (limited to 'squashfs_utils')
| -rwxr-xr-x | squashfs_utils/mksquashfsimage.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/squashfs_utils/mksquashfsimage.sh b/squashfs_utils/mksquashfsimage.sh index 74c612df..6a2ec1c7 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_MAP_FILE] [-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] [-a] EOT } @@ -86,6 +86,12 @@ if [[ "$1" == "-t" ]]; then fi +DISABLE_4K_ALIGN=false +if [[ "$1" == "-a" ]]; then + DISABLE_4K_ALIGN=true + shift; +fi + OPT="" if [ -n "$MOUNT_POINT" ]; then OPT="$OPT -mount-point $MOUNT_POINT" @@ -108,6 +114,9 @@ fi if [ -n "$COMPRESS_THRESHOLD" ]; then OPT="$OPT -t $COMPRESS_THRESHOLD" fi +if [ "$DISABLE_4K_ALIGN" = true ]; then + OPT="$OPT -disable-4k-align" +fi 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 |