summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2020-03-31 09:36:30 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2020-03-31 09:42:42 -0400
commit2753df2973c88a647c66918a2e89357f9ec2c0d7 (patch)
tree687814981359763e52449f7fb984ecd15a6c1a0d
parent9c7410d331ed6c9af50babb41314bfa67a3f39e0 (diff)
downloadpodman-2753df2973c88a647c66918a2e89357f9ec2c0d7.tar.gz
podman-2753df2973c88a647c66918a2e89357f9ec2c0d7.tar.bz2
podman-2753df2973c88a647c66918a2e89357f9ec2c0d7.zip
add systemd build tag to podman builds
Without the systemd build tag, podman will fail with the error "No support for journald logging". This commit adds the `systemd` build tag explicitly, rather than relying on `hack/systemd_tag.sh` (because we're building an rpm and we've explicitly included systemd-devel as a dependency). Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
-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 817be31b7..7ed0788f8 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 ./cmd/podman/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