From 35372142ed9f9d8f1795650b7e4962ae13e2f320 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 25 Sep 2021 14:32:14 -0400 Subject: [PATCH] Small tweak Signed-off-by: Tad --- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 8 +------- Scripts/LineageOS-18.1/Functions.sh | 1 - Scripts/init.sh | 1 + 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 43384f86..de9cb039 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -103,9 +103,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p107" +editKernelLocalversion "-dos.p106" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh index 395cf81a..15146dd9 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -1,9 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/razer/sdm845" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0276-0277.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0277-0278.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0278-0279.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0279-0280.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0024.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -73,9 +69,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p77" +editKernelLocalversion "-dos.p71" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index a0e11354..f170aa56 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -127,7 +127,6 @@ 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; #source build/envsetup.sh; - #repopick -i 314020; #systemui crash fix #repopick -it eleven-firewall; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/init.sh b/Scripts/init.sh index 87448e0f..2354c474 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -62,6 +62,7 @@ export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Set true to allow inclusion of non export DOS_OPTIMIZE_IMAGES=false; #Set true to apply lossless optimizations to image resources export DOS_STRONG_ENCRYPTION_ENABLED=false; #Set true to enable AES 256-bit FDE encryption on 14.1+15.1 XXX: THIS WILL **DESTROY** EXISTING INSTALLS! alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/84/316084/1'; +#alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/63/316563/2'; #Servers export DOS_DEFAULT_DNS_PRESET="Quad9"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh