From a2e93a802cbdbcd42b504c26596a076fbc4c86d1 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Mon, 14 Jun 2021 11:42:10 +0100 Subject: [PATCH] package/cryptsetup: fix tmpfiles.d setup The configure script uses pkg-config to detect the location of tmpfiles.d but imposes an unspecified ordering dependency with systemd. Instead of relying on systemd being built before cryptsetup, set the directory path explcitly, and ensure it is not set when systemd-tmpfiles is disabled. Signed-off-by: John Keeping Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index cd5883d0b4..b816dc2f22 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -33,6 +33,12 @@ else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif +ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) +CRYPTSETUP_CONF_OPTS += --with-tmpfilesdir=/usr/lib/tmpfiles.d +else +CRYPTSETUP_CONF_OPTS += --without-tmpfilesdir +endif + HOST_CRYPTSETUP_DEPENDENCIES = \ host-pkgconf \ host-lvm2 \ -- 2.30.2