mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-01-23 05:41:25 -05:00
20.0: more fixes
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
e8248e4938
commit
91b908a78a
@ -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<std::string, std::string>& metadata, Ot
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user