From f586006f2232a0df891936201bee324e1933ccfc9b17bed5bdb26e5386e4c45a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 5 Sep 2018 11:50:04 +0000 Subject: [PATCH] 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 --- buildah.changes | 6 ++++++ buildah.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/buildah.changes b/buildah.changes index ec88ba2..67d6670 100644 --- a/buildah.changes +++ b/buildah.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 5 07:47:01 UTC 2018 - Valentin Rothberg + +- 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 diff --git a/buildah.spec b/buildah.spec index d360577..6dbd3ee 100644 --- a/buildah.spec +++ b/buildah.spec @@ -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