Stanislav Brabec
a1436eef7b
(jsc#PED-8734, util-linux-lib-netlink.patch and util-linux-agetty-netlink.patch) and upstream fixes (util-linux-lib-netlink-fix1.patch, util-linux-lib-netlink-fix2.patch, util-linux-lib-netlink-fix3.patch and util-linux-agetty-netlink-fix4.patch). - Fix configs library use in agetty (replace util-linux-issuedir-usr-lib.patch by upstream util-linux-lib-configs-fix1.patch, add util-linux-lib-configs-fix2.patch, util-linux-lib-configs-fix3.patch, util-linux-lib-configs-fix4.patch, util-linux-lib-configs-fix5.patch and util-linux-lib-configs-fix6.patch). - Fix agetty erase of escape characters (relevant to bsc#1194818, util-linux-agetty-escape-erase.patch). - Own /usr/lib/issue.d directory. - Perform migration from issue-generator (jsc#PED-8734). - Drop util-linux-agetty-ssh-host-keys.patch. This feature is not used in MicroOS any more. - Remove Provides/Obsoletes for s390-32, upgrade from SLE11 SP1 is no more supported. OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=607
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From dc1e88ff93f40f2f8093fcf35bda615a9384edcd Mon Sep 17 00:00:00 2001
|
|
From: Karel Zak <kzak@redhat.com>
|
|
Date: Wed, 1 Oct 2025 14:39:01 +0200
|
|
Subject: [PATCH 5/8] build-sys: make sure _PATH_SYSCONFDIR is defined
|
|
|
|
The autotools and meson define $sysconfdir, but this variable is not
|
|
accessible for compiler. Fix it.
|
|
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
---
|
|
Makefile.am | 1 +
|
|
meson.build | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 01e99701d..dd78a5345 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
|
|
-DLOCALEDIR=\"$(localedir)\" \
|
|
-D_PATH_RUNSTATEDIR=\"${runstatedir}\" \
|
|
-D_PATH_LOCALSTATEDIR=\"${localstatedir}\" \
|
|
+ -D_PATH_SYSCONFDIR=\"${sysconfdir}\" \
|
|
-D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\"
|
|
|
|
if USE_VENDORDIR
|
|
diff --git a/meson.build b/meson.build
|
|
index c9d1e188e..cdaca47ee 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -73,6 +73,7 @@ conf.set('sysconfdir', sysconfdir)
|
|
conf.set('usrbin_execdir', usrbin_exec_dir)
|
|
conf.set('usrsbin_execdir', usrsbin_exec_dir)
|
|
conf.set('docdir', docdir)
|
|
+conf.set_quoted('_PATH_SYSCONFDIR', sysconfdir)
|
|
conf.set_quoted('_PATH_SYSCONFSTATICDIR', sysconfstaticdir)
|
|
conf.set_quoted('_PATH_RUNSTATEDIR', runstatedir)
|
|
conf.set_quoted('_PATH_LOCALSTATEDIR', localstatedir)
|
|
--
|
|
2.48.1
|
|
|