diff --git a/Patches/LineageOS-17.1/android_build/271361.patch b/Patches/LineageOS-17.1/android_build/271361.patch deleted file mode 100644 index 2cc9f11d..00000000 --- a/Patches/LineageOS-17.1/android_build/271361.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1e54b3cf486cf942ecb32e294e8cde1c028e4f8b Mon Sep 17 00:00:00 2001 -From: gesangtome -Date: Tue, 24 Mar 2020 05:47:25 +0800 -Subject: [PATCH] releasetools: fix Unicode-objects must be encoded before - hashing - -This error occurs when using 'ota_from_target_files' to make an incremental package. -According to the prompt, first encode fp to resolve this error. - -build/make/tools/releasetools/common.py", line 448, in LoadInfoDict - d["avb_salt"] = sha256(fp).hexdigest() - -TypeError: Unicode-objects must be encoded before hashing - -Change-Id: I196b3ae37e1fb92be58c48aa8ab0928b6e6aec69 ---- - tools/releasetools/common.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py -index 9f57773ba7..d54689bd2e 100644 ---- a/tools/releasetools/common.py -+++ b/tools/releasetools/common.py -@@ -445,7 +445,7 @@ def makeint(key): - elif "ro.build.thumbprint" in build_prop: - fp = build_prop["ro.build.thumbprint"] - if fp: -- d["avb_salt"] = sha256(fp).hexdigest() -+ d["avb_salt"] = sha256(fp.encode()).hexdigest() - - return d - diff --git a/Patches/Linux b/Patches/Linux index 3b731321..e1a7a887 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 3b73132120ef27df0e3ef46eb4e8fc57f48f8519 +Subproject commit e1a7a8876204dbbb5ecd6b0745e7566b89799093 diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh index 4f3bee86..401e784f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh @@ -53,7 +53,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9444/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10494/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10520/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10555/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10564/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10585/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10621/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11191/^5.0.7/0001.patch @@ -84,13 +83,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.14/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0013.patch @@ -106,23 +101,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10757/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11125/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11125/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11150/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11150/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11151/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11162/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11239/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11261/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11262/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11282/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.14/0004.patch @@ -140,7 +126,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12657/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.14/0005.patch @@ -194,8 +179,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p197" +editKernelLocalversion "-dos.p181" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 1f22d659..857707fd 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -120,8 +120,8 @@ buildAll() { buildDevice bonito avb; buildDevice sargo avb; #Exynos - buildDevice starlte; - buildDevice star2lte; + #buildDevice starlte; #broken vendor partition integration + #buildDevice star2lte; #Tegra buildDevice yellowstone; #broken } diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index c13bee6e..8351cd73 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -66,7 +66,6 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bio if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bionic/0002-Symbol_Ordering.patch"; fi; #(GrapheneOS) enterAndClear "build/make"; -patch -p1 < "$DOS_PATCHES/android_build/271361.patch"; #releasetools: python3 fix, 287339 (alt) patch -p1 < "$DOS_PATCHES/android_build/0001-Restore_TTS.patch"; #Add back PicoTTS and language files patch -p1 < "$DOS_PATCHES_COMMON/android_build/0001-OTA_Keys.patch"; #add correct keys to recovery for OTA verification awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk;