sdm845-common: Sync extractors with templates

* This introduces fixup scripts and kang mode and fixes
   passing of arguments longer than one word,
   such as --section "Hello world".

Change-Id: I42dde659e9bea4f7e1c9a7a3fa8da3243774ca4e
This commit is contained in:
Vladimir Oltean 2019-03-22 22:37:05 +00:00 committed by TheScarastic
parent be0fd16758
commit 86356899cd
2 changed files with 49 additions and 38 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2018 The LineageOS Project
# Copyright (C) 2018-2019 The LineageOS Project
#
# SPDX-License-Identifier: Apache-2.0
#
@ -9,48 +9,59 @@ set -e
# Load extract_utils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
LINEAGE_ROOT="$MY_DIR"/../../..
LINEAGE_ROOT="${MY_DIR}"/../../..
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER"
HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
if [ ! -f "${HELPER}" ]; then
echo "Unable to find helper script at ${HELPER}"
exit 1
fi
. "$HELPER"
source "${HELPER}"
# Default to sanitizing the vendor folder before extraction
CLEAN_VENDOR=true
while [ "$1" != "" ]; do
case $1 in
-n | --no-cleanup ) CLEAN_VENDOR=false
;;
-s | --section ) shift
SECTION=$1
CLEAN_VENDOR=false
;;
* ) SRC=$1
;;
SECTION=
KANG=
while [ "${#}" -gt 0 ]; do
case "${1}" in
-n | --no-cleanup )
CLEAN_VENDOR=false
;;
-k | --kang )
KANG="--kang"
;;
-s | --section )
SECTION="${2}"; shift
CLEAN_VENDOR=false
;;
* )
SRC="${1}"
;;
esac
shift
done
if [ -z "$SRC" ]; then
SRC=adb
if [ -z "${SRC}" ]; then
SRC="adb"
fi
# Initialize the helper for common device
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true "$CLEAN_VENDOR"
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}"
extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION"
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
"${KANG}" --section "${SECTION}"
if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then
if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
# Reinitialize the helper for device
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR"
source "${MY_DIR}/../${DEVICE}/extract-files.sh"
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}"
extract "$MY_DIR"/../$DEVICE/proprietary-files.txt "$SRC" "$SECTION"
extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" \
"${KANG}" --section "${SECTION}"
fi
"$MY_DIR"/setup-makefiles.sh
"${MY_DIR}/setup-makefiles.sh"

View File

@ -11,40 +11,40 @@ INITIAL_COPYRIGHT_YEAR=2018
# Load extract_utils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
LINEAGE_ROOT="$MY_DIR"/../../..
LINEAGE_ROOT="${MY_DIR}/../../.."
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER"
HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
if [ ! -f "${HELPER}" ]; then
echo "Unable to find helper script at ${HELPER}"
exit 1
fi
. "$HELPER"
source "${HELPER}"
# Initialize the helper for common
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
# Copyright headers and guards
write_headers "beryllium dipper equuleus perseus polaris ursa"
# The standard common blobs
write_makefiles "$MY_DIR"/proprietary-files.txt true
write_makefiles "${MY_DIR}/proprietary-files.txt" true
# We are done!
# Finish
write_footers
if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then
if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
# Reinitialize the helper for device
INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR"
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false
# Copyright headers and guards
write_headers
# The standard device blobs
write_makefiles "$MY_DIR"/../$DEVICE/proprietary-files.txt true
write_makefiles "${MY_DIR}/../${DEVICE}/proprietary-files.txt" true
# We are done!
# Finish
write_footers
fi