diff options
| author | Xin Li <delphij@google.com> | 2016-07-28 18:02:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-28 18:02:44 +0000 |
| commit | d68abc1c3c8bf02e0b57748934a76150bc11d5fb (patch) | |
| tree | 9aea781272fe2e706904e5112e7c8ef13216d03e | |
| parent | 762617a12642c9de3e3ce66b26f6c8b122c06e0f (diff) | |
| parent | ffe6f59740aeb155ee95baa14f10e43f32bb7307 (diff) | |
| download | device_common-d68abc1c3c8bf02e0b57748934a76150bc11d5fb.tar.gz device_common-d68abc1c3c8bf02e0b57748934a76150bc11d5fb.tar.bz2 device_common-d68abc1c3c8bf02e0b57748934a76150bc11d5fb.zip | |
Consistently use SHA256 for filenames (previously, MD5 and SHA1 were used). am: 72a67b76c6 am: 4b636830cd am: 074067b725 am: d34002fb87
am: ffe6f59740
Change-Id: Ifedcf4cc0cdb6f8f821e1e09d9cbb740085d1f4a
| -rw-r--r-- | generate-factory-images-common.sh | 2 | ||||
| -rwxr-xr-x | generate-packages.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index 63ab260..b8d6707 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -294,7 +294,7 @@ chmod a+x tmp/$PRODUCT-$VERSION/flash-base.sh # Create the distributable package (cd tmp ; tar zcvf ../$PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION) -mv $PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION-factory-$(sha1sum < $PRODUCT-$VERSION-factory.tgz | cut -b -8).tgz +mv $PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION-factory-$(sha256sum < $PRODUCT-$VERSION-factory.tgz | cut -b -8).tgz # Clean up rm -rf tmp diff --git a/generate-packages.sh b/generate-packages.sh index c48d328..7b1b244 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -139,7 +139,7 @@ do cat PART3 >> tmp/$SCRIPT || echo \ \ \ \ Error generating script (cd tmp ; tar zc --owner=root --group=root vendor/ >> $SCRIPT || echo \ \ \ \ Error generating embedded tgz) chmod a+x tmp/$SCRIPT || echo \ \ \ \ Error generating script - ARCHIVE=$COMPANY-$DEVICE-$BUILD-$(md5sum < tmp/$SCRIPT | cut -b -8 | tr -d \\n).tgz + ARCHIVE=$COMPANY-$DEVICE-$BUILD-$(sha256sum < tmp/$SCRIPT | cut -b -8 | tr -d \\n).tgz rm -f $ARCHIVE echo \ \ Generating final archive (cd tmp ; tar --owner=root --group=root -z -c -f ../$ARCHIVE $SCRIPT || echo \ \ \ \ Error archiving script) |