diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-13 13:31:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 13:31:13 +0100 |
| commit | 22849ff43d115f420a194bad7ace20b35eeec6b1 (patch) | |
| tree | 1524a28b78af843eba89867301267d802f8c7594 | |
| parent | 71a0c0f69c992a1840a28201526b211f9055b1b6 (diff) | |
| parent | 5f6eea8a54cd8f87740813642f7d0f7e88725688 (diff) | |
| download | podman-22849ff43d115f420a194bad7ace20b35eeec6b1.tar.gz podman-22849ff43d115f420a194bad7ace20b35eeec6b1.tar.bz2 podman-22849ff43d115f420a194bad7ace20b35eeec6b1.zip | |
Merge pull request #4682 from raukadah/hackpath
Fixed the path of hack scripts in spec file
| -rw-r--r-- | contrib/spec/podman.spec.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 2b9621dbc..9676a3fb4 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -22,6 +22,9 @@ %define gobuild(o:) go build -tags="$BUILDTAGS" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; #% endif +# libpod hack directory +%define hackdir %{_builddir}/%{repo}-%{shortcommit0} + %global provider github %global provider_tld com %global project containers @@ -384,7 +387,7 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) exclude_graphdriver_devicemapper" +export BUILDTAGS="varlink selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper" GOPATH=$GOPATH go generate ./cmd/podman/varlink/... @@ -402,7 +405,7 @@ mkdir -p src/%{provider}.%{provider_tld}/{containers,opencontainers} ln -s $(dirs +1 -l) src/%{import_path_conmon} popd -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" +export BUILDTAGS="selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh)" BUILDTAGS=$BUILDTAGS make popd |