From 0c6911b91dfe5c3265233f8f492d03a03a801a45 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 2 Aug 2019 15:45:15 +0000 Subject: [PATCH 1/2] snap: use master branch to test the snap Use master branch to test the snap in order to detect errors earlier before releasing the next snap fixes #663 Signed-off-by: Julio Montes --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0d6219a7b8..4c53e88277 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: kata-containers -version: "1.9.0-alpha0" +version: "master" summary: Build lightweight VMs that seamlessly plug into the containers ecosystem description: | Kata Containers is an open source project and community working to build a From 5e4a9dbc95d48e61d294af5d56980e3dda4e0605 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 5 Aug 2019 15:28:14 +0000 Subject: [PATCH 2/2] obs-packaging: scape next line to check if .config file exist OBS fails because of a syntax error in debian.rules ``` /bin/sh: 1: Syntax error: end of file unexpected (expecting "fi") ``` Signed-off-by: Julio Montes --- obs-packaging/linux-container/debian.rules | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/obs-packaging/linux-container/debian.rules b/obs-packaging/linux-container/debian.rules index 98b74db6d2..db47237914 100755 --- a/obs-packaging/linux-container/debian.rules +++ b/obs-packaging/linux-container/debian.rules @@ -8,6 +8,12 @@ KATA_MULTIARCH="/usr/src/packages/SOURCES/kata-multiarch.sh" KERNEL_ARCH=$(shell /bin/bash $(KATA_MULTIARCH) -a $(HOST_ARCH)) KERNEL_IMAGE=$(shell /bin/bash $(KATA_MULTIARCH) -i $(HOST_ARCH)) KERNEL_CONFIGS=kata-kernel-configs +KERNEL_FRAG_COMMON_DIR="$(KERNEL_CONFIGS)/fragments/common" +KERNEL_FRAG_ARCH_DIR="$(KERNEL_CONFIGS)/fragments/$(KERNEL_ARCH)" + +# used in merge_config.sh +export KCONFIG_CONFIG=.config +export ARCH=$(KERNEL_ARCH) %: dh $@ @@ -17,14 +23,13 @@ override_dh_auto_build: tar xzf /usr/src/packages/SOURCES/$(KERNEL_CONFIGS).tar.gz rm -f .config find $(KERNEL_CONFIGS) -name "$(KERNEL_ARCH)_kata_kvm_*" -exec cp {} .config \; - 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/* ${frag_dir}/${kernelArch}/* | grep "${err_msg}")" || true - [ -z "${r}" ] || (@echo "ERROR: ${r}"; exit 1) + if [ ! -f .config ]; then \ + scripts/kconfig/merge_config.sh -r -n $(KERNEL_FRAG_COMMON_DIR)/* $(KERNEL_FRAG_ARCH_DIR)/* ; \ + if [ ! -f .config ]; then \ + echo "ERROR: cannot find the kernel config file for the $(KERNEL_ARCH) architecture"; \ + exit 1; \ + fi \ fi - [ -f .config ] || (@echo "ERROR: cannot find the kernel config file for the $(KERNEL_ARCH) architecture"; exit 1) # https://github.com/kata-containers/packaging/issues/394 enable reproducible builds: export KBUILD_BUILD_USER=katabuilduser