From 6c41acf7c1a4f5f3437e474505193bb353d241e6 Mon Sep 17 00:00:00 2001 Message-Id: <6c41acf7c1a4f5f3437e474505193bb353d241e6.1584125537.git.Jim.Somerville@windriver.com> In-Reply-To: <47c970e28e2adfd6483fa8d861eeb338492297bf.1584125537.git.Jim.Somerville@windriver.com> References: <47c970e28e2adfd6483fa8d861eeb338492297bf.1584125537.git.Jim.Somerville@windriver.com> From: "zhao.shuai" Date: Tue, 6 Aug 2019 16:18:04 +0800 Subject: [PATCH 2/2] Compile issues Signed-off-by: zhao.shuai Signed-off-by: Jim Somerville --- SPECS/kernel.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 012ddbd..6595a38 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -496,6 +496,12 @@ Patch40027: epoll-fix-use-after-free-in-eventpoll_release_file.patch Patch40028: ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch Patch40029: rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch Patch40030: rh-ext4-release-leaked-posix-acl-in-ext4_xattr_set_a.patch +# Fix assorted compilation issues +Patch40031: fix-compilation-issues.patch +# Fix CentOS 7.6 upgrade compile error +Patch40032: fix-CentOS-7.6-upgrade-compile-error.patch +# Compile fix for disabling CONFIG_MEMCG_KMEM +Patch40033: compile-fix-for-disabling-CONFIG_MEMCG_KMEM.patch BuildRoot: %{_tmppath}/kernel-%{KVRA}-root @@ -879,6 +885,9 @@ ApplyOptionalPatch epoll-fix-use-after-free-in-eventpoll_release_file.patch ApplyOptionalPatch ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch ApplyOptionalPatch rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch ApplyOptionalPatch rh-ext4-release-leaked-posix-acl-in-ext4_xattr_set_a.patch +ApplyOptionalPatch fix-compilation-issues.patch +ApplyOptionalPatch fix-CentOS-7.6-upgrade-compile-error.patch +ApplyOptionalPatch compile-fix-for-disabling-CONFIG_MEMCG_KMEM.patch # Any further pre-build tree manipulations happen here. -- 1.8.3.1