Skip to content

Commit a1f0df9

Browse files
rahilariouszmedico
rahilarious
authored and
zmedico
committed
app-containers/buildah: update to 1.40.1
btrfs_noversion buildtag is no longer effective containers/storage#2308 Signed-off-by: Rahil Bhimjiani <me@rahil.rocks> From: #42919 Signed-off-by: Zac Medico <zmedico@gentoo.org>
1 parent e7610cb commit a1f0df9

File tree

4 files changed

+118
-2
lines changed

4 files changed

+118
-2
lines changed

‎app-containers/buildah/Manifest‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
DIST buildah-1.38.1.tar.gz 18550893 BLAKE2B 6342f70b75e1633bea2bc1902b1c4815799e3f8ed867a1c1df2e8fe0e016c16a4f94e1947ff073a0a079b55d047996cc7e89d78c1602b4642b525dcbb3ca59f3 SHA512 3c4738c4d30bece590da1de3ec8879e75d197bb18a1377264cf74f034574f46e27109842503aab0b98b1fd69f8762a13e80b1bd8522c5e3782ac0c451a07c3d8
22
DIST buildah-1.39.4.tar.gz 18657348 BLAKE2B 470767805ea5d2140da092aaaf0d55a78d32d1bc1bb14f3a1e6da0a751f8618b29e7d01f25c745234cee734ef4299ad442ea42e1326e186cdd9e6834152c9571 SHA512 c721660f94010a0dc8b01502db565b486c53962ee1933e03dd2297cf5d30ac9edef6c92491f41c8c61bee946302e7a39ecff55b2ad3e34ed649222c9655262c2
33
DIST buildah-1.40.0.tar.gz 12321438 BLAKE2B 3d923ddd249fd93476a8e88b72b1989b4bead9b282657d372c2aa04da0d787ee8e807cb74bface8a165ae0282ead791eb3da20a73751b63e3cfe7ee6ab34bd94 SHA512 bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311
4+
DIST buildah-1.40.1.tar.gz 12329760 BLAKE2B dd5be8e27be8c37b211dd3009d8533f44d234ef6bc8f5405a258931b51f0b79a1b5dc456e3e0269ca9b4c4e981c226c97ff51876ae2f1836bc16c974838f5615 SHA512 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f

‎app-containers/buildah/buildah-1.40.1.ebuild‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# Copyright 1999-2025 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
inherit go-module linux-info toolchain-funcs
7+
8+
DESCRIPTION="A tool that facilitates building OCI images"
9+
HOMEPAGE="https://github.com/containers/buildah"
10+
11+
# main pkg
12+
LICENSE="Apache-2.0"
13+
# deps
14+
LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
15+
16+
SLOT="0"
17+
IUSE="apparmor btrfs +seccomp systemd test"
18+
RESTRICT="test"
19+
DOCS=(
20+
"CHANGELOG.md"
21+
"troubleshooting.md"
22+
"docs/tutorials"
23+
)
24+
25+
if [[ ${PV} == 9999* ]]; then
26+
inherit git-r3
27+
EGIT_REPO_URI="https://github.com/containers/buildah.git"
28+
else
29+
SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
30+
KEYWORDS="~amd64 ~arm64"
31+
fi
32+
33+
RDEPEND="
34+
systemd? ( sys-apps/systemd )
35+
btrfs? ( sys-fs/btrfs-progs )
36+
seccomp? ( sys-libs/libseccomp:= )
37+
apparmor? ( sys-libs/libapparmor:= )
38+
>=app-containers/containers-common-0.58.0-r1
39+
app-crypt/gpgme:=
40+
dev-libs/libgpg-error:=
41+
dev-libs/libassuan:=
42+
sys-apps/shadow:=
43+
"
44+
DEPEND="${RDEPEND}"
45+
BDEPEND="dev-go/go-md2man"
46+
47+
pkg_pretend() {
48+
local CONFIG_CHECK=""
49+
use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
50+
check_extra_config
51+
52+
linux_config_exists || ewarn "Cannot determine configuration of your kernel."
53+
}
54+
55+
src_prepare() {
56+
default
57+
58+
# ensure all necessary files are there
59+
local file
60+
for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
61+
hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
62+
[[ -f "${file}" ]] || die
63+
done
64+
65+
sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
66+
echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
67+
68+
cat <<-EOF > hack/apparmor_tag.sh || die
69+
#!/usr/bin/env bash
70+
$(usex apparmor 'echo apparmor' echo)
71+
EOF
72+
73+
use seccomp || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch"
74+
75+
cat <<-EOF > hack/systemd_tag.sh || die
76+
#!/usr/bin/env bash
77+
$(usex systemd 'echo systemd' echo)
78+
EOF
79+
80+
echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
81+
cat <<-EOF > btrfs_tag.sh || die
82+
#!/usr/bin/env bash
83+
$(usex btrfs echo 'echo exclude_graphdriver_btrfs')
84+
EOF
85+
86+
use test || eapply "${FILESDIR}/${PN}-1.40.1-disable-tests.patch"
87+
}
88+
89+
src_compile() {
90+
# For non-live versions, prevent git operations which causes sandbox violations
91+
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
92+
[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
93+
94+
tc-export AS LD STRIP
95+
export GOMD2MAN="$(command -v go-md2man)"
96+
export SELINUXOPT=
97+
default
98+
}
99+
100+
src_test() {
101+
emake test-unit
102+
}
103+
104+
src_install() {
105+
emake DESTDIR="${ED}" SELINUXOPT= install install.completions
106+
einstalldocs
107+
}

‎app-containers/buildah/buildah-9999.ebuild‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ src_prepare() {
8080
echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
8181
cat <<-EOF > btrfs_tag.sh || die
8282
#!/usr/bin/env bash
83-
$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
83+
$(usex btrfs echo 'echo exclude_graphdriver_btrfs')
8484
EOF
8585

86-
use test || eapply "${FILESDIR}/${PN}-1.38.0-disable-tests.patch"
86+
use test || eapply "${FILESDIR}/${PN}-1.40.1-disable-tests.patch"
8787
}
8888

8989
src_compile() {

‎app-containers/buildah/files/buildah-1.40.1-disable-tests.patch‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--- a/Makefile
2+
+++ b/Makefile
3+
@@ -56,1 +56,1 @@
4+
-all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial bin/dumpspec docs
5+
+all: bin/buildah docs
6+
@@ -122 +122 @@
7+
-docs: install.tools ## build the docs on the host
8+
+docs: ## build the docs on the host

0 commit comments

Comments
 (0)