From c84bbf4a942e75603b288cb6c2633d4e93f79820 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Mon, 4 Mar 2019 08:49:40 -0600 Subject: [PATCH] pkgs: disable CONFIG_RETPOLINE for RHEL The gcc provided has not support for it. Fixes: #369 Signed-off-by: Jose Carlos Venegas Munoz --- .../linux-container/kata-linux-container.spec-template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/obs-packaging/linux-container/kata-linux-container.spec-template b/obs-packaging/linux-container/kata-linux-container.spec-template index 22af17175..604603b8d 100644 --- a/obs-packaging/linux-container/kata-linux-container.spec-template +++ b/obs-packaging/linux-container/kata-linux-container.spec-template @@ -82,6 +82,12 @@ BuildKernel() { find kata-kernel-configs -name "${kernelArch}_kata_kvm_*" -exec cp {} .config \; [ -f .config ] || (echo "ERROR: cannot find the kernel config file for the ${kernelArch} architecture"; exit 1) + %if 0%{?rhel_version} + # RHEL in OBS has updated gcc. + # https://github.com/kata-containers/packaging/pull/370#issuecomment-469620154 + sed -i -e 's/CONFIG_RETPOLINE=y/CONFIG_RETPOLINE=n/g' .config + %endif + %if 0%{?fedora} #Fedora uses gcc 8, build is failing due to warnings. export CFLAGS="-Wno-error=restrict"