From 7ec1cfbd0026975fed11ff97b4493dfe5b1e7693 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Mar 2026 07:23:29 +0000 Subject: [PATCH] app-containers/podman: Sync with Gentoo It's from Gentoo commit 24840b461a6fa456e76a9cc0d74edae4a6b80d33. Signed-off-by: Flatcar Buildbot --- .../podman/files/podman-5.2.5-togglable-seccomp.patch | 10 ---------- .../portage-stable/app-containers/podman/metadata.xml | 4 ++-- .../app-containers/podman/podman-5.7.1.ebuild | 4 ++-- 3 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch diff --git a/sdk_container/src/third_party/portage-stable/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch b/sdk_container/src/third_party/portage-stable/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch deleted file mode 100644 index dcfe449568..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,6 @@ BUILDTAGS ?= \ - $(shell hack/systemd_tag.sh) \ - $(shell hack/libsubid_tag.sh) \ - exclude_graphdriver_devicemapper \ -- seccomp - # allow downstreams to easily add build tags while keeping our defaults - BUILDTAGS += ${EXTRA_BUILDTAGS} - # N/B: This value is managed by Renovate, manual changes are diff --git a/sdk_container/src/third_party/portage-stable/app-containers/podman/metadata.xml b/sdk_container/src/third_party/portage-stable/app-containers/podman/metadata.xml index 897bde5677..aefe07f221 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/metadata.xml @@ -24,10 +24,10 @@ - Enables btrfs support (graph driver) in Podman + Enable btrfs support (graph driver) in Podman - Install wrapper which lets use podman for command `docker` + Install a wrapper to allow using `podman` as a drop-in replacement for `docker` diff --git a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.7.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.7.1.ebuild index 36c6887628..9f80dd3c55 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.7.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P/_rc/-rc}" [[ ${PV} != *rc* ]] && \ - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" + KEYWORDS="amd64 arm64 ~loong ~riscv" fi # main pkg