From e35bea72573aaa8f427b07283dd8684dd536b140 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 31 May 2019 07:48:00 +0000 Subject: [PATCH] buildah: use registries.conf from containers.image --- srcpkgs/buildah/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template index dde0990be2..7355e1fa98 100644 --- a/srcpkgs/buildah/template +++ b/srcpkgs/buildah/template @@ -1,7 +1,7 @@ # Template file for 'buildah' pkgname=buildah version=1.8.2 -revision=1 +revision=2 build_style=go go_import_path=github.com/containers/buildah go_package="${go_import_path}/cmd/buildah" @@ -9,25 +9,20 @@ go_build_tags=containers_image_ostree_stub hostmakedepends="pkg-config go-md2man" makedepends="libostree-devel libbtrfs-devel device-mapper-devel gpgme-devel libassuan-devel libseccomp-devel" -depends="runc skopeo" -short_desc="OCI image building tool" -maintainer="Cameron Nemo " +depends="runc skopeo containers.image" +short_desc="Dockerfile compatible OCI image building tool" +maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/containers/buildah" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=2a659687210fd1219c73e2d35e87caadb9e06f12e08973c18058d073fe8ecfb7 -case "$XBPS_TARGET_ARCH" in - *-musl) broken="/lib/libmount.so.1: undefined reference to getrandom" ;; -esac - post_build() { make -C docs } post_install() { vinstall contrib/completions/bash/buildah 644 /usr/share/bash-completion/completions - vinstall tests/registries.conf 644 /etc/containers for _i in docs/*.1; do vman $_i done