diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml index 58ce5070..9caf8854 100644 --- a/Manifests/Manifest_LAOS-17.1.xml +++ b/Manifests/Manifest_LAOS-17.1.xml @@ -112,13 +112,6 @@ - - - - - - - + + + + + diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 4890f440..474aeea9 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2020-04-14 patchAllKernels() { - startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_sdm845 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996"; + startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_sdm845 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996"; } export -f patchAllKernels; @@ -58,8 +58,6 @@ buildAll() { buildDevice crackling; #buildDevice osprey; #needs manual patching + more - mkdir proprietary/priv-app && cp -r proprietary/system/priv-app/qcrilmsgtunnel proprietary/priv-app/ #SD801 - buildDevice d852; - buildDevice d855; buildDevice FP2; buildDevice m8; #SD808 diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index faf942a7..fa6a380a 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -247,17 +247,6 @@ git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carr enterAndClear "device/htc/m8-common"; awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools -enterAndClear "device/lge/g3-common"; -echo "vendor/lib/hw/nfc_nci.msm8974.so|7dcb79a385dd1155cb9b6310a3e7b85b7dc8db13" >> proprietary-files.txt; #g3-common: Add NFC HAL to proprietary-files (254249) -sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; -sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te; - -enterAndClear "device/lge/d852"; -git revert --no-edit dbebbce20b2b303fe13f7078ef54154f9dd5d9e2; #fix nfc path - -enterAndClear "device/lge/d855"; -git revert --no-edit 9a5739e66d0a44347881807c0cc44d7c318c02b8; #fix nfc path - enterAndClear "device/lge/mako"; echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh similarity index 98% rename from Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh rename to Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh index 5583603f..b474a291 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -47,6 +47,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9576/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10142/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10318/^4.7.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch @@ -141,8 +142,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10626/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10638/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch @@ -211,5 +210,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p211" +editKernelLocalversion "-dos.p210" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index b2857eb7..d0f06141 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2021-03-22 patchAllKernels() { - startPatcher "kernel_essential_msm8998 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_htc_msm8974 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_xiaomi_sdm845"; + startPatcher "kernel_essential_msm8998 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_xiaomi_sdm845"; } export -f patchAllKernels; @@ -61,6 +61,8 @@ buildAll() { buildDevice d802; #SD801 buildDevice bacon; + buildDevice d852; + buildDevice d855; buildDevice klte; #unb18 #buildDevice m8; #unb18 buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 >= 10485760) diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 6abfd8eb..9203a0b9 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -236,6 +236,10 @@ enterAndClear "device/lge/g2-common"; sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools +enterAndClear "device/lge/g3-common"; +sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; +sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te; + enterAndClear "device/lge/mako"; echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools