opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 19:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use systemd/sd-daemon.h headers for systemd presence

Browse Source 
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>
This commit is contained in:
Chandan Kumar (raukadah)
2019-12-16 16:12:14 +05:30
parent 6c7b6d994a
commit b54c350a07
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,7 +45,7 @@ endif
ifeq (,$(findstring systemd,$(BUILDTAGS))) ifeq (,$(findstring systemd,$(BUILDTAGS)))
$(warning \ $(warning \
Podman is being compiled without the systemd build tag.\ 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 endif
BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay

1
contrib/build_rpm.sh
View File

@ -26,6 +26,7 @@ declare -a PKGS=(device-mapper-devel \
make \ make \
rpm-build \ rpm-build \
go-compilers-golang-compiler \ go-compilers-golang-compiler \
systemd-devel \
) )
if [[ $pkg_manager == *dnf ]]; then if [[ $pkg_manager == *dnf ]]; then

7
hack/systemd_tag.sh
View File

@ -1,4 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if pkg-config --exists libsystemd; then cc -E - > /dev/null 2> /dev/null << EOF
echo systemd #include <systemd/sd-daemon.h>
EOF
if test $? -eq 0 ; then
echo systemd
fi fi