From 91b908a78acff2da17497014a4802d451d2892f1 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 17 Oct 2022 06:39:52 -0400 Subject: [PATCH] 20.0: more fixes Signed-off-by: Tad --- .../0001-No_SerialNum_Restrictions.patch | 2 +- Scripts/LineageOS-20.0/Functions.sh | 6 +++--- Scripts/LineageOS-20.0/Patch.sh | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Patches/LineageOS-20.0/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch b/Patches/LineageOS-20.0/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch index bb356edf..4919c83d 100644 --- a/Patches/LineageOS-20.0/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch +++ b/Patches/LineageOS-20.0/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch @@ -8,7 +8,7 @@ Subject: [PATCH] reject updates with serialno constraints 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/install/install.cpp b/install/install.cpp -index 56b3ad7f..18a88489 100644 +index 61bab17b..e14cbf50 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -221,22 +221,10 @@ bool CheckPackageMetadata(const std::map& metadata, Ot diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index df786ca2..bf7808bc 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -67,9 +67,9 @@ buildAll() { #SD730 buildDevice sunfish avb; #SD865 - buildDevice instantnoodle avb; #FIXME - buildDevice instantnoodlep avb; #FIXME - buildDevice kebab avb; #FIXME + buildDevice instantnoodle avb; + buildDevice instantnoodlep avb; + buildDevice kebab avb; #SD888 buildDevice lemonade avb; buildDevice lemonadep avb; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 09112c19..d2516a90 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -417,9 +417,10 @@ cd "$DOS_BUILD_BASE"; #rm -rfv device/*/*/overlay/CarrierConfigResCommon device/*/*/rro_overlays/CarrierConfigOverlay device/*/*/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml; #Fix broken options enabled by hardenDefconfig() +sed -i "s/CONFIG_FORTIFY_SOURCE=y/# CONFIG_FORTIFY_SOURCE is not set/" kernel/google/msm-4.14/arch/arm64/configs/*_defconfig; #breaks compile sed -i "s/CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y/# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set/" kernel/google/msm-4.14/arch/arm64/configs/*_defconfig; #impartial backport -echo -e "\nCONFIG_DEBUG_FS=y" >> kernel/oneplus/sm8150/arch/arm64/configs/vendor/sm8150-perf_defconfig; -echo -e "\nCONFIG_DEBUG_FS=n" >> kernel/oneplus/sm8250/arch/arm64/configs/vendor/kona-perf_defconfig; +echo -e "\nCONFIG_DEBUG_FS=y" >> kernel/oneplus/sm8150/arch/arm64/configs/vendor/sm8150-perf_defconfig; #compile failure +echo -e "\nCONFIG_DEBUG_FS=n" >> kernel/oneplus/sm8250/arch/arm64/configs/vendor/kona-perf_defconfig; #vintf failure sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l* || true; #Fix builds with GCC 10 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;