github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 08:56:32 +00:00
Code Issues Projects Releases Wiki Activity

pkgs: spec do not check for 'not in final'

Browse Source 
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 <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2020-02-18 16:11:34 +00:00
parent 2e3b090762
commit 4a3ad8a8b8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
obs-packaging/linux-container/kata-linux-container.spec-template
View File

@@ -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)