From 2af72f12a5dfeeb41e4a5534da86d5e9c7d39d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 6 Jun 2019 01:43:20 +0200 Subject: [PATCH] Disable GCC plugins for out of tree kernel modules kernel modules built in VM often use different gcc version, which makes provided gcc plugins incompatible. Since rebuilding those plugins may not be straight forward (extra gcc headers needed, possibly kernel config changes needed if gcc version differs significantly), disable them for out of tree modules. Fixes QubesOS/qubes-issues#2844 (cherry picked from commit e3a342006f44727f6bba2722e9e8dcff6107eece) --- kernel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 74fa733..b5a7f03 100644 --- a/kernel.spec +++ b/kernel.spec @@ -233,7 +233,11 @@ cp Module.markers %buildroot/lib/modules/%kernelrelease/build fi rm -rf %buildroot/lib/modules/%kernelrelease/build/Documentation -cp .config %buildroot/lib/modules/%kernelrelease/build + +# disable GCC plugins for external modules build, to not fail if different gcc +# version is used +sed -e 's/^\(CONFIG_GCC_PLUGIN.*\)=y/# \1 is not set/' .config > \ + %buildroot/lib/modules/%kernelrelease/build/.config rm -f %buildroot/lib/modules/%kernelrelease/build/scripts/*.o rm -f %buildroot/lib/modules/%kernelrelease/build/scripts/*/*.o