diff --git a/0999-osbuilder-Adjust-agent_version-for-our-builds.patch b/0999-osbuilder-Adjust-agent_version-for-our-builds.patch deleted file mode 100644 index 92bc6eb98d0e65673dbc96733c9330281521bfdc..0000000000000000000000000000000000000000 --- a/0999-osbuilder-Adjust-agent_version-for-our-builds.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3a789e01e42537f98b6f73862819c4ecf20ab0e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Mon, 30 Nov 2020 16:04:11 +0100 -Subject: [PATCH] osbuilder: Adjust agent_version for our builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As we move things around when installing osbuilder, we need to adapt -where we get the agent_version from. - -Signed-off-by: Fabiano Fidêncio ---- - tools/osbuilder/scripts/lib.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh -index e7a39d8..f0a41b6 100644 ---- a/tools/osbuilder/scripts/lib.sh -+++ b/tools/osbuilder/scripts/lib.sh -@@ -195,8 +195,7 @@ create_summary_file() - if [ "${RUST_AGENT}" == "no" ]; then - agent_version=$("$agent" --version|awk '{print $NF}') - else -- local -r agentdir="${script_dir}/../../../" -- agent_version=$(cat ${agentdir}/VERSION) -+ agent_version=$(cat "${script_dir}/../../VERSION") - fi - - --- -2.28.0 - diff --git a/1000-Remove-shebang-in-non-executable-completion-script.patch b/1000-Remove-shebang-in-non-executable-completion-script.patch deleted file mode 100644 index 6b6f26f0443fbcdcfd9153425c0a8c2a83f7a119..0000000000000000000000000000000000000000 --- a/1000-Remove-shebang-in-non-executable-completion-script.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1c65024709d7c28bf78b42c59a135df17513d78d Mon Sep 17 00:00:00 2001 -From: Christophe de Dinechin -Date: Thu, 12 Sep 2019 12:57:39 +0200 -Subject: [PATCH] Remove shebang in non-executable completion script - -Raised during package review [1] by rpmlint - -[1] https://bugzilla.redhat.com/show_bug.cgi?id=1590425#c8 - -Signed-off-by: Christophe de Dinechin ---- - src/runtime/data/completions/bash/kata-runtime | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/runtime/data/completions/bash/kata-runtime b/src/runtime/data/completions/bash/kata-runtime -index c293483..58ab978 100644 ---- a/src/runtime/data/completions/bash/kata-runtime -+++ b/src/runtime/data/completions/bash/kata-runtime -@@ -1,4 +1,3 @@ --#!/bin/bash - # - # Copyright (c) 2018 Intel Corporation - # --- -2.21.0 diff --git a/0001-Add-vendor-code.patch b/kata-containers-2.4.3-vendor.tar.gz similarity index 72% rename from 0001-Add-vendor-code.patch rename to kata-containers-2.4.3-vendor.tar.gz index 720189434d6c8496ad3e1317705da0cdd91bf810..fca0f7f58191afc2e987f4a2d7562bb811c54bfd 100644 Binary files a/0001-Add-vendor-code.patch and b/kata-containers-2.4.3-vendor.tar.gz differ diff --git a/kata-containers-2.0.3.tar.gz b/kata-containers-2.4.3.tar.gz similarity index 51% rename from kata-containers-2.0.3.tar.gz rename to kata-containers-2.4.3.tar.gz index 562de957942e000f9d487df54fb180f59b4251ae..e1b7f6f50dcb6475dba1b1760bbcba51f91ce304 100644 Binary files a/kata-containers-2.0.3.tar.gz and b/kata-containers-2.4.3.tar.gz differ diff --git a/kata-containers.spec b/kata-containers.spec index bfaf3725568fef207ea1b2d93e10cf5e921e3873..640f56870ff60b69e4cac4423b609524a4735961 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -1,11 +1,6 @@ -%define anolis_release 1.0.0.2 +%define anolis_release 1 -# go-rpm-macros are not available on RHEL. -%if 0%{?fedora} - %global have_go_rpm_macros 1 -%else - %global have_go_rpm_macros 0 -%endif +%global have_go_rpm_macros 0 %global with_debug 0 @@ -35,7 +30,7 @@ %endif # htps://github.com/kata-containers/kata-containers -Version: 2.0.3 +Version: 2.4.3 %global tag %{version}%{?rcstr} %global domain github.com @@ -65,19 +60,10 @@ Summary: Kata Containers version 2.x repository License: ASL 2.0 Url: https://%{download} Source0: https://%{download}/archive/%{version}%{?rcstr}/%{repo}-%{version}%{?rcstr}.tar.gz -Source1: kata-osbuilder.sh -Source2: kata-osbuilder-generate.service -%if 0%{?fedora} -Source3: 15-dracut-fedora.conf -%else -Source3: 15-dracut-anolis.conf -%endif - -Patch0001: 0001-Add-vendor-code.patch -# Keep this patch downstream as it'd be hard to justify such change upstream -Patch0999: 0999-osbuilder-Adjust-agent_version-for-our-builds.patch -Patch1000: 1000-Remove-shebang-in-non-executable-completion-script.patch - +Source1: https://%{download}/releases/download/%{version}/%{repo}-%{version}%{?rcstr}-vendor.tar.gz +Source2: kata-osbuilder.sh +Source3: kata-osbuilder-generate.service +Source4: 15-dracut-anolis.conf %if 0%{?have_go_rpm_macros} BuildRequires: go-rpm-macros @@ -88,6 +74,7 @@ BuildRequires: golang BuildRequires: git-core BuildRequires: libselinux-devel +BuildRequires: libseccomp-devel BuildRequires: make BuildRequires: systemd BuildRequires: gcc @@ -98,10 +85,6 @@ BuildRequires: protobuf-compiler BuildRequires: dracut BuildRequires: kernel -%if 0%{?fedora} -BuildRequires: busybox -%endif - %if 0%{?bundled_rust_deps} BuildRequires: cargo BuildRequires: rust @@ -142,14 +125,10 @@ BuildRequires: crate(rustjail/default) >= 0.0.0 BuildRequires: crate(ttrpc/default) >= 0.0.0 %endif -%if 0%{?fedora} -Requires: busybox -%endif - Requires: dracut Requires: kernel -Requires: qemu-kvm-core >= 4.2.0-4 -Requires: libgcrypt >= 1.8.5 +Requires: qemu-kvm-core >= 15:4.2.0 +Requires: %{_libexecdir}/virtiofsd Conflicts: kata-agent Conflicts: kata-ksm-throttler @@ -174,26 +153,14 @@ ExcludeArch: %{arm} %{ix86} s390 s390x # The kernel parameters workaround an issue with cgroupsv2 after kernel 5.3 # To-do: add BUILDFLAGS=gobuildflags when the macro becomes available %global qemu qemu-kvm -%if 0%{?fedora} -%global qemupath %{_bindir}/%{qemu} -%else %global qemupath %{_libexecdir}/%{qemu} -%endif # The machine type to be used is architecture specific: # aarch64: virt -# ppc64le: pseries -# s390x: s390-ccw-virtio # x86_64: q35 %ifarch aarch64 %global machinetype "virt" %endif -%ifarch ppc64le -%global machinetype "pseries" -%endif -%ifarch s390x -%global machinetype "s390-ccw-virtio" -%endif %ifarch x86_64 %global machinetype "q35" %endif @@ -220,7 +187,8 @@ ExcludeArch: %{arm} %{ix86} s390 s390x PREFIX=/usr \\\ DEFAULTSDIR=%{katadefaults} \\\ CONFDIR=%{katadefaults} \\\ - FEATURE_SELINUX="yes" + FEATURE_SELINUX="yes" \\\ + DEFENABLEANNOTATIONS=['\\\".*\\\"'] %global agent_make_vars LIBC=gnu \\\ DESTDIR=%{buildroot}%{kataagentdir} @@ -228,6 +196,8 @@ ExcludeArch: %{arm} %{ix86} s390 s390x %prep %autosetup -S git -p1 -n %{repo}-%{version}%{?rcstr} +tar -xf %{SOURCE1} + # Not using gobuild here in order to stick to how upstream builds # (This builds multiple binaries) %build @@ -274,9 +244,9 @@ rm .gitignore rm rootfs-builder/.gitignore mkdir -p %{buildroot}%{katalocalstatecachedir} -install -m 0644 -D -t %{buildroot}%{_unitdir} %{SOURCE2} +install -m 0644 -D -t %{buildroot}%{_unitdir} %{SOURCE3} install -m 0755 -D -t %{buildroot}%{kataosbuilderdir} nsdax -install -m 0644 -D -t %{buildroot}%{kataosbuilderdir} %{SOURCE1} +install -m 0644 -D -t %{buildroot}%{kataosbuilderdir} %{SOURCE2} cp -aR rootfs-builder %{buildroot}%{kataosbuilderdir} cp -aR image-builder %{buildroot}%{kataosbuilderdir} @@ -285,7 +255,7 @@ cp -aR scripts %{buildroot}%{kataosbuilderdir} cp -aR dracut %{buildroot}%{kataosbuilderdir} rm -f %{buildroot}%{kataosbuilderdir}/image-builder/nsdax.gpl.c -install -m 0644 -D -t %{buildroot}%{kataosbuilderdir}/dracut/dracut.conf.d/ %{SOURCE3} +install -m 0644 -D -t %{buildroot}%{kataosbuilderdir}/dracut/dracut.conf.d/ %{SOURCE4} chmod +x %{buildroot}%{kataosbuilderdir}/scripts/lib.sh chmod +x %{buildroot}%{kataosbuilderdir}/kata-osbuilder.sh popd @@ -317,8 +287,10 @@ TEST_MODE=1 %{buildroot}%{kataosbuilderdir}/kata-osbuilder.sh \ %preun %systemd_preun kata-osbuilder-generate.service + %postun %systemd_postun kata-osbuilder-generate.service + %post # Skip running this on Fedora CoreOS / Red Hat CoreOS if test -w %{katalocalstatecachedir}; then @@ -343,7 +315,6 @@ fi %{_bindir}/kata-collect-data.sh %dir %{katalibexecdir} %{katalibexecdir}/VERSION -%{katalibexecdir}/kata-netmon %dir %{katadatadir} %dir %{katadefaults} %{katadefaults}/configuration.toml @@ -368,30 +339,10 @@ fi %exclude %{kataosbuilderdir}/rootfs-builder/centos %exclude %{kataosbuilderdir}/rootfs-builder/clearlinux %exclude %{kataosbuilderdir}/rootfs-builder/debian -%exclude %{kataosbuilderdir}/rootfs-builder/fedora %exclude %{kataosbuilderdir}/rootfs-builder/template -%exclude %{kataosbuilderdir}/rootfs-builder/suse %exclude %{kataosbuilderdir}/rootfs-builder/ubuntu %changelog -* Sat Jul 31 2021 Weitao Zhou - 2.0.3-1.0.0.2 -- bug fix: enable virtio_pci driver to fix timed out connecting to vsock on arm guest os - -* Sat Jul 31 2021 Weitao Zhou - 2.0.3-1.0.0.1 -- add Requires: libgcrypt>=1.8.5 - -* Fri Apr 09 2021 Eduardo Lima (Etrunko) - 2.0.3-1 -- kata-containers 2.0.3 - -* Tue Apr 06 2021 Eduardo Lima (Etrunko) - 2.0.2-1 -- kata-containers 2.0.2 - -* Mon Mar 08 2021 Eduardo Lima (Etrunko) - 2.0.1-1 -- Kata-containers 2.0.1 - -* Thu Dec 17 2020 Eduardo Lima (Etrunko) - 2.0.0-1 -- Adjust package for Fedora review. - -* Thu Nov 26 2020 Fabiano Fidêncio - 2.0.0-0 -- Initial packaging +* Tue Aug 9 2022 Chao Wu - 2.4.3-1 +- update to kata-containers 2.4.3 from upstream