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 new file mode 100644 index 0000000000..dcfe449568 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/files/podman-5.2.5-togglable-seccomp.patch @@ -0,0 +1,10 @@ +--- 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/podman-5.2.5.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.2.5.ebuild index 91caafc195..091242e4a4 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.2.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.2.5.ebuild @@ -51,7 +51,7 @@ BDEPEND=" " PATCHES=( - "${T}"/togglable-seccomp.patch + "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch ) CONFIG_CHECK=" @@ -65,19 +65,6 @@ pkg_setup() { } src_prepare() { - cat <<'EOF' > "${T}"/togglable-seccomp.patch || die ---- 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 -EOF - default # assure necessary files are present diff --git a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.0.ebuild index 365a368d76..0d75458d62 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.0.ebuild @@ -51,7 +51,7 @@ BDEPEND=" " PATCHES=( - "${T}"/togglable-seccomp.patch + "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch ) CONFIG_CHECK=" @@ -65,19 +65,6 @@ pkg_setup() { } src_prepare() { - cat <<'EOF' > "${T}"/togglable-seccomp.patch || die ---- 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 -EOF - default # assure necessary files are present diff --git a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.2.ebuild index 38cbb5a51f..72735a9d4f 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-5.3.2.ebuild @@ -51,7 +51,7 @@ BDEPEND=" " PATCHES=( - "${T}"/togglable-seccomp.patch + "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch ) CONFIG_CHECK=" @@ -65,19 +65,6 @@ pkg_setup() { } src_prepare() { - cat <<'EOF' > "${T}"/togglable-seccomp.patch || die ---- 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 -EOF - default # assure necessary files are present diff --git a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-9999.ebuild index 1deb45b196..d1269c1493 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/podman/podman-9999.ebuild @@ -51,7 +51,7 @@ BDEPEND=" " PATCHES=( - "${T}"/togglable-seccomp.patch + "${FILESDIR}"/${PN}-5.2.5-togglable-seccomp.patch ) CONFIG_CHECK=" @@ -65,19 +65,6 @@ pkg_setup() { } src_prepare() { - cat <<'EOF' > "${T}"/togglable-seccomp.patch || die ---- 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 -EOF - default # assure necessary files are present