Skip to contentSkip to conversation

package/cryptsetup: fix tmpfiles.d setup

PATCH In review John Keeping 3 participants 3 messages Jun 14, 2021 – Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/cryptsetup/cryptsetup.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/cryptsetup/cryptsetup.mk +6 -0
index cd5883d0b4..eee84a7958 100644
@@ -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 += --with-tmpfilesdir=no
+endif
+
 HOST_CRYPTSETUP_DEPENDENCIES = \
 	host-pkgconf \
 	host-lvm2 \
Signature · 1 line
2.32.0
#1 lore raw

PATCH 1/1 package/cryptsetup: fix tmpfiles.d setup

Quoted 10 lines · On Mon, 14 Jun 2021 11:42:10 +0100 John Keeping <[email protected]> wrote:

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.

---
 package/cryptsetup/cryptsetup.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw
In reply to John Keeping
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"John" == John Keeping <[email protected]> writes:

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.

Committed to 2021.02.x and 2021.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot