From e259807d447873c378e53bcfd55eff58d1ec6ceb Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 13 Jun 2018 07:23:59 -0400 Subject: [PATCH] Manifest cleanup --- Manifests/Manifest_LAOS-14.1.xml | 11 ++---- Manifests/Manifest_LAOS-15.1.xml | 18 --------- .../android_kernel_fairphone_msm8974.sh | 38 ------------------- Scripts/LineageOS-15.1/Functions.sh | 5 ++- Scripts/init.sh | 2 +- 5 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 271f95d8..f04162e2 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -34,7 +34,6 @@ - @@ -91,10 +90,6 @@ - - - - @@ -114,9 +109,9 @@ - - - + + + diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 608df996..780b1e5b 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -81,10 +81,6 @@ - - - - @@ -100,10 +96,6 @@ - - - - @@ -138,11 +130,6 @@ - - @@ -192,11 +179,6 @@ - - diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh deleted file mode 100644 index 947cda45..00000000 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -cd $base"kernel/fairphone/msm8974" -git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/ANY/0001.patch -git apply $cvePatchesLinux/0010-Accelerated_AES/3.4/0002.patch -git apply $cvePatchesLinux/0012-Copperhead-Deny_USB/3.4/3.4-Backport.patch -git apply $cvePatchesLinux/CVE-2014-3153/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2014-3153/ANY/0004.patch -git apply $cvePatchesLinux/CVE-2016-0774/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch -git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11039/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch -git apply $cvePatchesLinux/CVE-2017-13080/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0002.patch -git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0003.patch -git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0004.patch -git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch -git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch -git apply $cvePatchesLinux/CVE-2017-17806/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-7533/3.4/0001.patch -git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch -git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p34" -cd $base diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 92442f3f..3d931e72 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2018-04-27 patchAllKernels() { - startPatcher "kernel_fairphone_msm8974 kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974"; + startPatcher "kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974"; } export -f patchAllKernels; @@ -62,8 +62,9 @@ buildAll() { brunch lineage_flo-user; brunch lineage_flounder-user; brunch lineage_griffin-user; - #brunch lineage_h850-userdebug; + brunch lineage_h850-userdebug; brunch lineage_hammerhead-user; #broken upstream - fatal error: 'linux/msm_audio_calibration.h' file not found + brunch lineage_klte-user; brunch lineage_marlin-user; brunch lineage_m8-user; brunch lineage_sailfish-user; diff --git a/Scripts/init.sh b/Scripts/init.sh index 84127858..bba7dd0d 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -21,7 +21,7 @@ export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD! export DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs -export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time service with the open source Sony TimeKeep reimplementation +export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation export DEFAULT_DNS="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC export GLONASS_FORCED_ENABLE=true; #Enables GLONASS on all devices export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()