From e5ff73faba91abc93662871594e480f3e3f92be1 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 5 Aug 2024 08:10:57 +0200 Subject: [PATCH] Update to 5.2.0 upstream release Upstream tag: v5.2.0 Upstream commit: b22d5c61 Commit authored by Packit automation (https://packit.dev/) --- .packit.yaml | 37 +++++++++++++++++++++++-------------- README.packit | 2 +- podman.spec | 44 +++++++++++++++++++++++++++++++++++--------- sources | 2 +- 4 files changed, 60 insertions(+), 25 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 0d3eaca..7783371 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -12,6 +12,8 @@ packages: podman-centos: pkg_tool: centpkg specfile_path: rpm/podman.spec + podman-rhel: + specfile_path: rpm/podman.spec srpm_build_deps: - git-archive-all @@ -25,32 +27,39 @@ jobs: - job: copr_build trigger: pull_request packages: [podman-fedora] - notifications: + notifications: &packit_build_failure_notification failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - - fedora-all-x86_64 - - fedora-all-aarch64 - - fedora-eln-x86_64 - - fedora-eln-aarch64 - additional_repos: - - "copr://rhcontainerbot/podman-next" + fedora-all-x86_64: {} + fedora-all-aarch64: {} + fedora-eln-x86_64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" + fedora-eln-aarch64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" - job: copr_build trigger: pull_request packages: [podman-centos] - notifications: - failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." + notifications: *packit_build_failure_notification + enable_net: true + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 + + - job: copr_build + trigger: pull_request + packages: [podman-rhel] + notifications: *packit_build_failure_notification enable_net: true targets: - epel-9-x86_64 - epel-9-aarch64 - - centos-stream-10-x86_64 - - centos-stream-10-aarch64 - additional_repos: - - "copr://rhcontainerbot/podman-next" # Run on commit to main branch - job: copr_build diff --git a/README.packit b/README.packit index 3dfd179..bd4a9c5 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.3. +The file was generated using packit 0.99.0. diff --git a/podman.spec b/podman.spec index a79daa1..4454e7b 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,7 @@ Epoch: 5 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 5.1.2 +Version: 5.2.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease @@ -101,12 +101,6 @@ Requires: containers-common-extra >= 5:0.58.0-1 %else Requires: containers-common-extra %endif -%if %{defined rhel} && !%{defined eln} -Recommends: gvisor-tap-vsock-gvforwarder -%else -Requires: gvisor-tap-vsock-gvforwarder -%endif -Recommends: gvisor-tap-vsock Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -186,6 +180,17 @@ capabilities specified in user quadlets. It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. +%package machine +Summary: Metapackage for setting up %{name} machine +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: gvisor-tap-vsock +Requires: qemu +Requires: virtiofsd + +%description machine +This subpackage installs the dependencies for %{name} machine, for more see: +https://docs.podman.io/en/latest/markdown/podman-machine.1.html + %prep %autosetup -Sgit -n %{name}-%{version_no_tilde} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile @@ -240,6 +245,10 @@ export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remot export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" %gobuild -o bin/quadlet ./cmd/quadlet +# build %%{name}-testing +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" +%gobuild -o bin/podman-testing ./cmd/podman-testing + # reset LDFLAGS for plugins binaries LDFLAGS='' @@ -255,6 +264,12 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.docker \ install.docker-docs \ install.remote \ + install.testing + +# Only need this on Fedora until nftables becomes the default +%if %{defined fedora} +%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load +%endif sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker @@ -265,8 +280,11 @@ done rm -f %{buildroot}%{_mandir}/man5/docker*.5 -install -d -p %{buildroot}/%{_datadir}/%{name}/test/system -cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +install -d -p %{buildroot}%{_datadir}/%{name}/test/system +cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/ + +# symlink virtiofsd in %%{name} libexecdir for machine subpackage +ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -289,6 +307,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_tmpfilesdir}/%{name}.conf %{_systemdgeneratordir}/%{name}-system-generator %{_systemdusergeneratordir}/%{name}-user-generator +%if %{defined fedora} +%{_modulesloaddir}/%{name}-iptables.conf +%endif %files docker %{_bindir}/docker @@ -308,12 +329,17 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_datadir}/zsh/site-functions/_%{name}-remote %files tests +%{_bindir}/%{name}-testing %{_datadir}/%{name}/test %files -n %{name}sh %{_bindir}/%{name}sh %{_mandir}/man1/%{name}sh.1* +%files machine +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/virtiofsd + %changelog %if %{defined autochangelog} %autochangelog diff --git a/sources b/sources index 8cf705e..ac60916 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.1.2.tar.gz) = adfd4dc5a1f7e1887ca5ffc0c6ec4593f051566010c3cc7050294fd50d2cab3d0257ff6ea4cc1abd2ba8b12adcfe0310446ac66bfc2280d9a9597294ecbcd474 +SHA512 (v5.2.0.tar.gz) = cc5ac92ebeaac03074c1221fa4cbc3ea62af95d0d444208b88368208089e146ff2693281033caaecd909a5f01fe4a3f8a199fef8c6c9901c281431011e19f729