diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 08:39:22 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 08:39:22 -0700 |
commit | 39a8caceff37535788c327a3784503bce90edd1e (patch) | |
tree | ace037b77765916e0aec25914c21b659c16f1e8f | |
parent | 2311cb2fc4d007620ce81b9776271b97b2b45edc (diff) | |
parent | 87f8d661b3330fc8da5362a70a86d3807be2c728 (diff) | |
download | device_samsung_maguro-39a8caceff37535788c327a3784503bce90edd1e.zip device_samsung_maguro-39a8caceff37535788c327a3784503bce90edd1e.tar.gz device_samsung_maguro-39a8caceff37535788c327a3784503bce90edd1e.tar.bz2 |
resolved conflicts for merge of 87f8d661 to master
Change-Id: I8681e2c7391be8857ead09430df2e08010ddbe7a
-rwxr-xr-x | factory-images/generate-factory-images-package.sh | 91 | ||||
-rwxr-xr-x | self-extractors/generate-packages.sh | 1 |
2 files changed, 75 insertions, 17 deletions
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh index 68a67d7..98c5ba9 100755 --- a/factory-images/generate-factory-images-package.sh +++ b/factory-images/generate-factory-images-package.sh @@ -17,20 +17,34 @@ # 223971 = ITL41D # 228551 = ITL41F # 235179 = ICL53F +# 299849 = IMM76D -BUILD=235179 -VERSION=icl53f -BOOTLOADER=primekk15 -RADIO=i9250xxkk6 +BUILD=299849 +DEVICE=maguro +PRODUCT=yakju +VERSION=imm76d +BOOTLOADER=primela03 +RADIO=i9250xxla02 +if test "$RADIOSRC" = "" +then + RADIOSRC=radio.img +fi rm -rf tmp -mkdir -p tmp/yakju-$VERSION -unzip -d tmp signed-yakju-target_files-$BUILD.zip RADIO/radio.img RADIO/bootloader.img -cp signed-yakju-img-$BUILD.zip tmp/yakju-$VERSION/image-yakju-$VERSION.zip -cp tmp/RADIO/bootloader.img tmp/yakju-$VERSION/bootloader-maguro-$BOOTLOADER.img -cp tmp/RADIO/radio.img tmp/yakju-$VERSION/radio-maguro-$RADIO.img -#cp flash-all.sh tmp/yakju-$VERSION -cat > tmp/yakju-$VERSION/flash-all.sh << EOF +mkdir -p tmp/$PRODUCT-$VERSION +unzip -d tmp signed-$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC RADIO/bootloader.img +if test "$CDMARADIO" != "" +then + unzip -d tmp signed-$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img +fi +cp signed-$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip +cp tmp/RADIO/bootloader.img tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img +cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img +if test "$CDMARADIO" != "" +then + cp tmp/RADIO/radio-cdma.img tmp/$PRODUCT-$VERSION/radio-cdma-$DEVICE-$CDMARADIO.img +fi +cat > tmp/$PRODUCT-$VERSION/flash-all.sh << EOF #!/bin/sh # Copyright (C) 2011 The Android Open Source Project @@ -47,15 +61,58 @@ cat > tmp/yakju-$VERSION/flash-all.sh << EOF # See the License for the specific language governing permissions and # limitations under the License. -fastboot flash bootloader bootloader-maguro-$BOOTLOADER.img +fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img fastboot reboot-bootloader sleep 5 -fastboot flash radio radio-maguro-$RADIO.img +fastboot flash radio radio-$DEVICE-$RADIO.img fastboot reboot-bootloader sleep 5 -fastboot -w update image-yakju-$VERSION.zip EOF -chmod a+x tmp/yakju-$VERSION/flash-all.sh -(cd tmp ; tar zcvf ../yakju-$VERSION-factory.tgz yakju-$VERSION) -mv yakju-$VERSION-factory.tgz yakju-$VERSION-factory-$(sha1sum < yakju-$VERSION-factory.tgz | cut -b -8).tgz +if test "$CDMARADIO" != "" +then +cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF +fastboot flash radio-cdma radio-cdma-$DEVICE-$CDMARADIO.img +fastboot reboot-bootloader +sleep 5 +EOF +fi +cat >> tmp/$PRODUCT-$VERSION/flash-all.sh << EOF +fastboot -w update image-$PRODUCT-$VERSION.zip +EOF +chmod a+x tmp/$PRODUCT-$VERSION/flash-all.sh +cat > tmp/$PRODUCT-$VERSION/flash-base.sh << EOF +#!/bin/sh + +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +fastboot flash bootloader bootloader-$DEVICE-$BOOTLOADER.img +fastboot reboot-bootloader +sleep 5 +fastboot flash radio radio-$DEVICE-$RADIO.img +fastboot reboot-bootloader +sleep 5 +EOF +if test "$CDMARADIO" != "" +then +cat >> tmp/$PRODUCT-$VERSION/flash-base.sh << EOF +fastboot flash radio-cdma radio-cdma-$DEVICE-$CDMARADIO.img +fastboot reboot-bootloader +sleep 5 +EOF +fi +chmod a+x tmp/$PRODUCT-$VERSION/flash-base.sh +(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 rm -rf tmp diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index da0c398..fd8a7e2 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -24,6 +24,7 @@ # 239410 = IML74K # 257829 = IMM30B # 262866 = IMM30D +# 299849 = IMM76D # 241580 = IRL89 # 241968 = IRM03 ZIP=yakju-ota-241968.zip |