From cdca2c032e82a8fd854e198e9bfe49d5f2c9ce37 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 17 Oct 2022 07:25:46 -0400 Subject: [PATCH] 20.0: add barbet Signed-off-by: Tad --- Manifests/Manifest_LAOS-20.0.xml | 4 ++++ Scripts/Common/Copy_Keys.sh | 2 ++ Scripts/Common/Enable_Verity.sh | 1 + Scripts/Common/Functions.sh | 2 +- Scripts/Generate_Supporting_Files.sh | 4 ++-- Scripts/Generate_Verified_Boot_Hashes.sh | 2 +- Scripts/LineageOS-20.0/Functions.sh | 2 +- Scripts/WebView_Update_Repo.sh | 2 +- 8 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Manifests/Manifest_LAOS-20.0.xml b/Manifests/Manifest_LAOS-20.0.xml index 73b379d3..04eb4592 100644 --- a/Manifests/Manifest_LAOS-20.0.xml +++ b/Manifests/Manifest_LAOS-20.0.xml @@ -76,6 +76,10 @@ + + + + diff --git a/Scripts/Common/Copy_Keys.sh b/Scripts/Common/Copy_Keys.sh index 7a3c7a1b..0cddbc76 100644 --- a/Scripts/Common/Copy_Keys.sh +++ b/Scripts/Common/Copy_Keys.sh @@ -27,6 +27,7 @@ cat "$DOS_SIGNING_KEYS/angler/verity.x509.pem" >> "kernel/huawei/angler/certs/ve cat "$DOS_SIGNING_KEYS/aura/verity.x509.pem" >> "kernel/razer/sdm845/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/aurora/verity.x509.pem" >> "kernel/sony/sdm845/certs/verity.x509.pem"; 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/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"; @@ -90,6 +91,7 @@ cp -v "$DOS_SIGNING_KEYS/angler/verifiedboot_relkeys.der.x509" "kernel/huawei/an cp -v "$DOS_SIGNING_KEYS/aura/verifiedboot_relkeys.der.x509" "kernel/razer/sdm845/verifiedboot_aura_dos_relkeys.der.x509"; cp -v "$DOS_SIGNING_KEYS/aurora/verifiedboot_relkeys.der.x509" "kernel/sony/sdm845/verifiedboot_aurora_dos_relkeys.der.x509"; 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/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"; diff --git a/Scripts/Common/Enable_Verity.sh b/Scripts/Common/Enable_Verity.sh index d6eb1e56..75c13341 100644 --- a/Scripts/Common/Enable_Verity.sh +++ b/Scripts/Common/Enable_Verity.sh @@ -93,6 +93,7 @@ enableVerity "device/zuk/z2_plus"; enableAVB "device/fairphone/FP3"; enableAVB "device/fairphone/FP4"; enableAVB "device/fxtec/pro1"; +enableAVB "device/google/barbet"; enableAVB "device/google/blueline"; enableAVB "device/google/bonito"; enableAVB "device/google/bramble"; diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index f17b2aa5..4fbe12fc 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -343,7 +343,7 @@ processRelease() { #Deltas #grep update_engine Build/*/device/*/*/*.mk -l - local DOS_GENERATE_DELTAS_DEVICES=('akari' 'alioth' 'Amber' 'aura' 'aurora' 'avicii' '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' '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'); 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 diff --git a/Scripts/Generate_Supporting_Files.sh b/Scripts/Generate_Supporting_Files.sh index 490427d1..1bd77f1d 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 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 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); for device in "${devicesCopy[@]}" do @@ -32,7 +32,7 @@ do fi; done; -devicesAVB=(akari alioth Amber aura aurora avicii 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 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); for device in "${devicesAVB[@]}" do diff --git a/Scripts/Generate_Verified_Boot_Hashes.sh b/Scripts/Generate_Verified_Boot_Hashes.sh index f26852f0..94ab828c 100644 --- a/Scripts/Generate_Verified_Boot_Hashes.sh +++ b/Scripts/Generate_Verified_Boot_Hashes.sh @@ -20,7 +20,7 @@ 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'); #grep "AVB_ENABLE" Build/*/device/*/*/*.mk -l -AVB_DEVICES=('akari' 'alioth' 'aura' 'aurora' 'avicii' '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' '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'); #TODO: Make this a function? echo "================================================================================"; diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index bf7808bc..1472a9f2 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -76,7 +76,7 @@ buildAll() { #SD765 buildDevice bramble avb; buildDevice redfin avb; - #TODO: barbet + buildDevice barbet avb; #Tensor #TODO: oriole, raven, bluejay } diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index b283319d..cabbd0c9 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -24,7 +24,7 @@ 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 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); +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); devicesX86=(fugu); for device in "${devicesARM32[@]}"