diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-28 07:26:39 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-28 07:26:39 +0000 |
commit | 7b6c0c3b1354c09ccdb4b21648a3ce6dea588301 (patch) | |
tree | 63e61a4796b350148cc1cd81d985d6942fa72885 | |
parent | 7ccf42dadff037e468f55f2a01b0dbe3f70a03a5 (diff) | |
parent | 9784ce307fd2497c7878e01e35c5fede67e8a88e (diff) | |
download | extras-7b6c0c3b1354c09ccdb4b21648a3ce6dea588301.tar.gz |
release-request-ca7a0f27-e01e-4493-95dc-73b265f88cc9-for-git_oc-mr1-release-4365318 snap-temp-L33600000106883904android-wear-8.1.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-m4-s1-release
Change-Id: I21b4571ef1961871eb05a2dd443d8caf434b5b88
-rwxr-xr-x | ext4_utils/mkuserimg_mke2fs.sh | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/ext4_utils/mkuserimg_mke2fs.sh b/ext4_utils/mkuserimg_mke2fs.sh index 64b1fe3f..ea73ff70 100755 --- a/ext4_utils/mkuserimg_mke2fs.sh +++ b/ext4_utils/mkuserimg_mke2fs.sh @@ -8,7 +8,8 @@ Usage: mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>] [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE] [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL] - [-i INODES ] [-e ERASE_BLOCK_SIZE] [-o FLASH_BLOCK_SIZE] [FILE_CONTEXTS] + [-i INODES ] [-e ERASE_BLOCK_SIZE] [-o FLASH_BLOCK_SIZE] + [-U MKE2FS_UUID] [-S MKE2FS_HASH_SEED] [FILE_CONTEXTS] EOT } @@ -17,6 +18,7 @@ BLOCKSIZE=4096 MKE2FS_OPTS="" MKE2FS_EXTENDED_OPTS="" E2FSDROID_OPTS="" +E2FSPROGS_FAKE_TIME="" if [ "$1" = "-s" ]; then MKE2FS_EXTENDED_OPTS+="android_sparse" @@ -53,6 +55,7 @@ fi if [[ "$1" == "-T" ]]; then E2FSDROID_OPTS+=" -T $2" + E2FSPROGS_FAKE_TIME=$2 shift; shift fi @@ -108,6 +111,19 @@ if [[ "$1" == "-o" ]]; then shift; shift fi +if [[ "$1" == "-U" ]]; then + MKE2FS_OPTS+=" -U $2" + shift; shift +fi + +if [[ "$1" == "-S" ]]; then + if [[ $MKE2FS_EXTENDED_OPTS ]]; then + MKE2FS_EXTENDED_OPTS+="," + fi + MKE2FS_EXTENDED_OPTS+="hash_seed=$2" + shift; shift +fi + if [[ $MKE2FS_EXTENDED_OPTS ]]; then MKE2FS_OPTS+=" -E $MKE2FS_EXTENDED_OPTS" fi @@ -141,16 +157,25 @@ SIZE=$((SIZE / BLOCKSIZE)) # truncate output file since mke2fs will keep verity section in existing file cat /dev/null >$OUTPUT_FILE +MAKE_EXT4FS_ENV="MKE2FS_CONFIG=./system/extras/ext4_utils/mke2fs.conf" +if [[ $E2FSPROGS_FAKE_TIME ]]; then + MAKE_EXT4FS_ENV+=" E2FSPROGS_FAKE_TIME=$E2FSPROGS_FAKE_TIME" +fi + MAKE_EXT4FS_CMD="mke2fs $MKE2FS_OPTS -t $EXT_VARIANT -b $BLOCKSIZE $OUTPUT_FILE $SIZE" -echo $MAKE_EXT4FS_CMD -MKE2FS_CONFIG=./system/extras/ext4_utils/mke2fs.conf $MAKE_EXT4FS_CMD +echo $MAKE_EXT4FS_ENV $MAKE_EXT4FS_CMD +env $MAKE_EXT4FS_ENV $MAKE_EXT4FS_CMD if [ $? -ne 0 ]; then exit 4 fi +if [[ $E2FSPROGS_FAKE_TIME ]]; then + E2FSDROID_ENV="E2FSPROGS_FAKE_TIME=$E2FSPROGS_FAKE_TIME" +fi + E2FSDROID_CMD="e2fsdroid $E2FSDROID_OPTS -f $SRC_DIR -a $MOUNT_POINT $OUTPUT_FILE" -echo $E2FSDROID_CMD -$E2FSDROID_CMD +echo $E2FSDROID_ENV $E2FSDROID_CMD +env $E2FSDROID_ENV $E2FSDROID_CMD if [ $? -ne 0 ]; then rm -f $OUTPUT_FILE exit 4 |