Commit Graph

358 Commits

Author SHA1 Message Date
Jose Carlos Venegas Munoz
2e93dbd737 kernel: build: Use local kernel version.
If the runtime repository is already cloned get version from it,
else keep getting from github.

Fixes: #299

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-01-08 15:23:12 -06:00
Eric Ernst
8a3f7cf6d3
Merge pull request #288 from sboeuf/add_config_x86_4_19_10
kernel: Add 4.19.10 config for x86
2019-01-07 09:20:50 -08:00
Sebastien Boeuf
63e95c1af7
Merge pull request #295 from kata-containers/revert-269-build_development_kernel
Revert "kernel: update guest kernel to 4.19.8 on aarch64 "
2019-01-07 01:15:02 -08:00
Peng Tao
0a5b5adbfb Revert "kernel: update guest kernel to 4.19.8 on aarch64 "
Reverts #269

The added kernel patch doesn't apply and is causing all CI to fail. FYI, the current guest kernel version is 4.14.67. Please rebase and re-submit your PR cleanly @Pennyzct.

e.g., http://jenkins.katacontainers.io/job/kata-containers-runtime-centos-7-4-PR/995/console

NFO: Applying patch /tmp/jenkins/workspace/kata-containers-runtime-centos-7-4-PR/go/src/github.com/kata-containers/packaging/kernel/patches/0003-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-support.patch
patching file arch/arm/include/asm/kvm_arm.h
patching file arch/arm/include/asm/kvm_host.h
Hunk #1 succeeded at 266 (offset -7 lines).
Hunk #2 succeeded at 314 with fuzz 2 (offset -40 lines).
patching file arch/arm/include/asm/kvm_mmu.h
Hunk #1 FAILED at 35.
Hunk #2 succeeded at 47 with fuzz 2 (offset -5 lines).
Hunk #3 succeeded at 266 with fuzz 2 (offset -96 lines).
1 out of 3 hunks FAILED -- saving rejects to file arch/arm/include/asm/kvm_mmu.h.rej
patching file arch/arm/include/asm/stage2_pgtable.h
patching file arch/arm64/include/asm/cpufeature.h
Hunk #1 FAILED at 262.
Hunk #2 succeeded at 284 (offset -246 lines).
1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/cpufeature.h.rej
patching file arch/arm64/include/asm/kvm_arm.h
Hunk #1 succeeded at 102 (offset -5 lines).
Hunk #2 succeeded at 116 (offset -5 lines).
Hunk #3 succeeded at 305 (offset -7 lines).
patching file arch/arm64/include/asm/kvm_asm.h
Hunk #1 succeeded at 27 (offset -3 lines).
Hunk #2 FAILED at 73.
1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_asm.h.rej
patching file arch/arm64/include/asm/kvm_host.h
Hunk #1 succeeded at 48 (offset -5 lines).
Hunk #2 FAILED at 61.
Hunk #3 succeeded at 399 with fuzz 2 (offset -41 lines).
Hunk #4 FAILED at 503.
2 out of 4 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_host.h.rej
patching file arch/arm64/include/asm/kvm_hyp.h
patching file arch/arm64/include/asm/kvm_mmu.h
Hunk #1 succeeded at 154 (offset 13 lines).
Hunk #2 succeeded at 229 with fuzz 1 (offset -17 lines).
Hunk #3 succeeded at 409 with fuzz 2 (offset -110 lines).
patching file arch/arm64/include/asm/stage2_pgtable-nopmd.h
patching file arch/arm64/include/asm/stage2_pgtable-nopud.h
patching file arch/arm64/include/asm/stage2_pgtable.h
patching file arch/arm64/kvm/guest.c
Hunk #1 succeeded at 305 (offset -86 lines).
patching file arch/arm64/kvm/hyp-init.S
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/kvm/hyp-init.S.rej
patching file arch/arm64/kvm/hyp/Makefile
Hunk #1 succeeded at 18 (offset -1 lines).
patching file arch/arm64/kvm/hyp/s2-setup.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file arch/arm64/kvm/hyp/s2-setup.c.rej
patching file arch/arm64/kvm/hyp/switch.c
Hunk #1 FAILED at 198.
Hunk #2 succeeded at 226 (offset -37 lines).
1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/kvm/hyp/switch.c.rej
patching file arch/arm64/kvm/hyp/tlb.c
Hunk #1 succeeded at 29 (offset -1 lines).
Hunk #2 succeeded at 38 (offset -1 lines).
patching file arch/arm64/kvm/reset.c
Hunk #4 FAILED at 86.
Hunk #5 succeeded at 133 (offset -4 lines).
1 out of 5 hunks FAILED -- saving rejects to file arch/arm64/kvm/reset.c.rej
patching file include/linux/irqchip/arm-gic-v3.h
Hunk #1 succeeded at 374 (offset -14 lines).
patching file include/uapi/linux/kvm.h
Hunk #1 succeeded at 739 (offset -11 lines).
Hunk #2 FAILED at 962.
1 out of 2 hunks FAILED -- saving rejects to file include/uapi/linux/kvm.h.rej
patching file virt/kvm/arm/arm.c
Hunk #1 succeeded at 115 (offset -5 lines).
Hunk #2 succeeded at 207 (offset -6 lines).
Hunk #3 succeeded at 236 (offset -6 lines).
Hunk #4 succeeded at 463 (offset -35 lines).
Hunk #5 FAILED at 546.
Hunk #6 succeeded at 1164 with fuzz 2 (offset -145 lines).
Hunk #7 succeeded at 1261 (offset -147 lines).
1 out of 7 hunks FAILED -- saving rejects to file virt/kvm/arm/arm.c.rej
patching file virt/kvm/arm/mmu.c
Hunk #1 succeeded at 43 with fuzz 2 (offset -2 lines).
Hunk #2 succeeded at 147 (offset -2 lines).
Hunk #3 succeeded at 216 (offset -35 lines).
Hunk #4 succeeded at 226 (offset -35 lines).
Hunk #5 succeeded at 245 (offset -35 lines).
Hunk #6 succeeded at 255 (offset -35 lines).
Hunk #7 succeeded at 272 (offset -35 lines).
Hunk #8 succeeded at 371 with fuzz 2 (offset 40 lines).
Hunk #9 FAILED at 340.
Hunk #10 FAILED at 370.
Hunk #11 FAILED at 388.
Hunk #12 FAILED at 408.
Hunk #13 succeeded at 753 (offset -143 lines).
Hunk #14 succeeded at 842 (offset -143 lines).
Hunk #15 succeeded at 850 (offset -143 lines).
Hunk #16 succeeded at 859 (offset -143 lines).
Hunk #17 succeeded at 881 (offset -143 lines).
Hunk #18 succeeded at 1024 (offset -182 lines).
Hunk #19 succeeded at 1114 (offset -188 lines).
Hunk #20 succeeded at 1148 (offset -188 lines).
Hunk #21 succeeded at 1176 (offset -188 lines).
Hunk #22 succeeded at 1190 (offset -188 lines).
Hunk #23 succeeded at 1333 (offset -196 lines).
Hunk #24 succeeded at 1552 (offset -220 lines).
Hunk #25 succeeded at 1852 (offset -219 lines).
4 out of 25 hunks FAILED -- saving rejects to file virt/kvm/arm/mmu.c.rej
patching file virt/kvm/arm/vgic/vgic-its.c
Hunk #1 succeeded at 233 (offset -8 lines).
Hunk #2 succeeded at 696 (offset -56 lines).
Hunk #3 succeeded at 721 (offset -56 lines).
Hunk #4 succeeded at 736 (offset -56 lines).
Hunk #5 succeeded at 746 (offset -56 lines).
Hunk #6 succeeded at 1214 (offset -80 lines).
Hunk #7 succeeded at 1232 (offset -80 lines).
Hunk #8 succeeded at 1279 (offset -80 lines).
Hunk #9 succeeded at 2135 (offset -82 lines).
Hunk #10 succeeded at 2207 (offset -82 lines).
Hunk #11 succeeded at 2256 (offset -82 lines).
patching file virt/kvm/arm/vgic/vgic-mmio-v3.c
Hunk #1 succeeded at 326 (offset -38 lines).
Hunk #2 succeeded at 343 (offset -38 lines).
Build step 'Execute shell' marked build as failure
Performing Post build task...
Match found for :.* : True
Logical operation result is TRUE
Running script : #!/bin/bash

