commit: a1f0df96c405138b0625c5dc825c08e66cd24c42 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Mon Jul 7 12:44:46 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Jul 8 03:51:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f0df96
app-containers/buildah: update to 1.40.1 btrfs_noversion buildtag is no longer effective https://github.com/containers/storage/pull/2308 Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> From: https://github.com/gentoo/gentoo/pull/42919 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-containers/buildah/Manifest | 1 + .../buildah/{buildah-9999.ebuild => buildah-1.40.1.ebuild} | 4 ++-- app-containers/buildah/buildah-9999.ebuild | 4 ++-- app-containers/buildah/files/buildah-1.40.1-disable-tests.patch | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest index fe79e73dd755..51c5831a2bf4 100644 --- a/app-containers/buildah/Manifest +++ b/app-containers/buildah/Manifest @@ -1,3 +1,4 @@ DIST buildah-1.38.1.tar.gz 18550893 BLAKE2B 6342f70b75e1633bea2bc1902b1c4815799e3f8ed867a1c1df2e8fe0e016c16a4f94e1947ff073a0a079b55d047996cc7e89d78c1602b4642b525dcbb3ca59f3 SHA512 3c4738c4d30bece590da1de3ec8879e75d197bb18a1377264cf74f034574f46e27109842503aab0b98b1fd69f8762a13e80b1bd8522c5e3782ac0c451a07c3d8 DIST buildah-1.39.4.tar.gz 18657348 BLAKE2B 470767805ea5d2140da092aaaf0d55a78d32d1bc1bb14f3a1e6da0a751f8618b29e7d01f25c745234cee734ef4299ad442ea42e1326e186cdd9e6834152c9571 SHA512 c721660f94010a0dc8b01502db565b486c53962ee1933e03dd2297cf5d30ac9edef6c92491f41c8c61bee946302e7a39ecff55b2ad3e34ed649222c9655262c2 DIST buildah-1.40.0.tar.gz 12321438 BLAKE2B 3d923ddd249fd93476a8e88b72b1989b4bead9b282657d372c2aa04da0d787ee8e807cb74bface8a165ae0282ead791eb3da20a73751b63e3cfe7ee6ab34bd94 SHA512 bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311 +DIST buildah-1.40.1.tar.gz 12329760 BLAKE2B dd5be8e27be8c37b211dd3009d8533f44d234ef6bc8f5405a258931b51f0b79a1b5dc456e3e0269ca9b4c4e981c226c97ff51876ae2f1836bc16c974838f5615 SHA512 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-1.40.1.ebuild similarity index 94% copy from app-containers/buildah/buildah-9999.ebuild copy to app-containers/buildah/buildah-1.40.1.ebuild index cfc7fb8a64b1..5418098db860 100644 --- a/app-containers/buildah/buildah-9999.ebuild +++ b/app-containers/buildah/buildah-1.40.1.ebuild @@ -80,10 +80,10 @@ src_prepare() { echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die cat <<-EOF > btrfs_tag.sh || die #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') + $(usex btrfs echo 'echo exclude_graphdriver_btrfs') EOF - use test || eapply "${FILESDIR}/${PN}-1.38.0-disable-tests.patch" + use test || eapply "${FILESDIR}/${PN}-1.40.1-disable-tests.patch" } src_compile() { diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild index cfc7fb8a64b1..5418098db860 100644 --- a/app-containers/buildah/buildah-9999.ebuild +++ b/app-containers/buildah/buildah-9999.ebuild @@ -80,10 +80,10 @@ src_prepare() { echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die cat <<-EOF > btrfs_tag.sh || die #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') + $(usex btrfs echo 'echo exclude_graphdriver_btrfs') EOF - use test || eapply "${FILESDIR}/${PN}-1.38.0-disable-tests.patch" + use test || eapply "${FILESDIR}/${PN}-1.40.1-disable-tests.patch" } src_compile() { diff --git a/app-containers/buildah/files/buildah-1.40.1-disable-tests.patch b/app-containers/buildah/files/buildah-1.40.1-disable-tests.patch new file mode 100644 index 000000000000..bde0d1648b58 --- /dev/null +++ b/app-containers/buildah/files/buildah-1.40.1-disable-tests.patch @@ -0,0 +1,8 @@ +--- a/Makefile ++++ b/Makefile +@@ -56,1 +56,1 @@ +-all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial bin/dumpspec docs ++all: bin/buildah docs +@@ -122 +122 @@ +-docs: install.tools ## build the docs on the host ++docs: ## build the docs on the host
