github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 13:46:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #941 from jcvenegas/fix-kernel-build-pg

Browse Source 
pkgs: fix kernel build
This commit is contained in:
Salvador Fuentes 2020-02-19 17:21:30 -06:00 committed by GitHub
commit 5b908ddb4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obs-packaging/linux-container/_service-template
View File

@ -3,7 +3,7 @@
<service name="download_url"> <service name="download_url">
<param name="protocol">https</param> <param name="protocol">https</param>
<param name="host">cdn.kernel.org</param> <param name="host">cdn.kernel.org</param>
<param name="path">/pub/linux/kernel/v4.x/linux-@VERSION@.tar.xz</param> <param name="path">/pub/linux/kernel/v5.x/linux-@VERSION@.tar.xz</param>
</service> </service>
<service name="verify_file"> <service name="verify_file">
<param name="file">_service:download_url:linux-@VERSION@.tar.xz</param> <param name="file">_service:download_url:linux-@VERSION@.tar.xz</param>

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

@ -24,7 +24,7 @@ override_dh_auto_build:
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 \
scripts/kconfig/merge_config.sh -r -n $(KERNEL_FRAG_COMMON_DIR)/* $(KERNEL_FRAG_ARCH_DIR)/* ; \ scripts/kconfig/merge_config.sh -r -n $(KERNEL_FRAG_COMMON_DIR)/*.conf $(KERNEL_FRAG_ARCH_DIR)/* ; \
if [ ! -f .config ]; then \ if [ ! -f .config ]; then \
echo "ERROR: cannot find the kernel config file for the $(KERNEL_ARCH) architecture"; \ echo "ERROR: cannot find the kernel config file for the $(KERNEL_ARCH) architecture"; \
exit 1; \ exit 1; \

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

@ -11,7 +11,7 @@ License: GPL-2.0
Summary: The Linux kernel optimized for running inside a container Summary: The Linux kernel optimized for running inside a container
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
Source0: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-@VERSION@.tar.xz Source0: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@VERSION@.tar.xz
Source1: kata-kernel-configs.tar.gz Source1: kata-kernel-configs.tar.gz
Source2: kata-multiarch.sh Source2: kata-multiarch.sh
@ -83,9 +83,7 @@ BuildKernel() {
if [ ! -f .config ]; then if [ ! -f .config ]; then
# Use fragments to generate the .config # Use fragments to generate the .config
frag_dir="kata-kernel-configs/fragments" frag_dir="kata-kernel-configs/fragments"
err_msg="not in final" KCONFIG_CONFIG=.config ARCH=${kernelArch} scripts/kconfig/merge_config.sh -r -n ${frag_dir}/common/*.conf ${frag_dir}/${kernelArch}/*
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)
fi fi
[ -f .config ] || (echo "ERROR: cannot find the kernel config file for the ${kernelArch} architecture"; exit 1) [ -f .config ] || (echo "ERROR: cannot find the kernel config file for the ${kernelArch} architecture"; exit 1)