AtaraxiaDev/divestos-build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small updates

Browse Source
This commit is contained in:
Tad 2020-10-01 14:56:37 -04:00
parent 46c1a74ef3
commit 55e010fba5
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Scripts/Common/Functions.sh
View File

@ -23,7 +23,7 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then
fi; fi;
startPatcher() { startPatcher() {
java -jar "$DOS_BINARY_PATCHER" patch "$DOS_BUILD_BASE" "$DOS_WORKSPACE_ROOT""Patches/" "$DOS_SCRIPTS_CVES" $1; java -jar "$DOS_BINARY_PATCHER" patch workspace "$DOS_BUILD_BASE" "$DOS_WORKSPACE_ROOT""Patches/Linux/" "$DOS_SCRIPTS_CVES" $1;
} }
export -f startPatcher; export -f startPatcher;

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

@ -119,6 +119,7 @@ patchWorkspace() {
repopick -it ibss-mode-nougat; repopick -it ibss-mode-nougat;
repopick -it n-asb-2020-09; repopick -it n-asb-2020-09;
repopick -it android-hardening-cm-14.1; repopick -it android-hardening-cm-14.1;
repopick -i 287763; #update webview
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

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

@ -107,7 +107,7 @@ 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 -it O_asb_2020-09; repopick -i 287763; #update webview
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

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

@ -133,6 +133,7 @@ patchWorkspace() {
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 -it android-hardening-16.0; repopick -it android-hardening-16.0;
repopick -i 287763; #update webview
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/CVE_Patchers/android_kernel_essential_msm8998.sh
View File

@ -91,8 +91,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0010.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0005.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-14390/4.4/0002.patch editKernelLocalversion "-dos.p91"
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.4/0002.patch
editKernelLocalversion "-dos.p94"
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

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

@ -115,7 +115,9 @@ 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 287339; #releasetools: python3 fix
repopick -i 287763; #update webview
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";