c9183d3738
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system. Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
31 lines
1 KiB
Diff
31 lines
1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
Date: Sun, 6 Dec 2020 08:34:19 +0100
|
|
Subject: [PATCH] pkg-config: derive prefix from --prefix
|
|
|
|
Point prefix to the one configured, instead of `/usr` `systemd` has limited
|
|
support for making the pkgconfig prefix overridable, and interpolates those
|
|
values later down.
|
|
|
|
So we only need to patch this one value to get the correct paths.
|
|
See systemd/systemd@bc4e6e27922a2873985ab9367d79fb099f70b505 for details.
|
|
|
|
Co-Authored-By: Florian Klink <flokli@flokli.de>
|
|
---
|
|
src/core/systemd.pc.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
|
index 5932a21b5b..20bf8e316d 100644
|
|
--- a/src/core/systemd.pc.in
|
|
+++ b/src/core/systemd.pc.in
|
|
@@ -11,7 +11,7 @@
|
|
# considered deprecated (though there is no plan to remove them). New names
|
|
# shall have underscores.
|
|
|
|
-prefix=/usr
|
|
+prefix={{PREFIX}}
|
|
root_prefix={{ROOTPREFIX_NOSLASH}}
|
|
rootprefix=${root_prefix}
|
|
sysconf_dir={{SYSCONF_DIR}}
|