From 702ea9c91f4c98d6edc0e37102d8fc10acc65204 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 30 Jul 2021 11:49:51 -0400 Subject: [PATCH] Move FP3 to 18.1 Signed-off-by: Tad --- Manifests/Manifest_LAOS-17.1.xml | 4 ---- Manifests/Manifest_LAOS-18.1.xml | 4 ++++ Scripts/LineageOS-17.1/Functions.sh | 4 +--- Scripts/LineageOS-17.1/Patch.sh | 4 ---- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 0 Scripts/LineageOS-18.1/Functions.sh | 4 +++- Scripts/LineageOS-18.1/Patch.sh | 4 ++++ 7 files changed, 12 insertions(+), 12 deletions(-) rename Scripts/{LineageOS-17.1 => LineageOS-18.1}/CVE_Patchers/android_kernel_fairphone_sdm632.sh (100%) diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml index c977873c..4a11f59b 100644 --- a/Manifests/Manifest_LAOS-17.1.xml +++ b/Manifests/Manifest_LAOS-17.1.xml @@ -75,10 +75,6 @@ - - - - diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml index 6c00c522..5ce5a5bc 100644 --- a/Manifests/Manifest_LAOS-18.1.xml +++ b/Manifests/Manifest_LAOS-18.1.xml @@ -84,6 +84,10 @@ + + + + diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 4d1c698f..33e8de3d 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2020-04-14 patchAllKernels() { - startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996"; + startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996"; } export -f patchAllKernels; @@ -69,8 +69,6 @@ buildAll() { #SD821 buildDevice marlin verity; buildDevice sailfish verity; - #SD632 - buildDevice FP3 avb; #SD855 buildDevice guacamoleb avb; #SD660 diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index fbde379c..6aa4a0e9 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -280,10 +280,6 @@ if enterAndClear "device/cyanogen/msm8916-common"; then awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools fi; -if enterAndClear "device/fairphone/FP3"; then -enableVerity; #Resurrect dm-verity -fi; - if enterAndClear "device/google/bonito"; then enableVerity; #Resurrect dm-verity awk -i inplace '!/INODE_COUNT/' BoardConfig-lineage.mk; #mke2fs -1 incompatibility (?) diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh similarity index 100% rename from Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh rename to Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 60c48db6..6c2d3157 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2021-03-22 patchAllKernels() { - startPatcher "kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_jf kernel_samsung_msm8930-common kernel_samsung_msm8974 kernel_xiaomi_sdm845"; + startPatcher "kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_jf kernel_samsung_msm8930-common kernel_samsung_msm8974 kernel_xiaomi_sdm845"; } export -f patchAllKernels; @@ -97,6 +97,8 @@ buildAll() { buildDevice blueline avb; buildDevice enchilada avb; buildDevice fajita avb; + #SD632 + buildDevice FP3 avb; #SD855 buildDevice guacamole avb; buildDevice hotdog avb; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index f3316be2..61c8070e 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -276,6 +276,10 @@ if enterAndClear "device/essential/mata"; then git revert --no-edit 1f1d061c4d7ddedcac503608e8fa333aff30a693 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls fi; +if enterAndClear "device/fairphone/FP3"; then +enableVerity; #Resurrect dm-verity +fi; + if enterAndClear "device/fxtec/pro1"; then enableVerity; #Resurrect dm-verity fi;