extract_utils: support extracting directly from an ota zip
* Specify the ota zip name as the only parameter to extract-files.sh * Will extract to $CM_ROOT/system_dump * Bail out on A/B OTA zips. We cannot support these. * Handles block based OTA zips by using sdat2img.py * Store the zip's MD5 and check if its already extracted. If so, don't bother extracting again Change-Id: I03038e38dac51e6cb60d493c7e6362754d1daf02
This commit is contained in:
@@ -778,7 +778,7 @@ function fix_xml() {
|
||||
# extract:
|
||||
#
|
||||
# $1: file containing the list of items to extract
|
||||
# $2: path to extracted system folder, or "adb" to extract from device
|
||||
# $2: path to extracted system folder, an ota zip file, or "adb" to extract from device
|
||||
#
|
||||
function extract() {
|
||||
if [ -z "$OUTDIR" ]; then
|
||||
@@ -802,6 +802,41 @@ function extract() {
|
||||
init_adb_connection
|
||||
fi
|
||||
|
||||
if [ -f "$SRC" ] && [ "${SRC##*.}" == "zip" ]; then
|
||||
DUMPDIR="$CM_ROOT"/system_dump
|
||||
|
||||
# Check if we're working with the same zip that was passed last time.
|
||||
# If so, let's just use what's already extracted.
|
||||
MD5=`md5sum "$SRC"| awk '{print $1}'`
|
||||
OLDMD5=`cat "$DUMPDIR"/zipmd5.txt`
|
||||
|
||||
if [ "$MD5" != "$OLDMD5" ]; then
|
||||
rm -rf "$DUMPDIR"
|
||||
mkdir "$DUMPDIR"
|
||||
unzip "$SRC" -d "$DUMPDIR"
|
||||
echo "$MD5" > "$DUMPDIR"/zipmd5.txt
|
||||
|
||||
# Stop if an A/B OTA zip is detected. We cannot extract these.
|
||||
if [ -a "$DUMPDIR"/payload.bin ]; then
|
||||
echo "A/B style OTA zip detected. This is not supported at this time. Stopping..."
|
||||
exit 1
|
||||
# If OTA is block based, extract it.
|
||||
elif [ -a "$DUMPDIR"/system.new.dat ]; then
|
||||
echo "Converting system.new.dat to system.img"
|
||||
python "$CM_ROOT"/vendor/cm/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1
|
||||
rm -rf "$DUMPDIR"/system.new.dat "$DUMPDIR"/system
|
||||
mkdir "$DUMPDIR"/system "$DUMPDIR"/tmp
|
||||
echo "Requesting sudo access to mount the system.img"
|
||||
sudo mount -o loop "$DUMPDIR"/system.img "$DUMPDIR"/tmp
|
||||
cp -r "$DUMPDIR"/tmp/* "$DUMPDIR"/system/
|
||||
sudo umount "$DUMPDIR"/tmp
|
||||
rm -rf "$DUMPDIR"/tmp "$DUMPDIR"/system.img
|
||||
fi
|
||||
fi
|
||||
|
||||
SRC="$DUMPDIR"
|
||||
fi
|
||||
|
||||
if [ "$VENDOR_STATE" -eq "0" ]; then
|
||||
echo "Cleaning output directory ($OUTPUT_ROOT).."
|
||||
rm -rf "${OUTPUT_TMP:?}"
|
||||
|
Reference in New Issue
Block a user