From 027b32c6bb0fe0f5a2e69d141944001521f285a6 Mon Sep 17 00:00:00 2001 From: Giovanni Ricca Date: Tue, 12 Nov 2024 16:48:47 +0100 Subject: [PATCH] haydn: Migrate to py extract utils Change-Id: I628f85544e6fa932fbfb31905fbd249254911f1a --- extract-files.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++ extract-files.sh | 51 ----------------------------------------- setup-makefiles.py | 1 + setup-makefiles.sh | 21 ----------------- 4 files changed, 57 insertions(+), 72 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..9ba0d43 --- /dev/null +++ b/extract-files.py @@ -0,0 +1,56 @@ +#!/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/qcom-caf/sm8350', + 'hardware/xiaomi', + 'vendor/qcom/opensource/display', + 'vendor/xiaomi/sm8350-common', +] + +lib_fixups: lib_fixups_user_type = { + **lib_fixups, +} + +blob_fixups: blob_fixups_user_type = { + 'vendor/etc/camera/pureShot_parameter.xml': blob_fixup() + .regex_replace(r'=(\d+)>', r'="\1">'), + 'vendor/lib64/hw/camera.qcom.so': blob_fixup() + .binary_regex_replace(b'\x73\x74\x5F\x6C\x69\x63\x65\x6E\x73\x65\x2E\x6C\x69\x63', b'\x63\x61\x6D\x65\x72\x61\x5F\x63\x6E\x66\x2E\x74\x78\x74'), + 'vendor/lib64/hw/camera.xiaomi.so': blob_fixup() + .sig_replace('52 07 00 94', '1F 20 03 D5'), + 'vendor/lib64/vendor.xiaomi.hardware.cameraperf@1.0-impl.so': blob_fixup() + .sig_replace('21 00 80 52 7c 00 00 94', '21 00 80 52 1F 20 03 D5'), +} + +module = ExtractUtilsModule( + 'haydn', + 'xiaomi', + blob_fixups=blob_fixups, + lib_fixups=lib_fixups, + namespace_imports=namespace_imports, + add_firmware_proprietary_file=True, +) + +if __name__ == '__main__': + utils = ExtractUtils.device_with_common( + module, 'sm8350-common', module.vendor + ) + utils.run() diff --git a/extract-files.sh b/extract-files.sh deleted file mode 100755 index 22b63e8..0000000 --- a/extract-files.sh +++ /dev/null @@ -1,51 +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/camera/pureShot_parameter.xml) - [ "$2" = "" ] && return 0 - sed -i 's/=\([0-9]\+\)>/="\1">/g' "${2}" - ;; - vendor/lib64/hw/camera.qcom.so) - [ "$2" = "" ] && return 0 - sed -i "s/\x73\x74\x5F\x6C\x69\x63\x65\x6E\x73\x65\x2E\x6C\x69\x63/\x63\x61\x6D\x65\x72\x61\x5F\x63\x6E\x66\x2E\x74\x78\x74/g" "${2}" - ;; - vendor/lib64/hw/camera.xiaomi.so) - [ "$2" = "" ] && return 0 - "${SIGSCAN}" -p "52 07 00 94" -P "1F 20 03 D5" -f "${2}" - ;; - vendor/lib64/vendor.xiaomi.hardware.cameraperf@1.0-impl.so) - [ "$2" = "" ] && return 0 - "${SIGSCAN}" -p "21 00 80 52 7c 00 00 94" -P "21 00 80 52 1F 20 03 D5" -f "${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=haydn -export DEVICE_COMMON=sm8350-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 dd792b9..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=haydn -export DEVICE_COMMON=sm8350-common -export VENDOR=xiaomi -export VENDOR_COMMON=${VENDOR} - -"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"