SHA256
1
0
forked from pool/buildah

Accepting request 633279 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/633279
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/buildah?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2018-09-05 11:50:04 +00:00 committed by Git OBS Bridge
parent 39f9a00e48
commit f586006f22
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 5 07:47:01 UTC 2018 - Valentin Rothberg <vrothberg@suse.com>
- Set the correct commit for `buildah version`.
- Set the cnilib version for `buildah version`.
-------------------------------------------------------------------
Mon Aug 6 06:17:06 UTC 2018 - vrothberg@suse.com

View File

@ -16,7 +16,7 @@
#
%define commmit fbf46d33c4e01199281c7a69e68605ec7d611fd3
%define commit fbf46d33c4e01199281c7a69e68605ec7d611fd3
%define project github.com/projectatomic/buildah
# Build with libostree-devel in Tumbleweed, Leap 15 and SLES 15
%if 0%{?suse_version} >= 1500
@ -87,10 +87,11 @@ echo "Compiling without libostree support"
export BUILDTAGS="seccomp apparmor containers_image_ostree_stub"
%endif
export CNIVersion=`sed -e '\,github.com/containernetworking/cni, !d' -e 's,.* ,,g' vendor.conf`
# Build buildah
go build -tags "$BUILDTAGS" \
-buildmode=pie \
-ldflags '-s -w -X main.gitCommit=%{commit} -X main.buildInfo='$SOURCE_DATE_EPOCH'' \
-ldflags '-s -w -X main.gitCommit=%{commit} -X main.buildInfo='$SOURCE_DATE_EPOCH' -X main.cniVersion='$CNIVersion'' \
-o bin/buildah \
%{project}/cmd/buildah