toro: Take blobs from 4.2.2 images
Change-Id: I45e1c25068a06a9857826c70d6dbd391ea2d0c7e
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/merge-gnexus-blobs b/merge-gnexus-blobs
index 8fe7a51..b5e11a0 100755
--- a/merge-gnexus-blobs
+++ b/merge-gnexus-blobs
@@ -80,16 +80,16 @@
cd ../..
fi
fi
-[ -e takju-jop40d-factory-e4d13f14.tgz ] || wget https://dl.google.com/dl/android/aosp/takju-jop40d-factory-e4d13f14.tgz
-[ -d takju-jop40d ] || tar xf takju-jop40d-factory-e4d13f14.tgz
+[ -e takju-jdq39-factory-5e273f02.tgz ] || wget https://dl.google.com/dl/android/aosp/takju-jdq39-factory-5e273f02.tgz
+[ -d takju-jdq39 ] || tar xf takju-jdq39-factory-5e273f02.tgz
[ -e recovery-clockwork-touch-6.0.2.3-maguro.img ] || wget http://download2.clockworkmod.com/recoveries/recovery-clockwork-touch-6.0.2.3-maguro.img
-cd takju-jop40d
+cd takju-jdq39
if [ ! -e system.img ]; then
- unzip image-takju-jop40d.zip
+ unzip image-takju-jdq39.zip
fi
cd ..
simg2img "$SRC"/system.img linaro.ext4
-simg2img takju-jop40d/system.img blob.ext4
+simg2img takju-jdq39/system.img blob.ext4
mkdir -p blob linaro system
$SUDO mount -t ext4 -o loop,ro linaro.ext4 linaro
$SUDO mount -t ext4 -o loop,ro blob.ext4 blob
@@ -228,14 +228,14 @@
cp \
"$SRC"/boot.img \
"$SRC"/userdata.img \
- ../takju-jop40d/android-info.txt \
+ ../takju-jdq39/android-info.txt \
./
# We don't currently have a Linaro recovery system, so let's use the
# most commonly used good one...
cp ../recovery-clockwork-touch-6.0.2.3-maguro.img \
recovery.img
-zip ../linaro-takju-jop40d.zip boot.img recovery.img system.img userdata.img android-info.txt
+zip ../linaro-takju-jdq39.zip boot.img recovery.img system.img userdata.img android-info.txt
cd ..
FASTBOOT="`which fastboot 2>/dev/null || :`"
@@ -282,7 +282,7 @@
echo
echo "Use"
echo " $SUDO $FASTBOOT oem unlock"
- echo " $SUDO $FASTBOOT -w update linaro-takju-jop40d.zip"
+ echo " $SUDO $FASTBOOT -w update linaro-takju-jdq39.zip"
echo "to flash the image manually. Make sure you have the current"
echo "boot loader and radio firmware installed first."
echo
@@ -302,4 +302,4 @@
echo
# Expected to fail if the device is already unlocked
$SUDO $FASTBOOT oem unlock || :
-$SUDO $FASTBOOT -w update linaro-takju-jop40d.zip
+$SUDO $FASTBOOT -w update linaro-takju-jdq39.zip
