From 4a3ad8a8b8718aaada7b8a7312803bb3443f14c2 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 18 Feb 2020 16:11:34 +0000 Subject: [PATCH] pkgs: spec do not check for 'not in final' Do not check for 'not in final' in spec creation, the logic to fully validate is longer that just one grep. Next should: Use the same script build-kernel.sh to generate spec and validate it. For now is still safe as CI will run all the build-kernels.sh to verify the resulting config. Signed-off-by: Jose Carlos Venegas Munoz --- .../linux-container/kata-linux-container.spec-template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/obs-packaging/linux-container/kata-linux-container.spec-template b/obs-packaging/linux-container/kata-linux-container.spec-template index f92f0837fa..16ed179f33 100644 --- a/obs-packaging/linux-container/kata-linux-container.spec-template +++ b/obs-packaging/linux-container/kata-linux-container.spec-template @@ -83,9 +83,7 @@ BuildKernel() { if [ ! -f .config ]; then # Use fragments to generate the .config frag_dir="kata-kernel-configs/fragments" - err_msg="not in final" - r="$(KCONFIG_CONFIG=.config ARCH=${kernelArch} scripts/kconfig/merge_config.sh -r -n ${frag_dir}/common/*.conf ${frag_dir}/${kernelArch}/* | grep "${err_msg}")" || true - [ -z "${r}" ] || (echo "ERROR: ${r}"; exit 1) + KCONFIG_CONFIG=.config ARCH=${kernelArch} scripts/kconfig/merge_config.sh -r -n ${frag_dir}/common/*.conf ${frag_dir}/${kernelArch}/* fi [ -f .config ] || (echo "ERROR: cannot find the kernel config file for the ${kernelArch} architecture"; exit 1)