From 3073ab68b8a27cdaf31213778d029669f50e2632 Mon Sep 17 00:00:00 2001 Message-Id: <3073ab68b8a27cdaf31213778d029669f50e2632.1584644494.git.Jim.Somerville@windriver.com> In-Reply-To: <55a6b125fab32183cbabee1e436197242f926c0c.1584644493.git.Jim.Somerville@windriver.com> References: <55a6b125fab32183cbabee1e436197242f926c0c.1584644493.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 5f23982..640f872 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -498,6 +498,12 @@ 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 # Workaround for broken bios causing IOMMU issues Patch40031: Allow-dmar-quirks-for-broken-bioses.patch +# Fix assorted compilation issues +Patch40100: fix-compilation-issues.patch +# Fix CentOS 7.6 upgrade compile error +Patch40101: fix-CentOS-7.6-upgrade-compile-error.patch +# Compile fix for disabling CONFIG_MEMCG_KMEM +Patch40102: compile-fix-for-disabling-CONFIG_MEMCG_KMEM.patch BuildRoot: %{_tmppath}/kernel-%{KVRA}-root @@ -882,6 +888,9 @@ 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 Allow-dmar-quirks-for-broken-bioses.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