From f65c7a4ccde4ee31de55915e4e6d66b974b34f91 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 11 Mar 2022 22:35:10 -0500 Subject: [PATCH] Tweaks Signed-off-by: Tad --- Scripts/Common/Functions.sh | 4 ++-- Scripts/LineageOS-14.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 4 ++-- Scripts/LineageOS-16.0/Functions.sh | 4 ++-- Scripts/LineageOS-17.1/Functions.sh | 8 ++++---- Scripts/LineageOS-18.1/Functions.sh | 2 +- Scripts/init.sh | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index fba1f3b9..9a67f5b8 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -326,8 +326,8 @@ processRelease() { if [ "$DOS_REMOVE_AFTER" = true ]; then echo -e "\e[0;32mRemoving to reclaim space\e[0m"; #TODO: add a sanity check - rm -rf "$OUT_DIR"; - if [ "$DOS_REMOVE_AFTER_FULL" = true ]; then rm -rf "$DOS_BUILD_BASE/out"; fi; #clobber entire workspace + rm -rf --one-file-system "$OUT_DIR"; + if [ "$DOS_REMOVE_AFTER_FULL" = true ]; then rm -rf --one-file-system "$DOS_BUILD_BASE/out"; fi; #clobber entire workspace fi; fi; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 42880868..585360ae 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -75,7 +75,7 @@ buildAll() { buildDevice himaul; #Exynos buildDevice manta; - buildDevice n7100; #broken sepolicy + #buildDevice n7100; #broken sepolicy buildDeviceUserDebug i9100; buildDeviceUserDebug i9300; buildDeviceUserDebug i9305; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index e1fe9fb4..b7cb0280 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -66,8 +66,8 @@ buildAll() { buildDevice bullhead verity; buildDevice ether; #Last version with working IMS #SD810 - buildDevice himaul; #broken - needs vendor bits - buildDevice oneplus2; #Last version with working IMS + broken - needs vendor patching + #buildDevice himaul; #broken - needs vendor bits + #buildDevice oneplus2; #Last version with working IMS + broken - needs vendor patching #SD615 buildDevice Z00T; #SD820 diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 997d4415..4434204b 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -65,13 +65,13 @@ buildAll() { #SD615 buildDevice kipper; #SD625 - buildDevice zenfone3; #broken - ninja: error: 'android.hidl.base@1.0.so', missing and no known rule to make it + #buildDevice zenfone3; #broken - ninja: error: 'android.hidl.base@1.0.so', missing and no known rule to make it #SD430 buildDevice land; #SD435 buildDevice santoni; #Intel - buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it + #buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it #Tegra buildDevice yellowstone; #broken sepolicy? } diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 2592f821..97271d25 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -79,9 +79,9 @@ buildAll() { buildDevice bonito avb; #18.1 not compiling buildDevice sargo avb; #Intel - buildDevice fugu; #broken + #buildDevice fugu; #broken #Tegra - buildDevice yellowstone; #broken + #buildDevice yellowstone; #broken } export -f buildAll; @@ -91,9 +91,9 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it ten-firewall; - #repopick -i 318916; #Fix kernel build with glibc 2.34 + repopick -it Q_asb_2022-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 00976373..09dce675 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -122,7 +122,7 @@ buildAll() { buildDevice coral avb; buildDevice flame avb; #buildDevice raphael avb; #unb + missing vendor - buildDevice vayu avb; + #buildDevice vayu avb; #broken vendor #SD765 buildDevice bramble avb; buildDevice redfin avb; diff --git a/Scripts/init.sh b/Scripts/init.sh index 1f776e4e..83da12d2 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -82,10 +82,10 @@ export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: supl.{google,vodafone,sony #Release Processing export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS -export DOS_GENERATE_DELTAS_DEVICES=('akari' 'alioth' 'Amber' 'aura' 'aurora' 'avicii' 'blueline' 'bonito' 'bramble' 'cheryl' 'coral' 'crosshatch' 'davinci' 'discovery' 'enchilada' 'fajita' 'flame' 'FP3' 'guacamole' 'guacamoleb' 'marlin' 'mata' 'pioneer' 'pro1' 'redfin' 'sailfish' 'sargo' 'sunfish' 'taimen' 'vayu' 'voyager' 'walleye' 'xz2c'); #List of devices deltas will be generated for +export DOS_GENERATE_DELTAS_DEVICES=('akari' 'alioth' 'Amber' 'aura' 'aurora' 'avicii' 'blueline' 'bonito' 'bramble' 'cheryl' 'coral' 'crosshatch' 'davinci' 'discovery' 'enchilada' 'fajita' 'flame' 'FP3' 'guacamole' 'guacamoleb' 'hotdog' 'hotdogb' 'marlin' 'mata' 'pioneer' 'pro1' 'redfin' 'sailfish' 'sargo' 'sunfish' 'taimen' 'vayu' 'voyager' 'walleye' 'xz2c'); #List of devices deltas will be generated for export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true -export DOS_REMOVE_AFTER_FULL=false; #Removes the entire OUT directory +export DOS_REMOVE_AFTER_FULL=true; #Removes the entire OUT directory export DOS_GPG_SIGNING=true; export DOS_GPG_SIGNING_KEY="B8744D67F9F1E14E145DFD8E7F627E920F316994";