Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small updates

Browse Source
This commit is contained in:
Tad 2020-10-27 18:45:17 -04:00
parent ff8dfd95db
commit b89cc98001
8 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/Linux

@ -1 +1 @@
Subproject commit 5a5cc8aa8edcd973eb33c671996d9cfb9e2d2b9b Subproject commit d9aad30345ea2d1911537746d370966a37a4289e

1
Scripts/LineageOS-14.1/Functions.sh
View File

@ -117,7 +117,6 @@ patchWorkspace() {
source build/envsetup.sh; source build/envsetup.sh;
repopick -it n_asb_09-2018-qcom; repopick -it n_asb_09-2018-qcom;
repopick -it ibss-mode-nougat; repopick -it ibss-mode-nougat;
repopick -i 288970; #update webview
repopick -it n-asb-2020-10; repopick -it n-asb-2020-10;
repopick -it tzdb2020b_N; repopick -it tzdb2020b_N;

4
Scripts/LineageOS-15.1/Functions.sh
View File

@ -107,9 +107,7 @@ export -f buildAll;
patchWorkspace() { patchWorkspace() {
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; 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 -i 288970; #update webview
repopick -it tzdb2020d_O;
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

5
Scripts/LineageOS-16.0/Functions.sh
View File

@ -65,8 +65,6 @@ buildAll() {
buildDevice kipper; buildDevice kipper;
#SD625 #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
#SD845
buildDevice pro1 avb;
#Samsung #Samsung
buildDeviceUserDebug i9100; #broken - many errors in hardware/samsung/exynos4 buildDeviceUserDebug i9100; #broken - many errors in hardware/samsung/exynos4
#Intel #Intel
@ -115,6 +113,7 @@ buildAll() {
buildDevice blueline avb; buildDevice blueline avb;
buildDevice enchilada avb; buildDevice enchilada avb;
buildDevice fajita avb; buildDevice fajita avb;
buildDevice pro1 avb;
#SD855 #SD855
buildDevice guacamole avb; buildDevice guacamole avb;
#SD660 #SD660
@ -134,8 +133,6 @@ patchWorkspace() {
source build/envsetup.sh; source build/envsetup.sh;
repopick -it hh-p-sepolicy; repopick -it hh-p-sepolicy;
repopick -i 232948; #wahoo: liblight: close fd repopick -i 232948; #wahoo: liblight: close fd
repopick -i 288970; #update webview
repopick -it tzdb2020d_P;
#repopick -it CVE-2019-2306_P; #repopick -it CVE-2019-2306_P;
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";

3
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
View File

@ -89,7 +89,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch
@ -97,5 +96,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch
editKernelLocalversion "-dos.p97" editKernelLocalversion "-dos.p96"
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
View File

@ -150,7 +150,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/^5.6.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/^5.6.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
@ -158,5 +157,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
editKernelLocalversion "-dos.p158" editKernelLocalversion "-dos.p157"
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

9
Scripts/LineageOS-17.1/Functions.sh
View File

@ -56,7 +56,7 @@ buildAll() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
#SDS4P #SDS4P
buildDevice flo; #still in bringup? buildDevice flo; #still in bringup? + /system is too small (908853248 >= 880803840)
buildDevice mako; buildDevice mako;
#SD410 #SD410
buildDevice crackling; buildDevice crackling;
@ -72,7 +72,7 @@ buildAll() {
buildDevice FP2; buildDevice FP2;
buildDevice klte; buildDevice klte;
buildDevice m8; buildDevice m8;
buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 > 10485760) buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 >= 10485760)
#SD805 #SD805
buildDevice shamu verity; buildDevice shamu verity;
#SD808 #SD808
@ -101,7 +101,7 @@ buildAll() {
buildDevice blueline avb; buildDevice blueline avb;
buildDevice enchilada avb; buildDevice enchilada avb;
buildDevice fajita avb; buildDevice fajita avb;
#buildDevice pro1 avb; #still in bringup, see pro1-ten-bringup topic buildDevice pro1 avb;
#SD855 #SD855
buildDevice guacamole avb; buildDevice guacamole avb;
buildDevice guacamoleb avb; buildDevice guacamoleb avb;
@ -124,10 +124,7 @@ patchWorkspace() {
source build/envsetup.sh; source build/envsetup.sh;
repopick -i 287339; #releasetools: python3 fix repopick -i 287339; #releasetools: python3 fix
repopick -i 288970; #update webview
#repopick -it CVE-2019-2306; #repopick -it CVE-2019-2306;
repopick -it tzdb2020d_Q;
#repopick -i 290459;
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

5
Scripts/LineageOS-17.1/Patch.sh
View File

@ -206,6 +206,11 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All
# #
#START OF DEVICE CHANGES #START OF DEVICE CHANGES
# #
enterAndClear "device/asus/flo";
rm -rf bdAddrLoader; #duplicate with mako
sed -i 's/flox/flo/' BoardConfig.mk;
#smallerSystem;
#enterAndClear "device/cyanogen/msm8916-common"; #enterAndClear "device/cyanogen/msm8916-common";
#awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools #awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools