github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #664 from devimc/topic/snap/useMaster

Browse Source 
snap: use master branch to test the snap
This commit is contained in:
Ganesh Maharaj Mahalingam 2019-08-05 16:49:27 -07:00 committed by GitHub
commit fbd3baae76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
obs-packaging/linux-container/debian.rules
View File

@ -8,6 +8,12 @@ KATA_MULTIARCH="/usr/src/packages/SOURCES/kata-multiarch.sh"
KERNEL_ARCH=$(shell /bin/bash $(KATA_MULTIARCH) -a $(HOST_ARCH)) KERNEL_ARCH=$(shell /bin/bash $(KATA_MULTIARCH) -a $(HOST_ARCH))
KERNEL_IMAGE=$(shell /bin/bash $(KATA_MULTIARCH) -i $(HOST_ARCH)) KERNEL_IMAGE=$(shell /bin/bash $(KATA_MULTIARCH) -i $(HOST_ARCH))
KERNEL_CONFIGS=kata-kernel-configs 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 $@ dh $@
@ -17,14 +23,13 @@ override_dh_auto_build:
tar xzf /usr/src/packages/SOURCES/$(KERNEL_CONFIGS).tar.gz tar xzf /usr/src/packages/SOURCES/$(KERNEL_CONFIGS).tar.gz
rm -f .config rm -f .config
find $(KERNEL_CONFIGS) -name "$(KERNEL_ARCH)_kata_kvm_*" -exec cp {} .config \; find $(KERNEL_CONFIGS) -name "$(KERNEL_ARCH)_kata_kvm_*" -exec cp {} .config \;
if [ ! -f .config ]; then if [ ! -f .config ]; then \
# Use fragments to generate the .config scripts/kconfig/merge_config.sh -r -n $(KERNEL_FRAG_COMMON_DIR)/* $(KERNEL_FRAG_ARCH_DIR)/* ; \
frag_dir="kata-kernel-configs/fragments" if [ ! -f .config ]; then \
err_msg="not in final" echo "ERROR: cannot find the kernel config file for the $(KERNEL_ARCH) architecture"; \
r="$(KCONFIG_CONFIG=.config ARCH=${kernelArch} scripts/kconfig/merge_config.sh -r -n ${frag_dir}/common/* ${frag_dir}/${kernelArch}/* | grep "${err_msg}")" || true exit 1; \
[ -z "${r}" ] || (@echo "ERROR: ${r}"; exit 1) fi \
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: # https://github.com/kata-containers/packaging/issues/394 enable reproducible builds:
export KBUILD_BUILD_USER=katabuilduser export KBUILD_BUILD_USER=katabuilduser

2
snap/snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: kata-containers name: kata-containers
version: "1.9.0-alpha0" version: "master"
summary: Build lightweight VMs that seamlessly plug into the containers ecosystem summary: Build lightweight VMs that seamlessly plug into the containers ecosystem
description: | description: |
Kata Containers is an open source project and community working to build a Kata Containers is an open source project and community working to build a