diff options
| -rw-r--r-- | clear-factory-images-variables.sh | 3 | ||||
| -rwxr-xr-x | generate-blob-lists.sh | 16 | ||||
| -rw-r--r-- | generate-factory-images-common.sh | 12 |
3 files changed, 18 insertions, 13 deletions
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh index 312f195..e0c6758 100644 --- a/clear-factory-images-variables.sh +++ b/clear-factory-images-variables.sh @@ -17,8 +17,11 @@ unset BOOTLOADERFILE unset BOOTLOADERSRC unset BUILD unset CDMARADIO +unset DEVICE +unset ERASE unset PRODUCT unset RADIO unset RADIOSRC +unset SLEEPDURATION unset SRCPREFIX unset VERSION diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh index a185d18..940e0a3 100755 --- a/generate-blob-lists.sh +++ b/generate-blob-lists.sh @@ -42,7 +42,7 @@ then fi shift -DEVICES="crespo crespo4g wingray panda maguro toro grouper mako" +DEVICES="crespo crespo4g wingray panda maguro toro grouper mako manta" export LC_ALL=C repo sync -j32 -n @@ -60,16 +60,6 @@ else for DEVICENAME in $DEVICES do rm -rf out - if test $DEVICENAME = maguro - then - lunch yakju-user - make -j32 libdrmdecrypt - fi - if test $DEVICENAME = toro - then - lunch mysid-user - make -j32 libdrmdecrypt - fi lunch full_$DEVICENAME-user make -j32 cat out/target/product/$DEVICENAME/installed-files.txt | @@ -124,7 +114,7 @@ do if test "$1" != "" -a "$2" != "" then echo uploading to server $1 branch $2 - git push ssh://$1:29418/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs + git push $1/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs fi ) else @@ -134,7 +124,7 @@ do if test "$1" != "" -a "$2" != "" then echo uploading to server $1 branch $2 - git push ssh://$1:29418/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs + git push $1/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs fi ) fi diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh index 5d06a09..a82e3d2 100644 --- a/generate-factory-images-common.sh +++ b/generate-factory-images-common.sh @@ -70,6 +70,18 @@ cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF # See the License for the specific language governing permissions and # limitations under the License. +EOF +if test "$ERASEALL" = "true" +then +cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF +fastboot erase boot +fastboot erase cache +fastboot erase recovery +fastboot erase system +fastboot erase userdata +EOF +fi +cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img fastboot reboot-bootloader sleep $SLEEPDURATION |