Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

20.0: more fixes

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-10-17 06:39:52 -04:00
parent e8248e4938
commit 91b908a78a
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/LineageOS-20.0/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] reject updates with serialno constraints
1 file changed, 2 insertions(+), 14 deletions(-) 1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/install/install.cpp b/install/install.cpp diff --git a/install/install.cpp b/install/install.cpp
index 56b3ad7f..18a88489 100644 index 61bab17b..e14cbf50 100644
--- a/install/install.cpp --- a/install/install.cpp
+++ b/install/install.cpp +++ b/install/install.cpp
@@ -221,22 +221,10 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot @@ -221,22 +221,10 @@ bool CheckPackageMetadata(const std::map<std::string, std::string>& metadata, Ot

6
Scripts/LineageOS-20.0/Functions.sh
View File

@ -67,9 +67,9 @@ buildAll() {
#SD730 #SD730
buildDevice sunfish avb; buildDevice sunfish avb;
#SD865 #SD865
buildDevice instantnoodle avb; #FIXME buildDevice instantnoodle avb;
buildDevice instantnoodlep avb; #FIXME buildDevice instantnoodlep avb;
buildDevice kebab avb; #FIXME buildDevice kebab avb;
#SD888 #SD888
buildDevice lemonade avb; buildDevice lemonade avb;
buildDevice lemonadep avb; buildDevice lemonadep avb;

5
Scripts/LineageOS-20.0/Patch.sh
View File

@ -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; #rm -rfv device/*/*/overlay/CarrierConfigResCommon device/*/*/rro_overlays/CarrierConfigOverlay device/*/*/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml;
#Fix broken options enabled by hardenDefconfig() #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 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=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; 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 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; rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;