extract_utils: extract(): fix src not being searched in "src:dst;args" spec
* Root cause of the issue is improper naming of variables. Turns out,
there was no variable to even denote where the blob should have been
searched for, at "src".
* Previously there was one such variable, suggestively called "TARGET", that
was desperately trying to serve as both, depending on who +2d hacks harder.
* One such example is "e02a942 extract_utils: Fix makefile generation issues".
That patch deliberately trimmed the "src:" from a spec (therefore
obviously breaking the search at src) but enabling the searching at
dst, via the good-for-all TARGET variable.
* This patch introduces the following variables:
- SRC_FILE: absolute path corresponding to SPEC_SRC_FILE in the
Android filesystem.
- DST_FILE: absolute path corresponding to SPEC_DST_FILE in the
Android filesystem. Somewhat analogous to the old TARGET variable,
but actually contains the leading / as well (/system/bin/adsprpcd
instead of system/bin/adsprpcd).
* Use existing common get_file() function (which previously was
impossible to use, because it was impossible to determine calling
arguments properly) to reduce complexity of handling adb and disk
image as blob sources.
* Via the new SRC_FILE and DST_FILE variables, search for a blob in all
possible locations (including paths stripped of "/system" which
transforms an absolute path in the Android filesystem into a proper
relative path to that file in a disk image).
Change-Id: Ic40fb4dc93541d8b3f33fde586b773199cf4ded2
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
diff --git a/extract_utils.sh b/extract_utils.sh
index 334470b..c79e907 100644
--- a/extract_utils.sh
+++ b/extract_utils.sh
@@ -985,30 +985,32 @@
local SPEC_SRC_FILE=$(src_file "${FILELIST[$i-1]}")
local SPEC_DST_FILE=$(target_file "${FILELIST[$i-1]}")
local SPEC_ARGS=$(target_args "${FILELIST[$i-1]}")
- local OUTPUT_DIR="$OUTPUT_ROOT"
- local TMP_DIR="$OUTPUT_TMP"
- local TARGET=
+ local OUTPUT_DIR=
+ local TMP_DIR=
+ local SRC_FILE=
+ local DST_FILE=
if [ "${SPEC_ARGS}" = "rootfs" ]; then
- TARGET="${SPEC_DST_FILE}"
- OUTPUT_DIR="$OUTPUT_DIR/rootfs"
- TMP_DIR="$TMP_DIR/rootfs"
+ OUTPUT_DIR="${OUTPUT_ROOT}/rootfs"
+ TMP_DIR="${OUTPUT_TMP}/rootfs"
+ SRC_FILE="/${SPEC_SRC_FILE}"
+ DST_FILE="/${SPEC_DST_FILE}"
else
- TARGET="system/${SPEC_DST_FILE}"
- SPEC_SRC_FILE="system/${SPEC_SRC_FILE}"
+ OUTPUT_DIR="${OUTPUT_ROOT}"
+ TMP_DIR="${OUTPUT_TMP}"
+ SRC_FILE="/system/${SPEC_SRC_FILE}"
+ DST_FILE="/system/${SPEC_DST_FILE}"
fi
if [ "$SRC" = "adb" ]; then
- printf ' - %s .. ' "/$TARGET"
+ printf ' - %s .. ' "${DST_FILE}"
else
- printf ' - %s \n' "/$TARGET"
+ printf ' - %s \n' "${DST_FILE}"
fi
- local DIR=$(dirname "${SPEC_DST_FILE}")
- if [ ! -d "$OUTPUT_DIR/$DIR" ]; then
- mkdir -p "$OUTPUT_DIR/$DIR"
- fi
- local VENDOR_REPO_FILE="$OUTPUT_DIR/${SPEC_DST_FILE}"
+ # Strip the file path in the vendor repo of "system", if present
+ local VENDOR_REPO_FILE="$OUTPUT_DIR/${DST_FILE#/system}"
+ mkdir -p $(dirname "${VENDOR_REPO_FILE}")
# Check pinned files
local HASH="${HASHLIST[$i-1]}"
@@ -1017,7 +1019,7 @@
if [ -f "${VENDOR_REPO_FILE}" ]; then
local PINNED="${VENDOR_REPO_FILE}"
else
- local PINNED="$TMP_DIR/${SPEC_DST_FILE}"
+ local PINNED="${TMP_DIR}${DST_FILE#/system}"
fi
if [ -f "$PINNED" ]; then
if [ "$(uname)" == "Darwin" ]; then
@@ -1036,21 +1038,20 @@
if [ "$KEEP" = "1" ]; then
printf ' + (keeping pinned file with hash %s)\n' "$HASH"
- elif [ "$SRC" = "adb" ]; then
- # Try Lineage target first
- adb pull "/$TARGET" "${VENDOR_REPO_FILE}"
- # if file does not exist try OEM target
- if [ "$?" != "0" ]; then
- adb pull "/${SPEC_SRC_FILE}" "${VENDOR_REPO_FILE}"
- fi
else
- # Try Lineage target first
- if [ -f "$SRC/$TARGET" ]; then
- cp "$SRC/$TARGET" "${VENDOR_REPO_FILE}"
- # if file does not exist try OEM target
- elif [ -f "$SRC/${SPEC_SRC_FILE}" ]; then
- cp "$SRC/${SPEC_SRC_FILE}" "${VENDOR_REPO_FILE}"
- else
+ FOUND=false
+ # Try Lineage target first.
+ # Also try to search for files stripped of
+ # the "/system" prefix, if we're actually extracting
+ # from a system image.
+ for CANDIDATE in "${DST_FILE}" "${DST_FILE#/system}" "${SRC_FILE}" "${SRC_FILE#/system}"; do
+ get_file ${CANDIDATE} ${VENDOR_REPO_FILE} ${SRC} && {
+ FOUND=true
+ break
+ }
+ done
+
+ if [ "${FOUND}" = false ]; then
printf ' !! file not found in source\n'
fi
fi
@@ -1070,6 +1071,7 @@
fi
if [ -f "${VENDOR_REPO_FILE}" ]; then
+ local DIR=$(dirname "${VENDOR_REPO_FILE}")
local TYPE="${DIR##*/}"
if [ "$TYPE" = "bin" -o "$TYPE" = "sbin" ]; then
chmod 755 "${VENDOR_REPO_FILE}"