diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2016-06-16 16:24:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-16 16:24:34 +0000 |
| commit | 041bdd8e102e20cc8345560f037a8b032bd132e8 (patch) | |
| tree | 300d8805fa235f0cfe383a439e971547e67a800f | |
| parent | 7354c0e18bac5247494b9c5d76d5d8dcb9100d20 (diff) | |
| parent | 084df12b689bdaab0a733fb9f2100b399c04c4bd (diff) | |
| download | extras-041bdd8e102e20cc8345560f037a8b032bd132e8.tar.gz | |
Merge "mksquashfsimage.sh: Make disable-4k-align a paramter" into nyc-dev
| -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 05ca4e0b..5f45a648 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] +${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] [-a ] EOT } @@ -79,6 +79,12 @@ if [[ "$1" == "-zo" ]]; then shift; shift 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" @@ -98,6 +104,9 @@ fi if [ -n "$BLOCK_SIZE" ]; then OPT="$OPT -b $BLOCK_SIZE" 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 |