diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 1b19e98e..f1485f25 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -50,7 +50,6 @@ - @@ -68,9 +67,9 @@ - + + diff --git a/Misc/flo b/Misc/flo deleted file mode 100644 index 045f0075..00000000 --- a/Misc/flo +++ /dev/null @@ -1,5 +0,0 @@ -../../../../../../kernel/google/msm/arch/arm/mm/rodata.c: In function 'set_page_attributes': -../../../../../../kernel/google/msm/arch/arm/mm/rodata.c:91:4: warning: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'pmd_t' [-Wformat=] -error, forbidden warning: rodata.c:91 - CC arch/arm/kernel/smp.o -make[2]: *** [/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/kernel/google/msm/scripts/Makefile.build:307: arch/arm/mm/rodata.o] Error 1 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index e24aa105..84d2bf5c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -51,10 +51,7 @@ git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11092/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16531/^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-16538/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index bf3c8dbf..d75860ed 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -24,9 +24,7 @@ git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0861/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch -git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch -git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch @@ -42,6 +40,5 @@ git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-7541/3.10/0002.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch cd $base diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 65044c5c..bdcb0445 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -233,6 +233,7 @@ find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0 find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enabledForcedEncryption "$0"' {} \; find "kernel" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenDefconfig "$0"' {} \; cd $base +sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/msm/arch/arm/configs/lineageos_flo_defconfig; #Breaks compile # #END OF DEVICE CHANGES #