diff --git a/Manifests/Manifest_LAOS-20.0.xml b/Manifests/Manifest_LAOS-20.0.xml index 95246986..8e40861b 100644 --- a/Manifests/Manifest_LAOS-20.0.xml +++ b/Manifests/Manifest_LAOS-20.0.xml @@ -103,6 +103,25 @@ + + + + + + + + diff --git a/Scripts/Common/Copy_Keys.sh b/Scripts/Common/Copy_Keys.sh index 0cddbc76..6f27ab17 100644 --- a/Scripts/Common/Copy_Keys.sh +++ b/Scripts/Common/Copy_Keys.sh @@ -29,6 +29,8 @@ cat "$DOS_SIGNING_KEYS/aurora/verity.x509.pem" >> "kernel/sony/sdm845/certs/veri cat "$DOS_SIGNING_KEYS/avicii/verity.x509.pem" >> "kernel/oneplus/sm7250/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/barbet/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/beryllium/verity.x509.pem" >> "kernel/xiaomi/sdm845/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/bluejay/verity.x509.pem" >> "kernel/google/bluejay/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/bluejay/verity.x509.pem" >> "kernel/google/gs101/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/blueline/verity.x509.pem" >> "kernel/google/msm-4.9/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bonito/verity.x509.pem" >> "kernel/google/bonito/certs/verity.x509.pem"; @@ -36,6 +38,7 @@ cat "$DOS_SIGNING_KEYS/bonito/verity.x509.pem" >> "kernel/google/msm-4.9/certs/v cat "$DOS_SIGNING_KEYS/bramble/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/bullhead/verity.x509.pem" >> "kernel/lge/bullhead/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/cheeseburger/verity.x509.pem" >> "kernel/oneplus/msm8998/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/cheetah/verity.x509.pem" >> "kernel/google/gs201/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/cheryl/verity.x509.pem" >> "kernel/razer/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/coral/verity.x509.pem" >> "kernel/google/coral/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/crosshatch/verity.x509.pem" >> "kernel/google/crosshatch/certs/verity.x509.pem"; @@ -65,9 +68,14 @@ cat "$DOS_SIGNING_KEYS/lmi/verity.x509.pem" >> "kernel/xiaomi/sm8250/certs/verit cat "$DOS_SIGNING_KEYS/marlin/verity.x509.pem" >> "kernel/google/marlin/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/mata/verity.x509.pem" >> "kernel/essential/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/oneplus3/verity.x509.pem" >> "kernel/oneplus3/msm8996/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/oriole/verity.x509.pem" >> "kernel/google/gs101/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/oriole/verity.x509.pem" >> "kernel/google/raviole/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/panther/verity.x509.pem" >> "kernel/google/gs201/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/pioneer/verity.x509.pem" >> "kernel/sony/sdm660/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/pro1/verity.x509.pem" >> "kernel/fxtec/msm8998/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/raphael/verity.x509.pem" >> "kernel/xiaomi/sm8150/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/raven/verity.x509.pem" >> "kernel/google/gs101/certs/verity.x509.pem"; +cat "$DOS_SIGNING_KEYS/raven/verity.x509.pem" >> "kernel/google/raviole/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/redfin/verity.x509.pem" >> "kernel/google/redbull/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/sailfish/verity.x509.pem" >> "kernel/google/marlin/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/sargo/verity.x509.pem" >> "kernel/google/bonito/certs/verity.x509.pem"; @@ -93,6 +101,8 @@ cp -v "$DOS_SIGNING_KEYS/aurora/verifiedboot_relkeys.der.x509" "kernel/sony/sdm8 cp -v "$DOS_SIGNING_KEYS/avicii/verifiedboot_relkeys.der.x509" "kernel/oneplus/sm7250/verifiedboot_avicii_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/barbet/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_barbet_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/beryllium/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sdm845/verifiedboot_beryllium_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/bluejay/verifiedboot_relkeys.der.x509" "kernel/google/bluejay/verifiedboot_bluejay_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/bluejay/verifiedboot_relkeys.der.x509" "kernel/google/gs101/verifiedboot_bluejay_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_blueline_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/blueline/verifiedboot_relkeys.der.x509" "kernel/google/msm-4.9/verifiedboot_blueline_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bonito/verifiedboot_relkeys.der.x509" "kernel/google/bonito/verifiedboot_bonito_dos_relkeys.der.x509"; @@ -100,6 +110,7 @@ cp -v "$DOS_SIGNING_KEYS/bonito/verifiedboot_relkeys.der.x509" "kernel/google/ms cp -v "$DOS_SIGNING_KEYS/bramble/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_bramble_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/bullhead/verifiedboot_relkeys.der.x509" "kernel/lge/bullhead/verifiedboot_bullhead_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/cheeseburger/verifiedboot_relkeys.der.x509" "kernel/oneplus/msm8998/verifiedboot_cheeseburger_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/cheetah/verifiedboot_relkeys.der.x509" "kernel/google/gs201/verifiedboot_cheetah_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/cheryl/verifiedboot_relkeys.der.x509" "kernel/razer/msm8998/verifiedboot_cheryl_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/coral/verifiedboot_relkeys.der.x509" "kernel/google/coral/verifiedboot_coral_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/crosshatch/verifiedboot_relkeys.der.x509" "kernel/google/crosshatch/verifiedboot_crosshatch_dos_relkeys.der.x509"; @@ -129,9 +140,14 @@ cp -v "$DOS_SIGNING_KEYS/lmi/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sm825 cp -v "$DOS_SIGNING_KEYS/marlin/verifiedboot_relkeys.der.x509" "kernel/google/marlin/verifiedboot_marlin_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/mata/verifiedboot_relkeys.der.x509" "kernel/essential/msm8998/verifiedboot_mata_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/oneplus3/verifiedboot_relkeys.der.x509" "kernel/oneplus/msm8996/verifiedboot_oneplus3_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/oriole/verifiedboot_relkeys.der.x509" "kernel/google/gs101/verifiedboot_oriole_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/oriole/verifiedboot_relkeys.der.x509" "kernel/google/raviole/verifiedboot_oriole_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/panther/verifiedboot_relkeys.der.x509" "kernel/google/gs201/verifiedboot_panther_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/pioneer/verifiedboot_relkeys.der.x509" "kernel/sony/sdm660/verifiedboot_pioneer_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/pro1/verifiedboot_relkeys.der.x509" "kernel/fxtec/msm8998/verifiedboot_pro1_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/raphael/verifiedboot_relkeys.der.x509" "kernel/xiaomi/sm8150/verifiedboot_raphael_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/raven/verifiedboot_relkeys.der.x509" "kernel/google/gs101/verifiedboot_raven_dos_relkeys.der.x509"; +cp -v "$DOS_SIGNING_KEYS/raven/verifiedboot_relkeys.der.x509" "kernel/google/raviole/verifiedboot_raven_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/redfin/verifiedboot_relkeys.der.x509" "kernel/google/redbull/verifiedboot_redfin_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/sailfish/verifiedboot_relkeys.der.x509" "kernel/google/marlin/verifiedboot_sailfish_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/sargo/verifiedboot_relkeys.der.x509" "kernel/google/bonito/verifiedboot_sargo_dos_relkeys.der.x509"; diff --git a/Scripts/Common/Enable_Verity.sh b/Scripts/Common/Enable_Verity.sh index 75c13341..72dbf2a4 100644 --- a/Scripts/Common/Enable_Verity.sh +++ b/Scripts/Common/Enable_Verity.sh @@ -94,13 +94,22 @@ enableAVB "device/fairphone/FP3"; enableAVB "device/fairphone/FP4"; enableAVB "device/fxtec/pro1"; enableAVB "device/google/barbet"; +enableAVB "device/google/bluejay"; enableAVB "device/google/blueline"; enableAVB "device/google/bonito"; enableAVB "device/google/bramble"; +enableAVB "device/google/cheetah"; enableAVB "device/google/coral"; enableAVB "device/google/crosshatch"; enableAVB "device/google/flame"; +enableAVB "device/google/gs101"; +enableAVB "device/google/gs201"; enableAVB "device/google/muskie"; +enableAVB "device/google/oriole"; +enableAVB "device/google/pantah"; +enableAVB "device/google/panther"; +enableAVB "device/google/raven"; +enableAVB "device/google/raviole"; enableAVB "device/google/redbull"; enableAVB "device/google/redfin"; enableAVB "device/google/sargo"; @@ -180,15 +189,19 @@ sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/es sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/fairphone/FP3/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/fairphone/FP4/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/fxtec/pro1/system.prop &>/dev/null || true; +sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/bluejay/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/bonito/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/coral/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/crosshatch/product.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/crosshatch/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/dragon/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/marlin/system.prop &>/dev/null || true; +sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/pantah/vendor.prop &>/dev/null || true; +sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/raviole/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/redbull/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/sunfish/vendor.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/wahoo/system.prop &>/dev/null || true; +#sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/yellowstone/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/huawei/angler/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/lge/bullhead/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/moto/shamu/system.prop &>/dev/null || true; @@ -203,7 +216,6 @@ sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/on sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/oneplus/sm8350-common/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/razer/aura/system.prop &>/dev/null || true; sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/razer/cheryl/system.prop &>/dev/null || true; -#sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/google/yellowstone/system.prop &>/dev/null || true; #sed -zi '/ro.oem_unlock_supported=1/!s/$/\nro.oem_unlock_supported=1/' device/yandex/Amber/system.prop &>/dev/null || true; cd "$DOS_BUILD_BASE"; diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 2922b06a..73193ce5 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -224,8 +224,8 @@ processRelease() { echo -e "\e[0;32m\t+ Verified Boot 2.0 with VBMETA and NOCHAIN\e[0m"; fi; + #XXX: --extra_apks Bluetooth.apk="$KEY_DIR/bluetooth" \ local APK_SWITCHES=(--extra_apks AdServicesApk.apk="$KEY_DIR/releasekey" \ - --extra_apks Bluetooth.apk="$KEY_DIR/bluetooth" \ --extra_apks HalfSheetUX.apk="$KEY_DIR/releasekey" \ --extra_apks OsuLogin.apk="$KEY_DIR/releasekey" \ --extra_apks SafetyCenterResources.apk="$KEY_DIR/releasekey" \ @@ -344,7 +344,7 @@ processRelease() { #Deltas #grep update_engine Build/*/device/*/*/*.mk -l - local DOS_GENERATE_DELTAS_DEVICES=('akari' 'alioth' 'Amber' 'aura' 'aurora' 'avicii' 'barbet' 'blueline' 'bonito' 'bramble' 'cheryl' 'coral' 'crosshatch' 'davinci' 'discovery' 'enchilada' 'fajita' 'flame' 'FP3' 'FP4' 'guacamole' 'guacamoleb' 'hotdog' 'hotdogb' 'instantnoodle' 'instantnoodlep' 'kebab' 'lemonade' 'lemonadep' 'marlin' 'mata' 'pioneer' 'pro1' 'redfin' 'sailfish' 'sargo' 'sunfish' 'taimen' 'vayu' 'voyager' 'walleye' 'xz2c'); + local DOS_GENERATE_DELTAS_DEVICES=('akari' 'alioth' 'Amber' 'aura' 'aurora' 'avicii' 'barbet' 'bluejay' 'blueline' 'bonito' 'bramble' 'cheetah' 'cheryl' 'coral' 'crosshatch' 'davinci' 'discovery' 'enchilada' 'fajita' 'flame' 'FP3' 'FP4' 'guacamole' 'guacamoleb' 'hotdog' 'hotdogb' 'instantnoodle' 'instantnoodlep' 'kebab' 'lemonade' 'lemonadep' 'marlin' 'mata' 'oriole' 'panther' 'pioneer' 'pro1' 'raven' 'redfin' 'sailfish' 'sargo' 'sunfish' 'taimen' 'vayu' 'voyager' 'walleye' 'xz2c'); #TODO: check lmi/alioth if [ "$DOS_GENERATE_DELTAS" = true ]; then if [[ " ${DOS_GENERATE_DELTAS_DEVICES[@]} " =~ " ${DEVICE} " ]]; then for LAST_TARGET_FILES in $ARCHIVE/target_files/$DOS_BRANDING_ZIP_PREFIX-$VERSION-*-dos-$DEVICE-target_files.zip; do @@ -570,7 +570,9 @@ export -f hardenUserdata; enableAutoVarInit() { #grep TARGET_KERNEL_CLANG_COMPILE Build/*/device/*/*/*.mk -l - local DOS_AUTOVARINIT_KERNELS=('essential/msm8998' 'fairphone/sdm632' 'fxtec/msm8998' 'google/coral' 'google/msm-4.9' 'google/msm-4.14' 'google/sunfish' 'google/wahoo' 'oneplus/msm8996' 'oneplus/msm8998' 'oneplus/sdm845' 'oneplus/sm7250' 'oneplus/sm8150' 'oneplus/sm8250' 'razer/msm8998' 'razer/sdm845' 'samsung/universal9810' 'sony/sdm660' 'sony/sdm845' 'xiaomi/sdm660' 'xiaomi/sdm845' 'xiaomi/sm6150' 'xiaomi/sm8150' 'xiaomi/sm8250' 'zuk/msm8996'); #redbull/lemonade*/FP4 already supports init_stack_all_zero + #but exclude: grep INIT_STACK_ALL_ZERO Build/*/kernel/*/*/security/Kconfig.hardening -l + #already supported: fairphone/sm7225, google/bluejay, google/gs101, google/gs201, google/msm-4.14, google/raviole, google/redbull, oneplus/sm8250, oneplus/sm8350 + local DOS_AUTOVARINIT_KERNELS=('essential/msm8998' 'fairphone/sdm632' 'fxtec/msm8998' 'google/coral' 'google/msm-4.9' 'google/sunfish' 'google/wahoo' 'oneplus/msm8996' 'oneplus/msm8998' 'oneplus/sdm845' 'oneplus/sm7250' 'oneplus/sm8150' 'razer/msm8998' 'razer/sdm845' 'samsung/universal9810' 'sony/sdm660' 'sony/sdm845' 'xiaomi/sdm660' 'xiaomi/sdm845' 'xiaomi/sm6150' 'xiaomi/sm8150' 'xiaomi/sm8250' 'zuk/msm8996'); cd "$DOS_BUILD_BASE"; echo "auto-var-init: Starting!"; for kernel in "${DOS_AUTOVARINIT_KERNELS[@]}" @@ -932,13 +934,15 @@ hardenDefconfig() { #Hardware enablement #XXX: This needs a better home optionsYes+=("HID_GENERIC" "HID_STEAM" "HID_SONY" "HID_WIIMOTE" "INPUT_JOYSTICK" "JOYSTICK_XPAD" "USB_USBNET" "USB_NET_CDCETHER"); - modernKernels=('fairphone/sm7225' 'google/coral' 'google/redbull' 'google/sunfish' 'oneplus/sm8150' 'oneplus/sm8250' 'oneplus/sm8350' 'xiaomi/sm8150' 'xiaomi/sm8250'); + #grep INIT_ON_ALLOC_DEFAULT_ON Build/*/kernel/*/*/security/Kconfig.hardening -l + modernKernels=('fairphone/sm7225' 'google/barbet' 'google/bluejay' 'google/coral' 'google/gs101' 'google/gs201' 'google/msm-4.14' 'google/raviole' 'google/redbull' 'google/sunfish' 'oneplus/sm8150' 'oneplus/sm8250' 'oneplus/sm8350' 'xiaomi/sm8150' 'xiaomi/sm8250'); for kernelModern in "${modernKernels[@]}"; do if [[ "$1" == *"/$kernelModern"* ]]; then optionsYes+=("INIT_ON_ALLOC_DEFAULT_ON" "INIT_ON_FREE_DEFAULT_ON"); fi; done; + #excluding above: grep PAGE_POISONING_ENABLE_DEFAULT Build/*/kernel/*/*/mm/Kconfig.debug -l oldKernels=('essential/msm8998' 'fairphone/sdm632' 'fxtec/msm8998' 'google/msm-4.9' 'oneplus/msm8998' 'oneplus/sdm845' 'oneplus/sm7250' 'razer/msm8998' 'razer/sdm845' 'sony/sdm660' 'sony/sdm845' 'xiaomi/sdm660' 'xiaomi/sdm845' 'xiaomi/sm6150' 'yandex/sdm660' 'zuk/msm8996'); for kernelOld in "${oldKernels[@]}"; do if [[ "$1" == *"/$kernelOld"* ]]; then diff --git a/Scripts/Generate_Supporting_Files.sh b/Scripts/Generate_Supporting_Files.sh index 1bd77f1d..7631d52a 100644 --- a/Scripts/Generate_Supporting_Files.sh +++ b/Scripts/Generate_Supporting_Files.sh @@ -21,7 +21,7 @@ set -uo pipefail; export repoDir="/mnt/backup-1/DOS/Builds/Supporting_Files/"; mkdir -p $repoDir; -devicesCopy=(akari alioth Amber aura aurora avicii barbet blueline bonito bramble cheryl coral crosshatch davinci discovery enchilada fajita flame FP3 FP4 guacamole guacamoleb hotdog hotdogb marlin mata pioneer pro1 redfin sailfish sargo sunfish taimen vayu voyager walleye xz2c instantnoodle instantnoodlep kebab lemonade lemonadep); +devicesCopy=(akari alioth Amber aura aurora avicii barbet bluejay blueline bonito bramble cheetah cheryl coral crosshatch davinci discovery enchilada fajita flame FP3 FP4 guacamole guacamoleb hotdog hotdogb instantnoodle instantnoodlep kebab lemonade lemonadep marlin mata oriole panther pioneer pro1 raven redfin sailfish sargo sunfish taimen vayu voyager walleye xz2c); for device in "${devicesCopy[@]}" do @@ -32,7 +32,7 @@ do fi; done; -devicesAVB=(akari alioth Amber aura aurora avicii barbet beryllium blueline bonito bramble coral crosshatch davinci enchilada fajita flame FP3 FP4 guacamole guacamoleb hotdog hotdogb lavender lmi pro1 raphael redfin sargo sunfish taimen vayu walleye xz2c instantnoodle instantnoodlep kebab lemonade lemonadep); +devicesAVB=(akari alioth Amber aura aurora avicii barbet beryllium bluejay blueline bonito bramble cheetah coral crosshatch davinci enchilada fajita flame FP3 FP4 guacamole guacamoleb hotdog hotdogb instantnoodle instantnoodlep kebab lavender lemonade lemonadep lmi oriole panther pro1 raphael raven redfin sargo sunfish taimen vayu walleye xz2c); for device in "${devicesAVB[@]}" do diff --git a/Scripts/Generate_Verified_Boot_Hashes.sh b/Scripts/Generate_Verified_Boot_Hashes.sh index 94ab828c..b0402374 100644 --- a/Scripts/Generate_Verified_Boot_Hashes.sh +++ b/Scripts/Generate_Verified_Boot_Hashes.sh @@ -18,9 +18,9 @@ umask 0022; set -uo pipefail; #grep "verity\.mk" Build/*/device/*/*/*.mk -l -VERITY_DEVICES=('Amber' 'angler' 'bullhead' 'cheeseburger' 'cheryl' 'dragon' 'dumpling' 'flounder' 'marlin' 'mata' 'oneplus3' 'sailfish' 'shamu' 'z2_plus'); +VERITY_DEVICES=('Amber' 'angler' 'bullhead' 'cheeseburger' 'cheryl' 'discover' 'dragon' 'dumpling' 'flounder' 'marlin' 'mata' 'oneplus3' 'pioneer' 'sailfish' 'shamu' 'voyager' 'z2_plus'); #grep "AVB_ENABLE" Build/*/device/*/*/*.mk -l -AVB_DEVICES=('akari' 'alioth' 'aura' 'aurora' 'avicii' 'barbet' 'beryllium' 'blueline' 'bonito' 'bramble' 'coral' 'crosshatch' 'davinci' 'enchilada' 'fajita' 'flame' 'FP3' 'FP4' 'guacamole' 'guacamoleb' 'hotdog' 'hotdogb' 'instantnoodle' 'instantnoodlep' 'kebab' 'lavender' 'lemonade' 'lemonadep' 'lmi' 'pro1' 'raphael' 'redfin' 'sargo' 'sunfish' 'taimen' 'vayu' 'walleye' 'xz2c'); +AVB_DEVICES=('akari' 'alioth' 'aura' 'aurora' 'avicii' 'barbet' 'beryllium' 'bluejay' 'blueline' 'bonito' 'bramble' 'cheetah' 'coral' 'crosshatch' 'davinci' 'enchilada' 'fajita' 'flame' 'FP3' 'FP4' 'guacamole' 'guacamoleb' 'hotdog' 'hotdogb' 'instantnoodle' 'instantnoodlep' 'kebab' 'lavender' 'lemonade' 'lemonadep' 'lmi' 'oriole' 'panther' 'pro1' 'raphael' 'raven' 'redfin' 'sargo' 'sunfish' 'taimen' 'vayu' 'walleye' 'xz2c' ); #TODO: Make this a function? echo "================================================================================"; diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index 01553837..a00572c3 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -16,15 +16,15 @@ umask 0022; set -uo pipefail; -export version="108.0.5359.79-1"; +export version="108.0.5359.128-1"; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk"; export repoDir="/mnt/dos/Repos/DivestOS_WebView-FDroid/repo/"; mkdir -p $repoDir; -devicesARM32=(apollo bacon crackling d2att d2spr d2tmo d2vzw d800 d801 d802 d803 d850 d851 d852 d855 deb f400 flo flox FP2 grouper ham hammerhead harpia i9100 i9300 i9305 jflteatt jfltespr jfltevzw jfltexx kccat6 kipper klte lentislte ls990 m7 m8 m8d maguro mako manta merlin n5100 n5110 n5120 osprey serrano3gxx serranoltexx shamu surnia thor tilapia toro toroplus v1awifi victara vs985); -devicesARM64=(akari alioth Amber angler aura aurora avicii axon7 barbet beryllium blueline bonito bramble bullhead cheeseburger cheryl clark coral crosshatch davinci discovery dragon dumpling enchilada ether fajita flame flounder flounder_lte FP3 FP4 griffin guacamole guacamoleb h811 h815 h850 h870 h910 h918 h990 hero2lte herolte himaul himawl hotdog hotdogb instantnoodle instantnoodlep kebab land lavender lemonade lemonadep lmi ls997 marlin mata oneplus2 oneplus3 pioneer pro1 raphael redfin rs988 sailfish santoni sargo star2lte starlte sunfish taimen us996 us997 vayu voyager vs995 walleye xz2c yellowstone Z00T z2_plus); +devicesARM32=(apollo bacon crackling d2att d2spr d2tmo d2vzw d800 d801 d802 d803 d850 d851 d852 d855 deb f400 flo flox FP2 grouper ham hammerhead harpia i9100 i9300 i9305 jflteatt jfltespr jfltevzw jfltexx kccat6 kipper klte lentislte ls990 m7 m8 m8d maguro mako manta merlin n5100 n5110 n5120 osprey serrano3gxx serranoltexx shamu surnia thor tilapia toro toroplus v1awifi victara vs985 ); +devicesARM64=(akari alioth Amber angler aura aurora avicii axon7 barbet beryllium bluejay blueline bonito bramble bullhead cheeseburger cheetah cheryl clark coral crosshatch davinci discovery dragon dumpling enchilada ether fajita flame flounder flounder_lte FP3 FP4 griffin guacamole guacamoleb h811 h815 h850 h870 h910 h918 h990 hero2lte herolte himaul himawl hotdog hotdogb instantnoodle instantnoodlep kebab land lavender lemonade lemonadep lmi ls997 marlin mata oneplus2 oneplus3 oriole panther pioneer pro1 raphael raven redfin rs988 sailfish santoni sargo star2lte starlte sunfish taimen us996 us997 vayu voyager vs995 walleye xz2c yellowstone Z00T z2_plus); devicesX86=(fugu); for device in "${devicesARM32[@]}"