From 6ee1b45e9cf409cb5999196719daa3e232080b8a Mon Sep 17 00:00:00 2001 From: basamaryan Date: Sun, 13 Oct 2024 20:00:11 -0400 Subject: [PATCH] sweet: Switch to py extract utils Change-Id: If53e93faec4f455542c9eb46ece28d355e5910e4 --- extract-files.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ extract-files.sh | 47 ---------------------------------------- setup-makefiles.py | 1 + setup-makefiles.sh | 21 ------------------ 4 files changed, 55 insertions(+), 68 deletions(-) create mode 100755 extract-files.py delete mode 100755 extract-files.sh create mode 100755 setup-makefiles.py delete mode 100755 setup-makefiles.sh diff --git a/extract-files.py b/extract-files.py new file mode 100755 index 0000000..46170a5 --- /dev/null +++ b/extract-files.py @@ -0,0 +1,54 @@ +#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3 +# +# SPDX-FileCopyrightText: 2024 The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 +# + +from extract_utils.fixups_blob import ( + blob_fixup, + blob_fixups_user_type, +) +from extract_utils.fixups_lib import ( + lib_fixup_remove, + lib_fixups, + lib_fixups_user_type, +) +from extract_utils.main import ( + ExtractUtils, + ExtractUtilsModule, +) + +namespace_imports = [ + 'hardware/xiaomi', + 'vendor/qcom/opensource/display', + 'vendor/xiaomi/sm6150-common', +] + +lib_fixups: lib_fixups_user_type = { + **lib_fixups, + 'libgrallocutils': lib_fixup_remove, +} + + +blob_fixups: blob_fixups_user_type = { + 'vendor/etc/init/init.batterysecret.rc': blob_fixup() + .regex_replace(' +seclabel u:r:batterysecret:s0\n', ''), + 'vendor/etc/init/init.mi_thermald.rc': blob_fixup() + .regex_replace(' +seclabel u:r:mi_thermald:s0\n', ''), + 'vendor/lib64/camera/components/com.qti.node.watermark.so': blob_fixup() + .add_needed('libpiex_shim.so'), +} # fmt: skip + +module = ExtractUtilsModule( + 'sweet', + 'xiaomi', + blob_fixups=blob_fixups, + lib_fixups=lib_fixups, + namespace_imports=namespace_imports, +) + +if __name__ == '__main__': + utils = ExtractUtils.device_with_common( + module, 'sm6150-common', module.vendor + ) + utils.run() diff --git a/extract-files.sh b/extract-files.sh deleted file mode 100755 index fd10c6d..0000000 --- a/extract-files.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# -# SPDX-FileCopyrightText: 2016 The CyanogenMod Project -# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project -# SPDX-License-Identifier: Apache-2.0 -# - -function blob_fixup() { - case "${1}" in - vendor/etc/init/init.batterysecret.rc) - [ "$2" = "" ] && return 0 - sed -i "/seclabel u:r:batterysecret:s0/d" "${2}" - ;; - vendor/etc/init/init.mi_thermald.rc) - [ "$2" = "" ] && return 0 - sed -i "/seclabel u:r:mi_thermald:s0/d" "${2}" - ;; - vendor/lib64/camera/components/com.qti.node.watermark.so) - [ "$2" = "" ] && return 0 - grep -q "libpiex_shim.so" "${2}" || "${PATCHELF}" --add-needed "libpiex_shim.so" "${2}" - ;; - *) - return 1 - ;; - esac - - return 0 -} - -function blob_fixup_dry() { - blob_fixup "$1" "" -} - -# If we're being sourced by the common script that we called, -# stop right here. No need to go down the rabbit hole. -if [ "${BASH_SOURCE[0]}" != "${0}" ]; then - return -fi - -set -e - -export DEVICE=sweet -export DEVICE_COMMON=sm6150-common -export VENDOR=xiaomi -export VENDOR_COMMON=${VENDOR} - -"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/setup-makefiles.py b/setup-makefiles.py new file mode 100755 index 0000000..32947cf --- /dev/null +++ b/setup-makefiles.py @@ -0,0 +1 @@ +#!./extract-files.py --regenerate_makefiles diff --git a/setup-makefiles.sh b/setup-makefiles.sh deleted file mode 100755 index bed6ab6..0000000 --- a/setup-makefiles.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# SPDX-FileCopyrightText: 2016 The CyanogenMod Project -# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project -# SPDX-License-Identifier: Apache-2.0 -# - -# If we're being sourced by the common script that we called, -# stop right here. No need to go down the rabbit hole. -if [ "${BASH_SOURCE[0]}" != "${0}" ]; then - return -fi - -set -e - -export DEVICE=sweet -export DEVICE_COMMON=sm6150-common -export VENDOR=xiaomi -export VENDOR_COMMON=${VENDOR} - -"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"