diff options
Diffstat (limited to 'app-containers/buildah')
| -rw-r--r-- | app-containers/buildah/Manifest | 7 | ||||
| -rw-r--r-- | app-containers/buildah/buildah-1.33.1.ebuild | 3 | ||||
| -rw-r--r-- | app-containers/buildah/buildah-1.33.2.ebuild | 128 | ||||
| -rw-r--r-- | app-containers/buildah/buildah-9999.ebuild | 1 | ||||
| -rw-r--r-- | app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch | 44 |
5 files changed, 181 insertions, 2 deletions
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest index 528d45908fd8..9b35c74579c2 100644 --- a/app-containers/buildah/Manifest +++ b/app-containers/buildah/Manifest @@ -1,8 +1,11 @@ +AUX fix-non-amd64-build-1.33.2.patch 1501 BLAKE2B 2b103c6601cd3359e248396fe7029c8399f9fe54c167ae242280498fe50d1881bb4f6be1a8ab262a5b3ca1c238125b8e203bc2c4a0fdc556cc1c3810b21ecb5b SHA512 c1e2bcc382c1c451df5da9c4d3b763e3b7f4a7472c46954d98cc935c05bb8da28a4dc3e748f6c1c33ac05500fc295321edf445ea251ff7b56b64ff43f80f4cc7 DIST buildah-1.30.0.tar.gz 15623786 BLAKE2B e0b2f6d26827cfe40f88a9915f12b6acb385fbd576fa227d4fee02c162077e9c6fe0591c7171405f5645cd06e4068f26e17c2cb963898e38cfbdd61abe68dae2 SHA512 185fd98a59fa8d86fe9f1eadc9b7591e5053674464be10538a7581d8e1f6a25e5032a354c821c32a167e2864acea010243efbbe4f5a4205d8eaa2894f062a25b DIST buildah-1.32.2.tar.gz 18451694 BLAKE2B 885b940e804394d18451e5dce3e3af4097a8adf01e59d7a288dda7063a888759abd9a5c18d8f4522709c7d296fc9a2b5d61229143f3545a786dc59ac837214e2 SHA512 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1 DIST buildah-1.33.1.tar.gz 18635429 BLAKE2B 93883b02e6b790c029b03dd3ebb5f0d7c8e184989c987034cd429ea804d17b275a2b81c9f37bbaff1a54367bb93a9b0870af86293aa0332c3ccac1bbb6a750fe SHA512 4abab105f6b242dc38e443b53b6c0c90fd7897bceb6b491fd067cd56767616a3df4005bc0bd0d10f217df2e6716cf950d8662788b110929a826660f29516703e +DIST buildah-1.33.2.tar.gz 18580150 BLAKE2B 523b75974a27695bbf818f4a1499d15e48e254934549f2ae191f462334aa4dd34a60c82b78b0d3351e05b297a40a8f8e2df94e75d22779a5c042dbd3dd307e4a SHA512 574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32 EBUILD buildah-1.30.0.ebuild 1196 BLAKE2B eefce023ce7e2662b1598fb3f6d5b885816d54a6397a788e10851b7ccc174ae6d9e4fa4ec387d3a21a7fdff4670ee68bfb59e9171e76032c3c28882d164cc446 SHA512 3c139484015e3e85c8f891babb375c560c3fc3e1827a44862eb262f95b8654a2c8d2a3c4102d3081c3a3677f20c0c5371a6579e9c0e1adfa339e5198475c357b EBUILD buildah-1.32.2.ebuild 2916 BLAKE2B cb1f1303a4fa575efe0cb997081e6fa3d0d5de9d92fbc01b275adcb02a0e2fada75a095b63a15dd25f11d29db6c06b63352c50e9b19e95fbe4f22f56e0a8622d SHA512 c40613b2003eaea9983fbfbb648be24f009e2f854fadd784db4a8633871f26dbc8863f5f1ac4be4d6f942031c8e7f24bd663911869205639cfb3c99e992b13d5 -EBUILD buildah-1.33.1.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a -EBUILD buildah-9999.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a +EBUILD buildah-1.33.1.ebuild 2969 BLAKE2B 66ed4c6dc4b0f221b599219ce6b8f921db416befb0d0ce7009cedae3a798e49baabd381402cef9f294733888d47c03dc7fbc7144ed761fad633bf83f1c853453 SHA512 d4e572bbd3a54fb26c4b35e0127498610c83c5945e8f87f843b63376b62b81e797244987fc393d86fbf2992c746c1910941649e5963e9d5b5dab52219f3e7b84 +EBUILD buildah-1.33.2.ebuild 2970 BLAKE2B a0fcc79cd1cc18807a53204f5c1212a3ff64603b4799cafd4ae73d7301f977e2cda942b1e894ee4853ef77e0892822c9edb744bc4bcb88cfb0ca160902265272 SHA512 8600cb37fbccbd5d39f9cfa3d3213a5705367808b04b6308869c336279993fff5c5347d5af0aa66a9e4912e6be8151491df5a00e255b99b3b95460c25c53b2a7 +EBUILD buildah-9999.ebuild 2910 BLAKE2B 5404bfec930d2b0867255f716d91ce2925be49ea07a79343670d4400eb323dc0b552ff5792d63d839e0b1b1cc4b6daaab701e568f1c5a81328233ddb8e637010 SHA512 c4c7a4cce89ac13185f05c401eec0b895875baf0e38d9a077357d9bef9d749edb59cf020cd68149eea77fddcb89e8464769ef3d000ded2bcdc6af03fc36fd06e MISC metadata.xml 718 BLAKE2B 8a075660ff80fd4dddf223b5f5fbe42b1d32febfbd67cd6e52bc750958209d4b24c6f42e62e65d3efa771eb171378f4a869ce20566b2d9abae03546c149c6351 SHA512 cad4369d24640e41ccc6427260733681631cef23250fd6f5fe2e50af778ca0cae31cb7b4498f24e08e0ad1051340b801f18f4da035850172bb15e34fe6ae8e16 diff --git a/app-containers/buildah/buildah-1.33.1.ebuild b/app-containers/buildah/buildah-1.33.1.ebuild index 09a8f30b55b0..bcda107b9f6c 100644 --- a/app-containers/buildah/buildah-1.33.1.ebuild +++ b/app-containers/buildah/buildah-1.33.1.ebuild @@ -43,6 +43,9 @@ RDEPEND=" sys-apps/shadow:= " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/fix-non-amd64-build-1.33.2.patch +) pkg_pretend() { local CONFIG_CHECK="" diff --git a/app-containers/buildah/buildah-1.33.2.ebuild b/app-containers/buildah/buildah-1.33.2.ebuild new file mode 100644 index 000000000000..ce382bf95dfe --- /dev/null +++ b/app-containers/buildah/buildah-1.33.2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module linux-info + +DESCRIPTION="A tool that facilitates building OCI images" +HOMEPAGE="https://github.com/containers/buildah" + +# main pkg +LICENSE="Apache-2.0" +# deps +LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" + +SLOT="0" +IUSE="apparmor btrfs +seccomp systemd doc test" +RESTRICT="test" +EXTRA_DOCS=( + "CHANGELOG.md" + "CONTRIBUTING.md" + "install.md" + "troubleshooting.md" + "docs/tutorials" +) + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/buildah.git" +else + SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +RDEPEND=" + systemd? ( sys-apps/systemd ) + btrfs? ( sys-fs/btrfs-progs ) + seccomp? ( sys-libs/libseccomp:= ) + apparmor? ( sys-libs/libapparmor:= ) + app-containers/containers-common + app-crypt/gpgme:= + dev-libs/libgpg-error:= + dev-libs/libassuan:= + sys-apps/shadow:= +" +DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/fix-non-amd64-build-1.33.2.patch +) + +pkg_pretend() { + local CONFIG_CHECK="" + use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" + check_extra_config + + linux_config_exists || ewarn "Cannot determine configuration of your kernel." +} + +src_prepare() { + default + + # ensure all necessary files are there + local file + for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ + hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do + [[ -f "${file}" ]] || die + done + + sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die + echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die + + cat <<-EOF > hack/apparmor_tag.sh || die + #!/usr/bin/env bash + $(usex apparmor 'echo apparmor' echo) + EOF + + use seccomp || { + cat <<-'EOF' > "${T}/disable_seccomp.patch" + --- a/Makefile + +++ b/Makefile + @@ -5 +5 @@ + -SECURITYTAGS ?= seccomp $(APPARMORTAG) + +SECURITYTAGS ?= $(APPARMORTAG) + EOF + eapply "${T}/disable_seccomp.patch" || die + } + + cat <<-EOF > hack/systemd_tag.sh || die + #!/usr/bin/env bash + $(usex systemd 'echo systemd' echo) + EOF + + 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') + EOF + + use test || { + cat <<-'EOF' > "${T}/disable_tests.patch" + --- a/Makefile + +++ b/Makefile + @@ -54 +54 @@ + -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs + +all: bin/buildah docs + EOF + eapply "${T}/disable_tests.patch" || die + } + +} + +src_compile() { + # For non-live versions, prevent git operations which causes sandbox violations + # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 + [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" + + default +} + +src_test() { + emake test-unit +} + +src_install() { + emake DESTDIR="${ED}" install install.completions + einstalldocs + use doc && dodoc -r "${EXTRA_DOCS[@]}" +} diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild index 09a8f30b55b0..4b4a54c71ba9 100644 --- a/app-containers/buildah/buildah-9999.ebuild +++ b/app-containers/buildah/buildah-9999.ebuild @@ -7,6 +7,7 @@ inherit go-module linux-info DESCRIPTION="A tool that facilitates building OCI images" HOMEPAGE="https://github.com/containers/buildah" + # main pkg LICENSE="Apache-2.0" # deps diff --git a/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch b/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch new file mode 100644 index 000000000000..51ba7df1aa90 --- /dev/null +++ b/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch @@ -0,0 +1,44 @@ +From 12b205f69876bf09bb6dfe03adcdefad5d4ee9f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com> +Date: Mon, 20 Nov 2023 09:28:06 +0100 +Subject: [PATCH] Remove makefile targets entrypoint{,.gz} for non x86_64 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://github.com/containers/buildah/pull/5183 +The target internal/mkcw/embed/entrypoint is only built on x86_64, but +internal/mkcw/embed/entrypoint.gz is run on all arches. This causes build +failures on anything non x86_64 as internal/mkcw/embed/entrypoint is not build. + +Signed-off-by: Dan Čermák <dcermak@suse.com> +--- + Makefile | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 85b43c7b9e..0fda9ae6eb 100644 +--- a/Makefile ++++ b/Makefile +@@ -73,17 +73,16 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz + $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah + + ifneq ($(shell as --version | grep x86_64),) ++internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint ++ $(RM) $@ ++ gzip -k $^ ++ + internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s + $(AS) -o $(patsubst %.s,%.o,$^) $^ + $(LD) -o $@ $(patsubst %.s,%.o,$^) + strip $@ +-else +-.PHONY: internal/mkcw/embed/entrypoint + endif + +-internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint +- $(RM) $@ +- gzip -k $^ + + .PHONY: buildah + buildah: bin/buildah |