diff --git a/Patches/Linux b/Patches/Linux index f84a7503..b49832d9 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit f84a7503ba780ee6690d54de01ff88451326bb4d +Subproject commit b49832d91623dbe56910835750a6ce673bc42962 diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index fab431d2..79f76ec7 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -484,9 +484,10 @@ echo "Deblobbing..."; #blobs=$blobs"|msm_irqbalance"; #Devices utilizing perfd won't hotplug cores without it #blobs=$blobs"|mpdecision|perfd"; - #blobs=$blobs"|libqti-perfd.*.so"; + #blobs=$blobs"|libqti-perfd.*.so|libperfconfig.so|libperfgluelayer.so|libperfioctl.so"; #blobs=$blobs"|perf-profile.*.conf"; - #blobs=$blobs"|vendor.qti.hardware.perf.*"; + #blobs=$blobs"|vendor.qti.hardware.perf.*|vendor.qti.memory.pasrmanager.*"; + #manifests=$manifests"|IPerf"; blobs=$blobs"|Perfdump.apk"; #Peripheral Manager @@ -716,6 +717,7 @@ deblobDevice() { sed -i 's/bluetooth.emb_wp_mode=true/bluetooth.emb_wp_mode=false/' *.prop *.mk &>/dev/null || true; #Disable WiPower sed -i 's/bluetooth.wipower=true/bluetooth.wipower=false/' *.prop *.mk &>/dev/null || true; #Disable WiPower sed -i 's/wfd.enable=1/wfd.enable=0/' *.prop *.mk &>/dev/null || true; #Disable Wi-Fi display + awk -i inplace '!/vendor.camera.extensions/' *.prop *.mk &>/dev/null || true; #Disable camera extensions if [ -f system.prop ]; then if ! grep -q "drm.service.enabled=false" system.prop; then echo "drm.service.enabled=false" >> system.prop; fi; #Disable DRM server if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 30173bb6..a9c3809e 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -104,12 +104,12 @@ buildAll() { buildDevice marlin verity; buildDevice sailfish verity; #SD630 - buildDevice pioneer; - buildDevice voyager; - buildDevice discovery; + #buildDevice pioneer; #superseded + #buildDevice voyager; #superseded + #buildDevice discovery; #superseded buildDevice lavender avb; #SD835 - buildDevice cheryl verity; + #buildDevice cheryl verity; #superseded #buildDevice cheeseburger verity; #superseded #buildDevice dumpling verity; #superseded #buildDevice mata verity; #superseded @@ -117,8 +117,8 @@ buildAll() { #buildDevice walleye avb; #superseded #SD845 #buildDevice beryllium avb; #superseded - buildDevice crosshatch avb; - buildDevice blueline avb; + #buildDevice crosshatch avb; #superseded + #buildDevice blueline avb; #superseded #buildDevice enchilada avb; #XXX: uses stock /vendor #superseded #buildDevice fajita avb; #XXX: uses stock /vendor #superseded buildDevice akari avb; diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 54e1f55a..c8d6e6dd 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -1,10 +1,8 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm-4.9" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0300-0301.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0311-0312.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0313-0314.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0314-0315.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch -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 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0027.patch @@ -62,55 +60,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.2/0001.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3674/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36516/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28711/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28712/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28713/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28714/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28715/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39713/4.9/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39713/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1195/4.9/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1195/4.9/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/^5.17/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1734/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-30594/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch -editKernelLocalversion "-dos.p112" +editKernelLocalversion "-dos.p70" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 70c8df8e..0ad6be08 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -99,7 +99,6 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 326739; #Trust: Add option to always disable USB gadgets - repopick -i 327531; #msm8998-common: sepolicy: update rild access to vendor_data_file sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";