Fixes: #296
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2019-01-04 09:32:12 +08:00
Jose Carlos Venegas Munoz
4be12af819
Merge pull request #286 from marcov/fix-version-compare
obs-packaging: support comparisons of pre-releases versions
2019-01-02 13:09:41 -06:00
James O. D. Hunt
63024cdd5b
Merge pull request #269 from Pennyzct/build_development_kernel
kernel: update guest kernel to 4.19.8 on aarch64
2019-01-02 09:07:59 +00:00
Eric Ernst
e89efa29b7
Merge pull request #292 from bergwolf/releasing-1.5.0-rc2
Add 1.5.0-rc2 changes
2018-12-27 07:40:19 -08:00
Peng Tao
ce105e77da obs: bump versions.txt for 1.5.0-rc2 release
To match what we have shipped.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-12-24 16:55:20 +08:00
Peng Tao
7a269ea6e6 runtime-spec: add containerd-shim-kata-v2
Otherwise rpmbuild fails.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-12-24 16:53:07 +08:00
Peng Tao
f4994f4531 obs: reset kata_version
We've changed `-rc` to `~rc` for rpmbuild. But we need to change
it back when doing comparision.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-12-24 16:50:25 +08:00
James O. D. Hunt
dcd3bd0476
Merge pull request #290 from marcov/up-obs-distros
Update list of stable release distros
2018-12-20 08:36:35 +00:00
Marco Vedovati
c3c8a3d926 obs-packaging: add openSUSE Leap 15 and Tumbleweed
Add more recent openSUSE distributions.

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-12-19 18:09:34 +01:00
Marco Vedovati
6b375a9573 obs-packaging: remove EOL distros from stable releases
Remove distros that reached EOL (Fedora 26, Fedora 27, Ubuntu 17.10).

Fixes: #279

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-12-19 18:09:03 +01:00
Marco Vedovati
31b04a739b obs-packaging: Add Debian 9 distro
Add Debian 9 distro to the list of stable release distros.

Fixes: #289

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-12-19 18:08:42 +01:00
Sebastien Boeuf
9ad35bd6b6 kernel: Add 4.19.10 config for x86
We want to make sure Kata runs on latest stable kernels so that it
benefits from the latest features.

For instance, in case of Kata relying on NEMU hypervisor, the recent
kernel patches reworking the way timer calibration is handled are
solving some boot latency issues.

Fixes #287

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-12-17 08:53:04 -08:00
Marco Vedovati
3549d5a5e2 obs-packaging: support comparisons of pre-releases versions
Fix version compare when specifying a pre-release version in
versions.txt. This is needed because kata on git uses strict semver,
while kata RPM packages uses ~ in place of - for PATCH version, to
allow RPM version comparison to work properly.

Fixes: #285

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-12-17 12:36:09 +01:00
Eric Ernst
df6a8ed37a
Merge pull request #272 from mcastelino/topic/firehack
Firecracker support: Add support for virtio-mmio
2018-12-16 21:31:01 -08:00
Penny Zheng
aee668b51d kernel: update guest kernel to 4.19.8 on aarch64
For supporting nvdimm, we need to update kernel on aarch64 to the
stable version 4.19.8 and backport Suzuki K Poulose's latest
Dynamic IPA and 52bit IPA support patch series
(https://patchwork.kernel.org/cover/10616271/)which has been included
in 4.20-rc3+ to the v4.19.8.

Fixes: #268

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
Signed-off-by: Wei Chen <Wei.Chen@arm.com>
2018-12-17 10:00:59 +08:00
Manohar Castelino
662147ce03
Merge pull request #283 from kata-containers/revert-278-add_config_x86_4_19_8
Revert "kernel: Add 4.19.8 config for x86"
2018-12-14 17:10:28 -08:00
Manohar Castelino
8f513d6c86 Add support for virtio-mmio
Add support for virtio-mmio. Firecracker uses virtio-mmio.

Signed-off-by: Manohar Castelino <manohar.r.castelino@intel.com>
2018-12-14 17:02:09 -08:00
Manohar Castelino
edc9bcba30
Revert "kernel: Add 4.19.8 config for x86" 2018-12-14 16:34:18 -08:00
Manohar Castelino
9d4e6b0742
Merge pull request #278 from sboeuf/add_config_x86_4_19_8
kernel: Add 4.19.8 config for x86
2018-12-14 15:21:22 -08:00
Sebastien Boeuf
9ec1ca731d kernel: Add 4.19.8 config for x86
We want to make sure Kata runs on latest stable kernels so that it
benefits from the latest features.

For instance, in case of Kata relying on NEMU hypervisor, the recent
kernel patches reworking the way timer calibration is handled are
solving some boot latency issues.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
2018-12-14 07:28:30 -08:00
Jose Carlos Venegas Munoz
58b8ebb1dc
Merge pull request #281 from alicefr/s390_4.19
kernel: add s390 config for version 4.19.8
2018-12-11 10:30:07 -06:00
Alice Frosi
02476450a2 kernel: add s390 config for version 4.19.8
Remove configs s390_kata_kvm_4.14.x

The patch 0003-serial-forbid-8250-on-s390 is no longer necessary as it
has been upstreamed since version 4.16

The kernel configs have been generated as described in https://github.com/kata-containers/packaging/issues/246
plus the vsock options have been manually enabled:
CONFIG_VSOCKETS=y
CONFIG_VIRTIO_VSOCKETS=y
CONFIG_VIRTIO_VSOCKETS_COMMON=y

Fixes: #280

Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
2018-12-11 11:01:26 +01:00
Xu Wang
349a848714
Merge pull request #271 from teawater/dimm
obs-packaging: Add Eric Auger's latest PCDIMM/NVDIMM patches
2018-12-11 14:09:00 +08:00
Julio Montes
718b4b95e1
Merge pull request #277 from jcvenegas/modulecleanup
Kernel: Remove modules
2018-12-10 09:10:02 -06:00
Graham Whaley
9b6ac0aa29
Merge pull request #275 from alicefr/enable_vsock
kernel: enable vsock on s390x
2018-12-10 14:35:00 +00:00
James O. D. Hunt
3781db2edc
Merge pull request #267 from jcvenegas/f29
obs: enable fedora 29
2018-12-10 09:57:18 +00:00
Alice Frosi
c63de1523a kernel: enable vsock on s390x
The vsock options need to be enabled to build a kernel able to use the
vsock option

Fixes: #274

Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
2018-12-10 08:51:34 +01:00
Jose Carlos Venegas Munoz
5117654699 Kernel: Remove modules
Remove modules from default kernel config.

Modules are not used in default kata images.

Lets remove them.

Fixes: #276

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-12-07 16:09:56 -06:00
Jose Carlos Venegas Munoz
c081eda8b3
Merge pull request #266 from devimc/snap/skipGoVersionCheck
snap: skip go version check
2018-12-07 14:45:03 -06:00
Jose Carlos Venegas Munoz
f8f76907eb
Merge pull request #263 from marcov/kernel-multiarch
obs-packaging: multi-arch kernel build support
2018-12-07 14:44:35 -06:00
Julio Montes
1270003af9 snap: skip go version check
Right golang version is installed before building kata-containers, skip go
version check to avoid including extra build dependencies.

fixes #265

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-12-04 09:02:25 -06:00
Julio Montes
0c06e0356e snap: remove QEMU_ARCH variable
QEMU_ARCH variable is not needed

Signed-off-by: Julio Montes <julio.montes@intel.com>
2018-12-04 09:02:25 -06:00
Hui Zhu
81a077fd9b obs-packaging: Add Eric Auger's latest PCDIMM/NVDIMM patches
Add Eric Auger's latest PCDIMM/NVDIMM patches for supporting nvdimm
on aarch64.

Fixes: #270

Signed-off-by: Hui Zhu <teawater@hyper.sh>
2018-12-04 18:42:07 +08:00
Jose Carlos Venegas Munoz
1b0b6a1169 obs: Enable fedora 29
Enable F29 repository.

Fixes: #261

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-12-03 12:19:12 -06:00
Jose Carlos Venegas Munoz
dc3dcdc424 pkgs: Fix qemu build on fedora 29
Add python as build require.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-12-03 12:11:54 -06:00
Marco Vedovati
e2fb50411f obs-packaging: multi-arch kernel build support
Update the kernel package to allow building for multiple architectures with
a single set of sources.
Changes:
- Add kernel configs for all architectures
- Detect at runtime the correct target architecture and kernel
compressed image location. This is done  with the script kata-multiarch.sh

Note that debian control files still need to be updated to handle Multi-Arch,
so that they are not tied to the architecture on which
`linux-container/update.sh` is run.

Fixes: #262

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-30 12:02:16 +01:00
Jose Carlos Venegas Munoz
645728dc71
Merge pull request #256 from marcov/fix-versions
Update versions.txt content and detect versions misalignment
2018-11-29 15:21:50 -06:00
James O. D. Hunt
9654a403b0
Merge pull request #258 from bergwolf/fix-deploy-static
release: fix kata-deploy-binaries.sh install command
2018-11-29 09:34:46 +00:00
Peng Tao
a8fe5b1746 release: fix install command
The kata-shim Makefile is changed and we should not set libexecdir
anymore.

Fixes: #257

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-11-28 20:46:44 +08:00
Marco Vedovati
c3a371b2b0 obs-packaging: detect versions misalignments
Detect misalignments of versions between the content of versions.txt
file and the version found in the VERSION file in the git branch being
released on OBS.

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-27 19:40:53 +01:00
Marco Vedovati
a0b8cc8ab8 obs-packaging: add --compare option to gen_versions_txt.sh
Introduce the --compare option to compare the content of the local
versions.txt file with the one found at the specified git branch.

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-27 19:39:32 +01:00
Marco Vedovati
5a10544dca obs-packaging: bump versions.txt content to 1.4.0
Align the content of versions.txt with the latest version released on OBS.

Fixes: #255

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-27 19:38:10 +01:00
Graham Whaley
adc8a92a22
Merge pull request #252 from egernst/kata-deploy-1.4
kata-deploy: update for 1.4 release
2018-11-27 09:41:31 +00:00
Jose Carlos Venegas Munoz
64eb46e901
Merge pull request #248 from alicefr/s390_configs
kernel: s390 configs
2018-11-26 17:45:20 -06:00
Eric Ernst
8bc6f042d2 kata-deploy: update for 1.4 release
Fixes: #251

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2018-11-26 15:45:17 -08:00
Jose Carlos Venegas Munoz
e8092a38dc
Merge pull request #250 from marcov/remove-modaliases
obs-packaging: remove dh-modaliases deb requirement
2018-11-26 17:44:46 -06:00
Marco Vedovati
b067be836d obs-packaging: remove dh-modaliases deb requirement
Remove the redundant dh-modaliases package as a build requirement
for deb packages. This allows to build packages for the Debian distro.

Fixes: #249

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-23 19:21:10 +01:00