diff --git a/Patches/Wallpapers b/Patches/Wallpapers index e0e77cd4..ee0af5b2 160000 --- a/Patches/Wallpapers +++ b/Patches/Wallpapers @@ -1 +1 @@ -Subproject commit e0e77cd40556ac965d351be39cc883827d39e3d1 +Subproject commit ee0af5b27afc4bf0d79c55ad4aa8697bb460a1f2 diff --git a/Scripts/Common/Copy_Keys.sh b/Scripts/Common/Copy_Keys.sh index 37baf535..11740b48 100644 --- a/Scripts/Common/Copy_Keys.sh +++ b/Scripts/Common/Copy_Keys.sh @@ -1,3 +1,20 @@ +#!/bin/bash +#DivestOS: A privacy focused mobile distribution +#Copyright (c) 2020 Divested Computing Group +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU General Public License as published by +#the Free Software Foundation, either version 3 of the License, or +#(at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with this program. If not, see . + echo "Copying verity/avb public keys to kernels..."; cat "$DOS_SIGNING_KEYS/Amber/verity.x509.pem" >> "kernel/yandex/sdm660/certs/verity.x509.pem"; cat "$DOS_SIGNING_KEYS/beryllium/verity.x509.pem" >> "kernel/xiaomi/sdm845/certs/verity.x509.pem"; diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index d5db9159..9fa9e3f3 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 39bfafc3..f905fdd6 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index d5967fc7..fd0b042c 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/Common/Optimize.sh b/Scripts/Common/Optimize.sh index c84daad1..460e4ab5 100644 --- a/Scripts/Common/Optimize.sh +++ b/Scripts/Common/Optimize.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/Common/Overclock.sh b/Scripts/Common/Overclock.sh index 1ce5dd33..eb7ecea4 100644 --- a/Scripts/Common/Overclock.sh +++ b/Scripts/Common/Overclock.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/Common/Patch_CVE.sh b/Scripts/Common/Patch_CVE.sh index ae44d0fe..2951dc8c 100644 --- a/Scripts/Common/Patch_CVE.sh +++ b/Scripts/Common/Patch_CVE.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/Generate_Signing_Keys.sh b/Scripts/Generate_Signing_Keys.sh index ca979169..aae99ada 100644 --- a/Scripts/Generate_Signing_Keys.sh +++ b/Scripts/Generate_Signing_Keys.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2018-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-11.0/Defaults.sh b/Scripts/LineageOS-11.0/Defaults.sh index efe6fe91..8f561713 100644 --- a/Scripts/LineageOS-11.0/Defaults.sh +++ b/Scripts/LineageOS-11.0/Defaults.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index ec3dd24b..4bc2c422 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-11.0/Patch.sh b/Scripts/LineageOS-11.0/Patch.sh index 3688e1b1..60a4dcfe 100644 --- a/Scripts/LineageOS-11.0/Patch.sh +++ b/Scripts/LineageOS-11.0/Patch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2015-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-11.0/Rebrand.sh b/Scripts/LineageOS-11.0/Rebrand.sh index 9c2ed7a6..28b2b49f 100644 --- a/Scripts/LineageOS-11.0/Rebrand.sh +++ b/Scripts/LineageOS-11.0/Rebrand.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh index 49f93762..3166948a 100644 --- a/Scripts/LineageOS-14.1/Defaults.sh +++ b/Scripts/LineageOS-14.1/Defaults.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 945e80ae..2ca52b39 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 80689aa5..59bb3f1a 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2015-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index d5b5db73..3acb2308 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-14.1/Theme.sh b/Scripts/LineageOS-14.1/Theme.sh index a9c1e9ea..c1025614 100644 --- a/Scripts/LineageOS-14.1/Theme.sh +++ b/Scripts/LineageOS-14.1/Theme.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2018 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh index 0048142d..bc20e669 100644 --- a/Scripts/LineageOS-15.1/Defaults.sh +++ b/Scripts/LineageOS-15.1/Defaults.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index d1670b87..4fc77b46 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify @@ -131,7 +131,7 @@ export -f patchWorkspace; enableDexPreOpt() { cd "$DOS_BUILD_BASE$1"; #Some devices won't compile, or have too small of a /system partition, or Wi-Fi breaks - if [ "$1" != "device/asus/flo" ] && [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/mako" ]; then + if [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/mako" ]; then if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 7a4bba39..9ddf2d55 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2015-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 28efc4bc..ae9373b4 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-16.0/Defaults.sh b/Scripts/LineageOS-16.0/Defaults.sh index a7ad1869..07b28f23 100644 --- a/Scripts/LineageOS-16.0/Defaults.sh +++ b/Scripts/LineageOS-16.0/Defaults.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2019 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 3351b2c8..1304df0a 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify @@ -157,8 +157,7 @@ enableDexPreOpt() { if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; - #flo: random reboots? - if [ "$1" != "device/asus/flo" ]; then + if true; then echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk; echo "Enabled full dexpreopt for $1"; else diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index c7c4a0ca..75143b12 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2015-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh index dc204bdb..f5377b18 100644 --- a/Scripts/LineageOS-16.0/Rebrand.sh +++ b/Scripts/LineageOS-16.0/Rebrand.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-17.1/Defaults.sh b/Scripts/LineageOS-17.1/Defaults.sh index 014ed1cb..b31859c7 100644 --- a/Scripts/LineageOS-17.1/Defaults.sh +++ b/Scripts/LineageOS-17.1/Defaults.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index ad9de237..e9cd039f 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify @@ -127,6 +127,7 @@ patchWorkspace() { repopick -i 287339; #releasetools: python3 fix #repopick -it CVE-2019-2306; repopick -i 292506; #update webview + repopick -i 292694; #flox log spam fix source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; @@ -150,9 +151,8 @@ enableDexPreOpt() { if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk; - #flox: random reboots? #m8: /system partition too small - if [ "$1" != "device/asus/flox" ] && [ "$1" != "device/htc/m8" ]; then + if [ "$1" != "device/htc/m8" ]; then echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk; echo "Enabled full dexpreopt for $1"; else diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index c4dbc42f..f48f435b 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2015-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify @@ -59,6 +59,7 @@ cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/ enterAndClear "bootable/recovery"; git checkout 53fd25482; #XXX: TEMPORARY! patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch"; #Abort on serial number specific packages (GrapheneOS) +#patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0002-Permissive_Override.patch"; #Allow devices to set SELinux permissive enterAndClear "bionic"; if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; #(GrapheneOS) @@ -268,6 +269,9 @@ awk -i inplace '!/WfdCommon/' msm8996.mk; #fix breakage #enterAndClear "device/moto/shamu"; #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO +#enterAndClear "device/motorola/clark"; +#echo "TARGET_RECOVERY_PERMISSIVE_OVERRIDE := true" >> BoardConfig.mk; #Allow extract_firmware.sh to function + enterAndClear "device/oneplus/oneplus2"; sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; diff --git a/Scripts/LineageOS-17.1/Rebrand.sh b/Scripts/LineageOS-17.1/Rebrand.sh index 01c7c948..aa808ca0 100644 --- a/Scripts/LineageOS-17.1/Rebrand.sh +++ b/Scripts/LineageOS-17.1/Rebrand.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify diff --git a/Scripts/init.sh b/Scripts/init.sh index b1498edf..a64cadc0 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -1,5 +1,5 @@ #!/bin/bash -#DivestOS: A privacy oriented Android distribution +#DivestOS: A privacy focused mobile distribution #Copyright (c) 2017-2020 Divested Computing Group # #This program is free software: you can redistribute it and/or modify