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 <[email protected]>
+
+- 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_project github.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 %{buildroot}/%{_prefix}
@@ -77,7 +124,7 @@
%{_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}
+%{_datarootdir}/kata-containers/%{kernel_basename}-*-%{kernel_flavor}%{?kernel_compress:.gz}
%license LICENSE
%changelog
