commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2020-06-22 17:46:30 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2956 (New) Package is "katacontainers-image-initrd" Mon Jun 22 17:46:30 2020 rev:16 rq:816317 version:1.11.1 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2020-06-02 14:36:41.763152633 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2956/katacontainers-image-initrd.changes 2020-06-22 17:46:32.249965886 +0200 @@ -1,0 +2,9 @@ +Fri Jun 19 15:01:38 UTC 2020 - Ralf Haferkamp + +- Update to 1.11.1: + agent: +* device: Do not allow container access to the nvdimm rootfs + osbuilder: +* image-builder: disable reflink + +--- Old: agent-1.11.0.tar.xz osbuilder-1.11.0.tar.xz New: agent-1.11.1.tar.xz osbuilder-1.11.1.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.e4Eqc6/_old 2020-06-22 17:46:33.001968244 +0200 +++ /var/tmp/diff_new_pack.e4Eqc6/_new 2020-06-22 17:46:33.001968244 +0200 @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.11.0 +Version:1.11.1 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.e4Eqc6/_old 2020-06-22 17:46:33.029968332 +0200 +++ /var/tmp/diff_new_pack.e4Eqc6/_new 2020-06-22 17:46:33.029968332 +0200 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.11.0 -1.11.0 +1.11.1 +1.11.1 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.11.0 -1.11.0 +1.11.1 +1.11.1 ++ agent-1.11.0.tar.xz -> agent-1.11.1.tar.xz ++ 188007 lines of diff (skipped) ++ osbuilder-1.11.0.tar.xz -> osbuilder-1.11.1.tar.xz ++ 1679 lines of diff (skipped)
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2020-06-02 14:36:22 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.3606 (New) Package is "katacontainers-image-initrd" Tue Jun 2 14:36:22 2020 rev:15 rq:810260 version:1.11.0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2020-01-28 10:57:40.233142445 +0100 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.3606/katacontainers-image-initrd.changes 2020-06-02 14:36:41.763152633 +0200 @@ -1,0 +2,45 @@ +Thu May 28 16:13:31 UTC 2020 - Ralf Haferkamp + +- Update to 1.11.0: + agent: +* protocols: fix client unit tests for go 1.13 +* agent: signal from keyboard must not be fatal +* agent: fix epoll fd left in the kata-agent when exec process +* agent: add configurable container pipe size cmdline option +* agent: add kernel cmdline parameter to enable or disable cgroups v2 +* agent: support pmem/nvdimm hotplug +* agent: parse kernel command line as soon as possible +* agent: Remove dev from pciDeviceMap when device is unplugged +* build: Add support to strip the agent golang binary +* agent: don't receive signals from stdin +* protocols: client: Add timeout for hybrid vsock handshake +* mount: Use "virtiofs" instead of "virtio_fs" +* agent-client: include log in agent client +* FC: Add new vsock connection handshake +* build: Update CentOS version for the Dockerfile +* ipv6: Add flag IFA_F_NODAD for ipv6 address. +* ipv6: Add support for ipv6 +* Revert: client.go: HybridVSockDialer: Change Read EOT to recv peek +* Revert: client.go: HybridVSockDialer: Check return size n of unix.Recvfrom +* Revert: client.go: HybridVSockDialer: Close dup fd after receive packet +* test: change import path for NetworkInterface +* vendor: Update vendoring for libcontainer. +* agent: Fix mem-hotplug on x86 when ARCH_MEMORY_PROBE is set +* vendor: update golang/sys +* client.go: HybridVSockDialer: Close dup fd after receive packet + osbuilder: +* tests: deleting when tests failed +* image_builder: Force mount_dir to be created in $TMPDIR +* scripts: set a default path to the yq binary +* rust-agent: Separate the build up of rust-agent and go-agent +* rootfs: remove RUST_SRC_PATH +* rootfs: Don't overwrite /sbin/init if it already exists +* initrd-builder: Don't error if run as non-root +* image-builder: Add NSDAX_BIN for passing in compiled nsdax tool +* image_builder: Reduce the boundary mb for reducing image size on arm64 +* rootfs-builder: build rust agent using osbuilder +* image-builder: make docker runtime configurable +* image_builder: Remove nsdax binary after its usage +- removed patch agent_memory-hotplug-probe.patch (merged upstream) + +--- Old: agent-1.10.0.tar.xz agent_memory-hotplug-probe.patch osbuilder-1.10.0.tar.xz New: agent-1.11.0.tar.xz osbuilder-1.11.0.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.n1AghP/_old 2020-06-02 14:36:44.595161596 +0200 +++ /var/tmp/diff_new_pack.n1AghP/_new 2020-06-02 14:36:44.595161596 +0200 @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.10.0 +Version:1.11.0 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 @@ -52,8 +52,6 @@ URL:https://github.com/kata-containers/osbuilder Source0:osbuilder-%{version}.tar.xz Source1:agent-%{version}.tar.xz -# PATCH-FIX-UPSTREAM agent_memory-hotplug-probe.patch https://github.com/kata-containers/agent/issues/712 -Patch0: agent_memory-hotplug-probe.patch ExclusiveArch: x86_64 aarch64 ppc64le s390x BuildRequires: dracut BuildRequires: fdupes @@ -67,9 +65,6 @@ %prep %setup -q -n osbuilder-%{version} -b1 -pushd ../agent-%{version} -%patch0 -p1 -popd %build export GOPATH=$HOME/go ++ _service ++ --- /var/tmp/diff_new_pack.n1AghP/_old 2020-06-02 14:36:44.623161685 +0200 +++ /var/tmp/diff_new_pack.n1AghP/_new 2020-06-02 14:36:44.627161697 +0200 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.10.0 -1.10.0 +1.11.0 +1.11.0 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.10.0 -1.10.0 +1.11.0 +1.11.0 ++ agent-1.10.0.tar.xz
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2020-01-28 10:57:32 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.26092 (New) Package is "katacontainers-image-initrd" Tue Jan 28 10:57:32 2020 rev:14 rq:767918 version:1.10.0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2020-01-21 21:01:59.848894602 +0100 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.26092/katacontainers-image-initrd.changes 2020-01-28 10:57:40.233142445 +0100 @@ -1,0 +2,7 @@ +Mon Jan 27 17:44:14 UTC 2020 - Ralf Haferkamp + +- kata-agent: add patch agent_memory-hotplug-probe.patch to address + memory hotplug issue when running with SUSE kernel + (https://github.com/kata-containers/agent/issues/712) + +--- New: agent_memory-hotplug-probe.patch Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.ensfvK/_old 2020-01-28 10:57:41.601143455 +0100 +++ /var/tmp/diff_new_pack.ensfvK/_new 2020-01-28 10:57:41.601143455 +0100 @@ -52,6 +52,8 @@ URL:https://github.com/kata-containers/osbuilder Source0:osbuilder-%{version}.tar.xz Source1:agent-%{version}.tar.xz +# PATCH-FIX-UPSTREAM agent_memory-hotplug-probe.patch https://github.com/kata-containers/agent/issues/712 +Patch0: agent_memory-hotplug-probe.patch ExclusiveArch: x86_64 aarch64 ppc64le s390x BuildRequires: dracut BuildRequires: fdupes @@ -65,6 +67,9 @@ %prep %setup -q -n osbuilder-%{version} -b1 +pushd ../agent-%{version} +%patch0 -p1 +popd %build export GOPATH=$HOME/go ++ agent_memory-hotplug-probe.patch ++ commit 2f4911566e9701c4f207864ebc564471812439e2 Author: Ralf Haferkamp Date: Wed Jan 15 12:01:28 2020 +0100 agent: Fix mem-hotplug on x86 when ARCH_MEMORY_PROBE is set Don't use the /sys/devices/system/memory/probe interface on architectures where the firmware (ACPI) is notifying the system of hotplugged memory. This fixes an issue with the agent erroring out when the guest-kernel is compiled with CONFIG_ARCH_MEMORY_PROBE=y. Fixes: #712 Signed-off-by: Ralf Haferkamp diff --git a/grpc.go b/grpc.go index ea0d7af..4c0dea3 100644 --- a/grpc.go +++ b/grpc.go @@ -54,6 +54,7 @@ var ( sysfsMemOnlinePath = "/sys/devices/system/memory" sysfsMemoryBlockSizePath= "/sys/devices/system/memory/block_size_bytes" sysfsMemoryHotplugProbePath = "/sys/devices/system/memory/probe" + sysfsAcpiMemoryHotplugPath = "/sys/firmware/acpi/hotplug/memory/enabled" sysfsConnectedCPUsPath = filepath.Join(sysfsCPUOnlinePath, "online") containersRootfsPath= "/run" @@ -1576,6 +1577,16 @@ func (a *agentGRPC) ReseedRandomDev(ctx context.Context, req *pb.ReseedRandomDev return emptyResp, reseedRNG(req.Data) } +func (a *agentGRPC) haveAcpiMemoryHotplug() bool { + enabled, err := ioutil.ReadFile(sysfsAcpiMemoryHotplugPath) + if err != nil { + return false + } else if strings.TrimSpace(string(enabled)) == "1" { + return true + } + return false +} + func (a *agentGRPC) GetGuestDetails(ctx context.Context, req *pb.GuestDetailsRequest) (*pb.GuestDetailsResponse, error) { var details pb.GuestDetailsResponse if req.MemBlockSize { @@ -1603,7 +1614,13 @@ func (a *agentGRPC) GetGuestDetails(ctx context.Context, req *pb.GuestDetailsReq } else if err != nil { return nil, err } else { - details.SupportMemHotplugProbe = true + // Avoid triggering memory hotplugging notifications when ACPI + // hotplugging is enabled + if a.haveAcpiMemoryHotplug() { + details.SupportMemHotplugProbe = false + } else { + details.SupportMemHotplugProbe = true + } } } diff --git a/grpc_test.go b/grpc_test.go index 768cd19..4bddb05 100644 --- a/grpc_test.go +++ b/grpc_test.go @@ -843,12 +843,38 @@ func TestGetGuestDetails(t *testing.T) { probeFile, err := ioutil.TempFile("", "probe") assert.NoError(err) + // sysfsAcpiMemoryHotplugPath exist and is 1 + hotplugEnabledFile, err := ioutil.TempFile("", "enabled") + assert.NoError(err) + _, err =
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2020-01-21 21:01:27 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.26092 (New) Package is "katacontainers-image-initrd" Tue Jan 21 21:01:27 2020 rev:13 rq:765982 version:1.10.0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-12-21 12:34:35.431454801 +0100 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.26092/katacontainers-image-initrd.changes 2020-01-21 21:01:59.848894602 +0100 @@ -1,0 +2,24 @@ +Mon Jan 20 15:39:58 UTC 2020 - Ralf Haferkamp + +- Update to 1.10.0: + agent: +- client.go: HybridVSockDialer: Check return size n of + unix.Recvfrom +- client.go: HybridVSockDialer: Change Read EOT to recv peek +- agent: get current cpuset from /sys/devices/system/cpu/online +- config: add option to control hotplug timeout of block + devices +- agent: firecracker: support debugging console +- agent: fix pause bin on musl +- docs: Add enable services and installation steps for TRACING.md +- docs: Add missing steps at TRACING.md +- tracing: Wrapper for tracing functions +- tracing: Generate an alias for opentracing.Span +- network: ensure parent directories exist +- Revert "client: remove the parameter of 'enableYamux'" +- client: remove the parameter of 'enableYamux' +- vendor: update libcontainer to 1.0.0-rc9 + osbuilder: +- make: use `cd` instead of '--directory' option of `cpio` + +--- Old: agent-1.9.3.tar.xz osbuilder-1.9.3.tar.xz New: agent-1.10.0.tar.xz osbuilder-1.10.0.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.DSM4Th/_old 2020-01-21 21:02:01.796895510 +0100 +++ /var/tmp/diff_new_pack.DSM4Th/_new 2020-01-21 21:02:01.800895512 +0100 @@ -1,7 +1,7 @@ # # spec file for package katacontainers-image-initrd # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.9.3 +Version:1.10.0 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.DSM4Th/_old 2020-01-21 21:02:01.824895523 +0100 +++ /var/tmp/diff_new_pack.DSM4Th/_new 2020-01-21 21:02:01.824895523 +0100 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.3 -1.9.3 +1.10.0 +1.10.0 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.9.3 -1.9.3 +1.10.0 +1.10.0 ++ agent-1.9.3.tar.xz -> agent-1.10.0.tar.xz ++ 4193 lines of diff (skipped) ++ osbuilder-1.9.3.tar.xz -> osbuilder-1.10.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.3/Makefile new/osbuilder-1.10.0/Makefile --- old/osbuilder-1.9.3/Makefile2019-12-09 20:01:05.0 +0100 +++ new/osbuilder-1.10.0/Makefile 2020-01-14 18:06:35.0 +0100 @@ -93,7 +93,7 @@ .PRECIOUS: $(ROOTFS_BUILD_DEST)/.dracut$(ROOTFS_MARKER_SUFFIX) $(ROOTFS_BUILD_DEST)/.dracut$(ROOTFS_MARKER_SUFFIX): $(TARGET_INITRD) mkdir -p $(TARGET_ROOTFS) - cat $< | cpio --extract --preserve-modification-time --make-directories --directory=$(TARGET_ROOTFS) + (cd $(TARGET_ROOTFS); cat $< | cpio --extract --preserve-modification-time --make-directories) @touch $@ image-%: $(IMAGES_BUILD_DEST)/kata-containers-image-%.img diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.3/VERSION new/osbuilder-1.10.0/VERSION --- old/osbuilder-1.9.3/VERSION 2019-12-09 20:01:05.0 +0100 +++ new/osbuilder-1.10.0/VERSION2020-01-14 18:06:35.0 +0100 @@ -1 +1 @@ -1.9.3 +1.10.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.3/rootfs-builder/alpine/config.sh new/osbuilder-1.10.0/rootfs-builder/alpine/config.sh --- old/osbuilder-1.9.3/rootfs-builder/alpine/config.sh 2019-12-09 20:01:05.0 +0100 +++ new/osbuilder-1.10.0/rootfs-builder/alpine/config.sh2020-01-14 18:06:35.0 +0100 @@ -5,7 +5,7 @@ OS_NAME="Alpine"
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-12-21 12:33:58 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.6675 (New) Package is "katacontainers-image-initrd" Sat Dec 21 12:33:58 2019 rev:12 rq:758537 version:1.9.3 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-12-07 15:07:57.007859043 +0100 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.6675/katacontainers-image-initrd.changes 2019-12-21 12:34:35.431454801 +0100 @@ -1,0 +2,6 @@ +Fri Dec 13 14:30:18 UTC 2019 - Ralf Haferkamp + +- Update to 1.9.3 tarballs, this is just a version bump without + any code changes. + +--- Old: agent-1.9.2.tar.xz osbuilder-1.9.2.tar.xz New: agent-1.9.3.tar.xz osbuilder-1.9.3.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.H5UXFM/_old 2019-12-21 12:34:36.003455073 +0100 +++ /var/tmp/diff_new_pack.H5UXFM/_new 2019-12-21 12:34:36.019455081 +0100 @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.9.2 +Version:1.9.3 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.H5UXFM/_old 2019-12-21 12:34:36.291455210 +0100 +++ /var/tmp/diff_new_pack.H5UXFM/_new 2019-12-21 12:34:36.319455223 +0100 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.2 -1.9.2 +1.9.3 +1.9.3 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.9.2 -1.9.2 +1.9.3 +1.9.3 ++ agent-1.9.2.tar.xz -> agent-1.9.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/agent-1.9.2/VERSION new/agent-1.9.3/VERSION --- old/agent-1.9.2/VERSION 2019-11-20 01:43:07.0 +0100 +++ new/agent-1.9.3/VERSION 2019-12-09 19:47:56.0 +0100 @@ -1 +1 @@ -1.9.2 +1.9.3 ++ osbuilder-1.9.2.tar.xz -> osbuilder-1.9.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.2/VERSION new/osbuilder-1.9.3/VERSION --- old/osbuilder-1.9.2/VERSION 2019-11-20 05:06:18.0 +0100 +++ new/osbuilder-1.9.3/VERSION 2019-12-09 20:01:05.0 +0100 @@ -1 +1 @@ -1.10.0-alpha1 +1.9.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.2/rootfs-builder/alpine/config.sh new/osbuilder-1.9.3/rootfs-builder/alpine/config.sh --- old/osbuilder-1.9.2/rootfs-builder/alpine/config.sh 2019-11-20 05:06:18.0 +0100 +++ new/osbuilder-1.9.3/rootfs-builder/alpine/config.sh 2019-12-09 20:01:05.0 +0100 @@ -5,7 +5,7 @@ OS_NAME="Alpine" -OS_VERSION=${OS_VERSION:-latest-stable} +OS_VERSION=${OS_VERSION:-v3.7} BASE_PACKAGES="alpine-base"
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-12-07 15:07:46 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.4691 (New) Package is "katacontainers-image-initrd" Sat Dec 7 15:07:46 2019 rev:11 rq:754683 version:1.9.2 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-11-15 00:35:03.895712594 +0100 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.4691/katacontainers-image-initrd.changes 2019-12-07 15:07:57.007859043 +0100 @@ -1,0 +2,8 @@ +Wed Dec 4 17:10:33 UTC 2019 - Ralf Haferkamp + +- Update to 1.9.2 tarballs, this is just a version bump without + any code changes. +- Add more missing virtio kernel modules to initrd to fix + issues with SLE15-SP1 + +--- Old: agent-1.9.1.tar.xz osbuilder-1.9.1.tar.xz New: agent-1.9.2.tar.xz osbuilder-1.9.2.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.HdFyiT/_old 2019-12-07 15:07:59.695858663 +0100 +++ /var/tmp/diff_new_pack.HdFyiT/_new 2019-12-07 15:07:59.699858662 +0100 @@ -1,7 +1,7 @@ # # spec file for package katacontainers-image-initrd # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.9.1 +Version:1.9.2 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 @@ -77,8 +77,10 @@ %if 0%{?suse_version} <= 1500 || %{kernel_flavor} != "kvmsmall" kata_kmodules+=( \ virtio \ +virtio_pci \ virtio_balloon \ virtio_blk \ +virtio_console \ virtio_crypto \ virtio-gpu \ virtio_input \ ++ _service ++ --- /var/tmp/diff_new_pack.HdFyiT/_old 2019-12-07 15:07:59.727858659 +0100 +++ /var/tmp/diff_new_pack.HdFyiT/_new 2019-12-07 15:07:59.727858659 +0100 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.1 -1.9.1 +1.9.2 +1.9.2 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.9.1 -1.9.1 +1.9.2 +1.9.2 ++ agent-1.9.1.tar.xz -> agent-1.9.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/agent-1.9.1/VERSION new/agent-1.9.2/VERSION --- old/agent-1.9.1/VERSION 2019-10-31 20:56:48.0 +0100 +++ new/agent-1.9.2/VERSION 2019-11-20 01:43:07.0 +0100 @@ -1 +1 @@ -1.9.1 +1.9.2 ++ osbuilder-1.9.1.tar.xz -> osbuilder-1.9.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.1/VERSION new/osbuilder-1.9.2/VERSION --- old/osbuilder-1.9.1/VERSION 2019-10-31 20:57:09.0 +0100 +++ new/osbuilder-1.9.2/VERSION 2019-11-20 05:06:18.0 +0100 @@ -1 +1 @@ -1.9.1 +1.10.0-alpha1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.1/rootfs-builder/alpine/config.sh new/osbuilder-1.9.2/rootfs-builder/alpine/config.sh --- old/osbuilder-1.9.1/rootfs-builder/alpine/config.sh 2019-10-31 20:57:09.0 +0100 +++ new/osbuilder-1.9.2/rootfs-builder/alpine/config.sh 2019-11-20 05:06:18.0 +0100 @@ -5,7 +5,7 @@ OS_NAME="Alpine" -OS_VERSION=${OS_VERSION:-v3.7} +OS_VERSION=${OS_VERSION:-latest-stable} BASE_PACKAGES="alpine-base"
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-11-15 00:35:02 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.26869 (New) Package is "katacontainers-image-initrd" Fri Nov 15 00:35:02 2019 rev:10 rq:748725 version:1.9.1 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-11-12 16:12:15.699806667 +0100 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.26869/katacontainers-image-initrd.changes 2019-11-15 00:35:03.895712594 +0100 @@ -1,0 +2,6 @@ +Thu Nov 14 16:15:48 UTC 2019 - Ralf Haferkamp + +- Update to 1.9.1 tarballs, this is just a version bump without + any code changes. + +--- Old: agent-1.9.0.tar.xz osbuilder-1.9.0.tar.xz New: agent-1.9.1.tar.xz osbuilder-1.9.1.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.dUZUJh/_old 2019-11-15 00:35:04.663712535 +0100 +++ /var/tmp/diff_new_pack.dUZUJh/_new 2019-11-15 00:35:04.663712535 +0100 @@ -1,7 +1,7 @@ # # spec file for package katacontainers-image-initrd # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,12 +44,12 @@ %endif Name: katacontainers-image-initrd -Version:1.9.0 +Version:1.9.1 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 Group: System/Management -Url:https://github.com/kata-containers/osbuilder +URL:https://github.com/kata-containers/osbuilder Source0:osbuilder-%{version}.tar.xz Source1:agent-%{version}.tar.xz ExclusiveArch: x86_64 aarch64 ppc64le s390x ++ _service ++ --- /var/tmp/diff_new_pack.dUZUJh/_old 2019-11-15 00:35:04.703712533 +0100 +++ /var/tmp/diff_new_pack.dUZUJh/_new 2019-11-15 00:35:04.703712533 +0100 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.0 -1.9.0 +1.9.1 +1.9.1 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.9.0 -1.9.0 +1.9.1 +1.9.1 ++ agent-1.9.0.tar.xz -> agent-1.9.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/agent-1.9.0/VERSION new/agent-1.9.1/VERSION --- old/agent-1.9.0/VERSION 2019-10-23 15:39:02.0 +0200 +++ new/agent-1.9.1/VERSION 2019-10-31 20:56:48.0 +0100 @@ -1 +1 @@ -1.9.0 +1.9.1 ++ osbuilder-1.9.0.tar.xz -> osbuilder-1.9.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.0/VERSION new/osbuilder-1.9.1/VERSION --- old/osbuilder-1.9.0/VERSION 2019-10-23 15:39:44.0 +0200 +++ new/osbuilder-1.9.1/VERSION 2019-10-31 20:57:09.0 +0100 @@ -1 +1 @@ -1.9.0 +1.9.1
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-11-12 16:12:08 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2990 (New) Package is "katacontainers-image-initrd" Tue Nov 12 16:12:08 2019 rev:9 rq:747691 version:1.9.0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-10-24 23:11:20.972675319 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2990/katacontainers-image-initrd.changes 2019-11-12 16:12:15.699806667 +0100 @@ -1,0 +2,7 @@ +Tue Nov 5 13:37:18 UTC 2019 - Ralf Haferkamp + +- Different to Tumbleweed the kvmsmall kernel flavor on Leap + (and SLE) 15.1 doesn't statically include most of the virtio + features. So add them to the initrd on these distros. + +--- Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.urroaT/_old 2019-11-12 16:12:16.255807265 +0100 +++ /var/tmp/diff_new_pack.urroaT/_new 2019-11-12 16:12:16.259807269 +0100 @@ -73,7 +73,9 @@ cp -avr ../agent-%{version}/* $HOME/go/src/%{kata_agent_project} kata_kmodules=(9p 9pnet 9pnet_virtio) -[ "%{kernel_flavor}" != "kvmsmall" ] && kata_kmodules+=( \ + +%if 0%{?suse_version} <= 1500 || %{kernel_flavor} != "kvmsmall" +kata_kmodules+=( \ virtio \ virtio_balloon \ virtio_blk \ @@ -86,6 +88,7 @@ vmw_vsock_virtio_transport \ vmw_vsock_virtio_transport_common \ ) +%endif # Minimal set of kernel modules to allow starting containers echo "drivers=\"${kata_kmodules[@]}\"" > dracut/dracut.conf.d/10-drivers.conf
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-10-24 23:11:17 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2990 (New) Package is "katacontainers-image-initrd" Thu Oct 24 23:11:17 2019 rev:8 rq:742638 version:1.9.0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-10-22 15:46:34.901796664 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2990/katacontainers-image-initrd.changes 2019-10-24 23:11:20.972675319 +0200 @@ -1,0 +2,6 @@ +Thu Oct 24 15:17:17 UTC 2019 - Ralf Haferkamp + +- Update to 1.9.0 tarballs, this is just a version bump without + any code changes. + +--- Old: agent-1.9.0~rc0.tar.xz osbuilder-1.9.0~rc0.tar.xz New: agent-1.9.0.tar.xz osbuilder-1.9.0.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.Gh0epC/_old 2019-10-24 23:11:21.708676178 +0200 +++ /var/tmp/diff_new_pack.Gh0epC/_new 2019-10-24 23:11:21.708676178 +0200 @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.9.0~rc0 +Version:1.9.0 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.Gh0epC/_old 2019-10-24 23:11:21.744676220 +0200 +++ /var/tmp/diff_new_pack.Gh0epC/_new 2019-10-24 23:11:21.744676220 +0200 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.0~rc0 -1.9.0-rc0 +1.9.0 +1.9.0 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.9.0~rc0 -1.9.0-rc0 +1.9.0 +1.9.0 ++ agent-1.9.0~rc0.tar.xz -> agent-1.9.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/agent-1.9.0~rc0/VERSION new/agent-1.9.0/VERSION --- old/agent-1.9.0~rc0/VERSION 2019-10-08 23:57:25.0 +0200 +++ new/agent-1.9.0/VERSION 2019-10-23 15:39:02.0 +0200 @@ -1 +1 @@ -1.9.0-rc0 +1.9.0 ++ osbuilder-1.9.0~rc0.tar.xz -> osbuilder-1.9.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osbuilder-1.9.0~rc0/VERSION new/osbuilder-1.9.0/VERSION --- old/osbuilder-1.9.0~rc0/VERSION 2019-10-09 03:48:30.0 +0200 +++ new/osbuilder-1.9.0/VERSION 2019-10-23 15:39:44.0 +0200 @@ -1 +1 @@ -1.9.0-rc0 +1.9.0
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-10-22 15:46:31 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2352 (New) Package is "katacontainers-image-initrd" Tue Oct 22 15:46:31 2019 rev:7 rq:741704 version:1.9.0~rc0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-09-26 20:42:59.906259631 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2352/katacontainers-image-initrd.changes 2019-10-22 15:46:34.901796664 +0200 @@ -1,0 +2,19 @@ +Mon Oct 21 14:10:04 UTC 2019 - Ralf Haferkamp + +- Update to 1.9.0~rc0: + agent: +- firecracker: send logs to a vsock port +- network: Setup DNS for sandbox +- protocols/client: support hybrid vsocks +- Fix incorrect script reference in TRACING.md + osbuilder: +- osbuilder: Add USE_PODMAN as an alternate for USE_DOCKER +- README: Update how to use DEBUG variable +- Fix yq +- initrd_builder: Create empty resolv.conf in rootfs +- rootfs: update fedora to 29 for arm64. +- Fix config for set-version source-service to set version based + on the osbuilder filename. The previously used + "katacontainers-image-initrd" caused the service to fail. + +--- Old: agent-1.9.0~alpha2.tar.xz osbuilder-1.9.0~alpha2.tar.xz New: agent-1.9.0~rc0.tar.xz osbuilder-1.9.0~rc0.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.lPSW2E/_old 2019-10-22 15:46:36.125798162 +0200 +++ /var/tmp/diff_new_pack.lPSW2E/_new 2019-10-22 15:46:36.125798162 +0200 @@ -44,7 +44,7 @@ %endif Name: katacontainers-image-initrd -Version:1.9.0~alpha2 +Version:1.9.0~rc0 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.lPSW2E/_old 2019-10-22 15:46:36.161798205 +0200 +++ /var/tmp/diff_new_pack.lPSW2E/_new 2019-10-22 15:46:36.165798210 +0200 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.0~alpha2 -1.9.0-alpha2 +1.9.0~rc0 +1.9.0-rc0 @@ -15,8 +15,8 @@ https://github.com/kata-containers/agent.git agent -1.9.0~alpha2 -1.9.0-alpha2 +1.9.0~rc0 +1.9.0-rc0 @@ -25,6 +25,6 @@ -katacontainers-image-initrd +osbuilder
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-09-26 20:42:47 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2352 (New) Package is "katacontainers-image-initrd" Thu Sep 26 20:42:47 2019 rev:6 rq:733373 version:1.9.0~alpha2 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-09-05 12:43:57.167460096 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.2352/katacontainers-image-initrd.changes 2019-09-26 20:42:59.906259631 +0200 @@ -1,0 +2,18 @@ +Wed Sep 25 11:42:06 UTC 2019 - Marco Vedovati + +- Update package version to 1.9.0~alpha2: + agent 1.9.0~alpha2: +*mount: ensure local directory storage types have the correct permissions +*device: fix the issue of failed waiting on device appeared in /dev +*network: While updating routes, do not delete routes with proto "kernel" +*agent: add support for loading kernel modules +*revert: agent: sandbox_pause should get arguments from proc +*agent: sandbox_pause should get arguments from proc +*s390x: add virtio-blk-ccw support +*agent: make NoPivotRoot config depend on / fs type +*make: install depends on $(TARGET) +*device: Allow uevent handler to be stopped +*mount: Improve error message +*memory: Add extra check for memory file + +--- Old: agent-1.9.0~alpha0.tar.gz osbuilder-1.9.0~alpha0.tar.gz New: agent-1.9.0~alpha2.tar.xz osbuilder-1.9.0~alpha2.tar.xz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.RDEpm2/_old 2019-09-26 20:43:01.490255398 +0200 +++ /var/tmp/diff_new_pack.RDEpm2/_new 2019-09-26 20:43:01.490255398 +0200 @@ -44,14 +44,14 @@ %endif Name: katacontainers-image-initrd -Version:1.9.0~alpha0 +Version:1.9.0~alpha2 Release:0 Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 Group: System/Management Url:https://github.com/kata-containers/osbuilder -Source0:osbuilder-%{version}.tar.gz -Source1:agent-%{version}.tar.gz +Source0:osbuilder-%{version}.tar.xz +Source1:agent-%{version}.tar.xz ExclusiveArch: x86_64 aarch64 ppc64le s390x BuildRequires: dracut BuildRequires: fdupes ++ _service ++ --- /var/tmp/diff_new_pack.RDEpm2/_old 2019-09-26 20:43:01.518255323 +0200 +++ /var/tmp/diff_new_pack.RDEpm2/_new 2019-09-26 20:43:01.518255323 +0200 @@ -6,8 +6,8 @@ https://github.com/kata-containers/osbuilder.git osbuilder -1.9.0~alpha0 -master +1.9.0~alpha2 +1.9.0-alpha2 @@ -15,16 +15,16 @@ https://github.com/kata-containers/agent.git agent -1.9.0~alpha0 -master +1.9.0~alpha2 +1.9.0-alpha2 *.tar* -gz +xz -katacontainers-osbuilder +katacontainers-image-initrd
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-09-05 12:43:50 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.7948 (New) Package is "katacontainers-image-initrd" Thu Sep 5 12:43:50 2019 rev:5 rq:728257 version:1.9.0~alpha0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-09-02 13:25:18.241312946 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.7948/katacontainers-image-initrd.changes 2019-09-05 12:43:57.167460096 +0200 @@ -1,0 +2,9 @@ +Tue Sep 3 17:05:15 UTC 2019 - Marco Vedovati + +- Add support for non x86_64 archs, by using the default kernel flavor instead + of kvmsmall +- Require golang >= 1.12 +- Update package summary and description +- Set the list of exclusive archs (x86_64, aarch64, ppc64le, s390x) + +--- Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.O52lzz/_old 2019-09-05 12:43:57.887459955 +0200 +++ /var/tmp/diff_new_pack.O52lzz/_new 2019-09-05 12:43:57.891459953 +0200 @@ -18,26 +18,50 @@ # %define kata_agent_projectgithub.com/kata-containers/agent -%define kata_modules_required 9p 9pnet_virtio + +# Platforms that supports kvm specific kernels +%ifarch x86_64 %define kernel_flavor kvmsmall +%else +%define kernel_flavor default +%endif + +%ifarch x86_64 +%define kernel_basename vmlinuz +%endif + +%ifarch ppc64le +%define kernel_basename vmlinux +%endif + +%ifarch aarch64 +%define kernel_basename Image +%define kernel_compress 1 +%endif + +%ifarch s390x +%define kernel_basename image +%endif Name: katacontainers-image-initrd Version:1.9.0~alpha0 Release:0 -Summary:Kata Containers OSbuilder +Summary:Kata Containers image (initrd) and kernel License:Apache-2.0 Group: System/Management Url:https://github.com/kata-containers/osbuilder Source0:osbuilder-%{version}.tar.gz Source1:agent-%{version}.tar.gz +ExclusiveArch: x86_64 aarch64 ppc64le s390x BuildRequires: dracut BuildRequires: fdupes BuildRequires: kernel-%{kernel_flavor} -BuildRequires: golang(API) = 1.11 +BuildRequires: golang(API) >= 1.12 Provides: katacontainers-image %description -initrd used as guest VM in Kata Containers, built using dracut. +Kata Containers image (in initrd format) and kernel used for the ephemeral VMs +used to run containers. %prep %setup -q -n osbuilder-%{version} -b1 @@ -48,9 +72,24 @@ mkdir -pv $HOME/go/src/%{kata_agent_project} cp -avr ../agent-%{version}/* $HOME/go/src/%{kata_agent_project} -# Minimal set of drivers to allow starting containers -echo 'drivers="%{kata_modules_required}"' > dracut/dracut.conf.d/10-drivers.conf -kversion="$(find /boot -name 'vmlinuz-*%{kernel_flavor}' | sed 's,/boot/vmlinuz-,,' | sort | tail -n 1)" +kata_kmodules=(9p 9pnet 9pnet_virtio) +[ "%{kernel_flavor}" != "kvmsmall" ] && kata_kmodules+=( \ +virtio \ +virtio_balloon \ +virtio_blk \ +virtio_crypto \ +virtio-gpu \ +virtio_input \ +virtio_net \ +virtio-rng \ +virtio_scsi \ +vmw_vsock_virtio_transport \ +vmw_vsock_virtio_transport_common \ +) + +# Minimal set of kernel modules to allow starting containers +echo "drivers=\"${kata_kmodules[@]}\"" > dracut/dracut.conf.d/10-drivers.conf +kversion="$(find /boot -name '%{kernel_basename}-*%{kernel_flavor}' | sed 's,/boot/%{kernel_basename}-,,' | sort | tail -n 1)" echo "Found kernel version: ${kversion}" echo "${kversion}" > %{_builddir}/kversion @@ -64,10 +103,18 @@ %install read kversion < %{_builddir}/kversion +# image install -m 0644 -D kata-containers-initrd.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd-${kversion}.img -install -m 0644 -D /boot/vmlinuz-${kversion} %{buildroot}%{_datarootdir}/kata-containers/ ln -sf kata-containers-initrd-${kversion}.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd.img -ln -sf vmlinuz-${kversion} %{buildroot}%{_datarootdir}/kata-containers/vmlinuz + +#kernel +vmKernelDest="%{buildroot}%{_datarootdir}/kata-containers/%{kernel_basename}-${kversion}" +%if 0%{?kernel_compress} +gzip -c /boot/%{kernel_basename}-${kversion} > ${vmKernelDest}.gz +%else +install -m 0644 -D /boot/%{kernel_basename}-${kversion} ${vmKernelDest} +%endif +ln -sf "$(basename "${vmKernelDest}%{?kernel_compress:.gz}")" %{buildroot}%{_datarootdir}/kata-containers/vmlinuz %fdupes
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-09-02 13:25:15 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.7948 (New) Package is "katacontainers-image-initrd" Mon Sep 2 13:25:15 2019 rev:4 rq:727214 version:1.9.0~alpha0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-08-22 10:52:41.281697344 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.7948/katacontainers-image-initrd.changes 2019-09-02 13:25:18.241312946 +0200 @@ -1,0 +2,6 @@ +Fri Aug 30 11:27:06 UTC 2019 - Marco Vedovati + +- Vendor in vmlinuz from kernel-kvmsmall to avoid dependency on that package + and the side effect linked to installing a VM kernel on the host + +--- Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.Ut9zBU/_old 2019-09-02 13:25:19.125312779 +0200 +++ /var/tmp/diff_new_pack.Ut9zBU/_new 2019-09-02 13:25:19.129312778 +0200 @@ -34,7 +34,6 @@ BuildRequires: fdupes BuildRequires: kernel-%{kernel_flavor} BuildRequires: golang(API) = 1.11 -Requires: kernel-%{kernel_flavor} = %(rpm -q --queryformat '[%%{VERSION}-%%{RELEASE}]' kernel-%{kernel_flavor}) Provides: katacontainers-image %description @@ -66,26 +65,19 @@ %install read kversion < %{_builddir}/kversion install -m 0644 -D kata-containers-initrd.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd-${kversion}.img +install -m 0644 -D /boot/vmlinuz-${kversion} %{buildroot}%{_datarootdir}/kata-containers/ ln -sf kata-containers-initrd-${kversion}.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd.img +ln -sf vmlinuz-${kversion} %{buildroot}%{_datarootdir}/kata-containers/vmlinuz %fdupes %{buildroot}/%{_prefix} -%post -# Set config to use a matching kernel and initrd version. This is done in %post, -# so that it is using whatever versions the user has installed on its system. -kversion=$(readlink "%{_datarootdir}/kata-containers/kata-containers-initrd.img" | sed -E -e "s,^.*kata-containers-initrd-(.+).img,\1,") -[ -n "${kversion}" ] || { echo "Failed to detect the initrd kernel version"; exit -1; } -ln -sf "/boot/vmlinuz-${kversion}" "%{_datarootdir}/kata-containers/vmlinuz" - -%postun -# Remove the vmlinuz link create in %post -rm -f "%{_datarootdir}/kata-containers/vmlinuz" - %files %defattr(-,root,root,-) %dir %{_datarootdir}/kata-containers %{_datarootdir}/kata-containers/kata-containers-initrd.img %{_datarootdir}/kata-containers/kata-containers-initrd-*-%{kernel_flavor}.img +%{_datarootdir}/kata-containers/vmlinuz +%{_datarootdir}/kata-containers/vmlinuz-*-%{kernel_flavor} %license LICENSE %changelog
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-08-22 10:52:38 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.22127 (New) Package is "katacontainers-image-initrd" Thu Aug 22 10:52:38 2019 rev:3 rq:724844 version:1.9.0~alpha0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-08-09 16:52:34.289480384 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.22127/katacontainers-image-initrd.changes 2019-08-22 10:52:41.281697344 +0200 @@ -1,0 +2,5 @@ +Thu Aug 8 14:31:08 UTC 2019 - Marco Vedovati + +- Have this package directly depend on kernel-kvmsmall. + +--- Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.s2noaF/_old 2019-08-22 10:52:42.845697135 +0200 +++ /var/tmp/diff_new_pack.s2noaF/_new 2019-08-22 10:52:42.889697128 +0200 @@ -34,6 +34,7 @@ BuildRequires: fdupes BuildRequires: kernel-%{kernel_flavor} BuildRequires: golang(API) = 1.11 +Requires: kernel-%{kernel_flavor} = %(rpm -q --queryformat '[%%{VERSION}-%%{RELEASE}]' kernel-%{kernel_flavor}) Provides: katacontainers-image %description @@ -69,6 +70,17 @@ %fdupes %{buildroot}/%{_prefix} +%post +# Set config to use a matching kernel and initrd version. This is done in %post, +# so that it is using whatever versions the user has installed on its system. +kversion=$(readlink "%{_datarootdir}/kata-containers/kata-containers-initrd.img" | sed -E -e "s,^.*kata-containers-initrd-(.+).img,\1,") +[ -n "${kversion}" ] || { echo "Failed to detect the initrd kernel version"; exit -1; } +ln -sf "/boot/vmlinuz-${kversion}" "%{_datarootdir}/kata-containers/vmlinuz" + +%postun +# Remove the vmlinuz link create in %post +rm -f "%{_datarootdir}/kata-containers/vmlinuz" + %files %defattr(-,root,root,-) %dir %{_datarootdir}/kata-containers
commit katacontainers-image-initrd for openSUSE:Factory
Hello community, here is the log from the commit of package katacontainers-image-initrd for openSUSE:Factory checked in at 2019-08-09 16:52:30 Comparing /work/SRC/openSUSE:Factory/katacontainers-image-initrd (Old) and /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.9556 (New) Package is "katacontainers-image-initrd" Fri Aug 9 16:52:30 2019 rev:2 rq:721682 version:1.9.0~alpha0 Changes: --- /work/SRC/openSUSE:Factory/katacontainers-image-initrd/katacontainers-image-initrd.changes 2019-08-05 10:41:10.711300235 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers-image-initrd.new.9556/katacontainers-image-initrd.changes 2019-08-09 16:52:34.289480384 +0200 @@ -1,0 +2,8 @@ +Mon Aug 5 16:51:17 UTC 2019 - Marco Vedovati + +- Include kernel version in initrd image name, and symlink it to the generic + image name. This allows the katacontainers package to retrieve the correct + kernel version to use +- Rename kata-osbuilder tarball to osbuilder + +--- Old: katacontainers-osbuilder-1.9.0~alpha0.tar.gz New: osbuilder-1.9.0~alpha0.tar.gz Other differences: -- ++ katacontainers-image-initrd.spec ++ --- /var/tmp/diff_new_pack.VMdyPv/_old 2019-08-09 16:52:34.809480259 +0200 +++ /var/tmp/diff_new_pack.VMdyPv/_new 2019-08-09 16:52:34.813480258 +0200 @@ -1,7 +1,7 @@ # # spec file for package katacontainers-image-initrd # -# Copyright (c) 2018 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,10 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + # %define kata_agent_project github.com/kata-containers/agent %define kata_modules_required 9p 9pnet_virtio +%define kernel_flavor kvmsmall Name: katacontainers-image-initrd Version:1.9.0~alpha0 @@ -24,19 +28,19 @@ License:Apache-2.0 Group: System/Management Url:https://github.com/kata-containers/osbuilder -Source0:katacontainers-osbuilder-%{version}.tar.gz +Source0:osbuilder-%{version}.tar.gz Source1:agent-%{version}.tar.gz +BuildRequires: dracut BuildRequires: fdupes +BuildRequires: kernel-%{kernel_flavor} BuildRequires: golang(API) = 1.11 -BuildRequires: dracut -BuildRequires: kernel-kvmsmall Provides: katacontainers-image %description initrd used as guest VM in Kata Containers, built using dracut. %prep -%setup -q -n katacontainers-osbuilder-%{version} -b1 +%setup -q -n osbuilder-%{version} -b1 %build export GOPATH=$HOME/go @@ -46,20 +50,22 @@ # Minimal set of drivers to allow starting containers echo 'drivers="%{kata_modules_required}"' > dracut/dracut.conf.d/10-drivers.conf - -kvmsmallKversion="$(find /boot -name 'vmlinuz-*kvmsmall' | sed 's,/boot/vmlinuz-,,')" -echo "Found kvmsmall kernel version: ${kvmsmallKversion}" +kversion="$(find /boot -name 'vmlinuz-*%{kernel_flavor}' | sed 's,/boot/vmlinuz-,,' | sort | tail -n 1)" +echo "Found kernel version: ${kversion}" +echo "${kversion}" > %{_builddir}/kversion make \ BUILD_METHOD=dracut \ -DRACUT_KVERSION=${kvmsmallKversion} \ +DRACUT_KVERSION=${kversion} \ clean initrd %check # (tested manually) %install -install -m 0644 -D kata-containers-initrd.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd.img +read kversion < %{_builddir}/kversion +install -m 0644 -D kata-containers-initrd.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd-${kversion}.img +ln -sf kata-containers-initrd-${kversion}.img %{buildroot}%{_datarootdir}/kata-containers/kata-containers-initrd.img %fdupes %{buildroot}/%{_prefix} @@ -67,6 +73,7 @@ %defattr(-,root,root,-) %dir %{_datarootdir}/kata-containers %{_datarootdir}/kata-containers/kata-containers-initrd.img +%{_datarootdir}/kata-containers/kata-containers-initrd-*-%{kernel_flavor}.img %license LICENSE %changelog ++ _service ++ --- /var/tmp/diff_new_pack.VMdyPv/_old 2019-08-09 16:52:34.837480252 +0200 +++ /var/tmp/diff_new_pack.VMdyPv/_new 2019-08-09 16:52:34.841480251 +0200 @@ -4,7 +4,7 @@ git https://github.com/kata-containers/osbuilder.git -katacontainers-osbuilder +osbuilder 1.9.0~alpha0 master ++ agent-1.9.0~alpha0.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore'