summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-31 22:37:15 +0200
committerGitHub <noreply@github.com>2020-03-31 22:37:15 +0200
commit4d6670421175c46682b0584b190734e3542350c0 (patch)
tree01befed556575805f846da0778b8a42db0a17ac7
parent6e8f6cab602b43d05c97c167faa56b3f46f1f73a (diff)
parent2753df2973c88a647c66918a2e89357f9ec2c0d7 (diff)
downloadpodman-4d6670421175c46682b0584b190734e3542350c0.tar.gz
podman-4d6670421175c46682b0584b190734e3542350c0.tar.bz2
podman-4d6670421175c46682b0584b190734e3542350c0.zip
Merge pull request #5683 from larsks/bug/rpm-systemd-tag
add systemd build tag to podman builds
-rw-r--r--contrib/spec/podman.spec.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 17adf9672..9641a52e6 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -392,7 +392,7 @@ popd
ln -s vendor src
export GO111MODULE=off
export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath}
-export BUILDTAGS="varlink selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper"
+export BUILDTAGS="varlink selinux seccomp systemd $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper"
GOPATH=$GOPATH go generate ./pkg/varlink/...
@@ -410,7 +410,7 @@ mkdir -p src/%{provider}.%{provider_tld}/{containers,opencontainers}
ln -s $(dirs +1 -l) src/%{import_path_conmon}
popd
-export BUILDTAGS="selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh)"
+export BUILDTAGS="selinux seccomp systemd $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh)"
BUILDTAGS=$BUILDTAGS make
popd