Fix flo, update CVE patchers

This commit is contained in:
Tad 2017-12-24 10:59:48 -05:00
parent f35e6c2779
commit ef211a5107
5 changed files with 4 additions and 16 deletions

View File

@ -50,7 +50,6 @@
<remove-project name="LineageOS/mirror" />
<remove-project name="LineageOS/scripts" />
<remove-project name="LineageOS/slackbot" />
<remove-project name="LineageOS/tribble-tracker" />
<remove-project name="LineageOS/www" />
<remove-project name="platform/cts" />
<remove-project name="platform/hardware/intel/audio_media" />
@ -68,9 +67,9 @@
<remove-project name="platform/prebuilts/go/darwin-x86" />
<remove-project name="platform/prebuilts/ninja/darwin-x86" />
<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
<!-- Untested -->
<remove-project name="LineageOS/android_external_unrar" />
<!-- Untested
<remove-project name="LineageOS/android_external_bash" />
<remove-project name="LineageOS/android_external_fuse" />
<remove-project name="LineageOS/android_external_htop" />
<remove-project name="LineageOS/android_external_libncurses" />
<remove-project name="LineageOS/android_external_libtar" />
@ -82,11 +81,10 @@
<remove-project name="LineageOS/android_external_p7zip" />
<remove-project name="LineageOS/android_external_pigz" />
<remove-project name="LineageOS/android_external_rsync" />
<remove-project name="LineageOS/android_external_unrar" />
<remove-project name="LineageOS/android_external_unzip" />
<remove-project name="LineageOS/android_external_vim" />
<remove-project name="LineageOS/android_external_yaffs2" />
<remove-project name="LineageOS/android_external_zip" />
<remove-project name="LineageOS/android_external_zip" />-->
<!-- END OF UNNECESSARY REPO REMOVAL -->
<!-- START OF ADDITIONAL REPOS -->

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
#