diff options
| author | Chandan Kumar (raukadah) <raukadah@gmail.com> | 2019-12-16 16:12:14 +0530 |
|---|---|---|
| committer | Chandan Kumar (raukadah) <raukadah@gmail.com> | 2019-12-16 20:37:15 +0530 |
| commit | b54c350a0771579444bccbc0dc7795d0bd176413 (patch) | |
| tree | 5cac22ca4d0ff325662a7713381c187a7c00ae4d | |
| parent | 6c7b6d994acddee0d50cec9bbe45fb4cb720a08d (diff) | |
| download | podman-b54c350a0771579444bccbc0dc7795d0bd176413.tar.gz podman-b54c350a0771579444bccbc0dc7795d0bd176413.tar.bz2 podman-b54c350a0771579444bccbc0dc7795d0bd176413.zip | |
Use systemd/sd-daemon.h headers for systemd presence
Finding systemd devel packages using libsystemd does not work as
in RHEL based distro the package name is systemd-devel and for
deb/ubunutu it is libsystemd. It is also giving false result when
podman rpm is built with systemd but hack/systemd_tag.sh does not
return anything.
Install systemd-devel package in build_rpm.sh script
Moving to systemd/sd-daemon.h header files which comes from devel
packages fixes the issue.
Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | contrib/build_rpm.sh | 1 | ||||
| -rwxr-xr-x | hack/systemd_tag.sh | 7 |
3 files changed, 7 insertions, 3 deletions
@@ -45,7 +45,7 @@ endif ifeq (,$(findstring systemd,$(BUILDTAGS))) $(warning \ Podman is being compiled without the systemd build tag.\ - Install libsystemd for journald support) + Install libsystemd on Ubuntu or systemd-devel on rpm based distro for journald support) endif BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index e41763fa7..088d8b7a5 100755 --- a/contrib/build_rpm.sh +++ b/contrib/build_rpm.sh @@ -26,6 +26,7 @@ declare -a PKGS=(device-mapper-devel \ make \ rpm-build \ go-compilers-golang-compiler \ + systemd-devel \ ) if [[ $pkg_manager == *dnf ]]; then diff --git a/hack/systemd_tag.sh b/hack/systemd_tag.sh index c59cad559..19a7bf6a6 100755 --- a/hack/systemd_tag.sh +++ b/hack/systemd_tag.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash -if pkg-config --exists libsystemd; then - echo systemd +cc -E - > /dev/null 2> /dev/null << EOF +#include <systemd/sd-daemon.h> +EOF +if test $? -eq 0 ; then + echo systemd fi |