* [OE-Core][PATCH 1/4] systemd: use nonarch libdir for tmpfiles.d
2023-11-14 11:00 [OE-Core][PATCH 0/4] tmpfiles.d: use nonarch libdir lukas.funke-oss
@ 2023-11-14 11:00 ` lukas.funke-oss
2023-11-14 11:10 ` Jose Quaresma
2023-11-14 11:00 ` [OE-Core][PATCH 2/4] pam: " lukas.funke-oss
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: lukas.funke-oss @ 2023-11-14 11:00 UTC (permalink / raw)
To: openembedded-core; +Cc: Malte Schmidt, Stefan Herbrechtsmeier
From: Malte Schmidt <malte.schmidt@weidmueller.com>
The documentation of systemd states that /etc/tmpfiles.d should be
reserved for the local administrator and packages should put their files
in /usr/lib/tmpfiles.d [1].
[1] https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
Signed-off-by: Malte Schmidt <malte.schmidt@weidmueller.com>
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
---
meta/recipes-core/systemd/systemd_254.4.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
index cc0e29fdd2..48d467dfdd 100644
--- a/meta/recipes-core/systemd/systemd_254.4.bb
+++ b/meta/recipes-core/systemd/systemd_254.4.bb
@@ -282,12 +282,12 @@ do_install() {
[ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
install -d ${D}${sysconfdir}/udev/rules.d/
- install -d ${D}${sysconfdir}/tmpfiles.d
+ install -d ${D}${exec_prefix}/lib/tmpfiles.d
for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do
install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/
done
- install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
+ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${exec_prefix}/lib/tmpfiles.d/
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
install -d ${D}${sysconfdir}/init.d
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [OE-Core][PATCH 1/4] systemd: use nonarch libdir for tmpfiles.d
2023-11-14 11:00 ` [OE-Core][PATCH 1/4] systemd: use nonarch libdir for tmpfiles.d lukas.funke-oss
@ 2023-11-14 11:10 ` Jose Quaresma
0 siblings, 0 replies; 6+ messages in thread
From: Jose Quaresma @ 2023-11-14 11:10 UTC (permalink / raw)
To: Lukas Funke; +Cc: openembedded-core, Malte Schmidt, Stefan Herbrechtsmeier
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
Lukas Funke <lukas.funke-oss@weidmueller.com> escreveu no dia terça,
14/11/2023 à(s) 11:00:
> From: Malte Schmidt <malte.schmidt@weidmueller.com>
>
> The documentation of systemd states that /etc/tmpfiles.d should be
> reserved for the local administrator and packages should put their files
> in /usr/lib/tmpfiles.d [1].
>
> [1] https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
>
> Signed-off-by: Malte Schmidt <malte.schmidt@weidmueller.com>
> Signed-off-by: Stefan Herbrechtsmeier <
> stefan.herbrechtsmeier@weidmueller.com>
> ---
> meta/recipes-core/systemd/systemd_254.4.bb | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_254.4.bb
> b/meta/recipes-core/systemd/systemd_254.4.bb
> index cc0e29fdd2..48d467dfdd 100644
> --- a/meta/recipes-core/systemd/systemd_254.4.bb
> +++ b/meta/recipes-core/systemd/systemd_254.4.bb
> @@ -282,12 +282,12 @@ do_install() {
> [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s
> ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
>
> install -d ${D}${sysconfdir}/udev/rules.d/
> - install -d ${D}${sysconfdir}/tmpfiles.d
> + install -d ${D}${exec_prefix}/lib/tmpfiles.d
for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules");
> do
> install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/
> done
>
> - install -m 0644 ${WORKDIR}/00-create-volatile.conf
> ${D}${sysconfdir}/tmpfiles.d/
> + install -m 0644 ${WORKDIR}/00-create-volatile.conf
> ${D}${exec_prefix}/lib/tmpfiles.d/
>
> if
> ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
> install -d ${D}${sysconfdir}/init.d
> --
> 2.30.2
>
>
Hi Lukas,
Why not ${nonarch_libdir} instead of ${exec_prefix}/lib as in all the other
patches in this series?
Jose
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#190493):
> https://lists.openembedded.org/g/openembedded-core/message/190493
> Mute This Topic: https://lists.openembedded.org/mt/102581153/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
Best regards,
José Quaresma
[-- Attachment #2: Type: text/html, Size: 4534 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [OE-Core][PATCH 2/4] pam: use nonarch libdir for tmpfiles.d
2023-11-14 11:00 [OE-Core][PATCH 0/4] tmpfiles.d: use nonarch libdir lukas.funke-oss
2023-11-14 11:00 ` [OE-Core][PATCH 1/4] systemd: use nonarch libdir for tmpfiles.d lukas.funke-oss
@ 2023-11-14 11:00 ` lukas.funke-oss
2023-11-14 11:00 ` [OE-Core][PATCH 3/4] sysstat: " lukas.funke-oss
2023-11-14 11:00 ` [OE-Core][PATCH 4/4] glibc: " lukas.funke-oss
3 siblings, 0 replies; 6+ messages in thread
From: lukas.funke-oss @ 2023-11-14 11:00 UTC (permalink / raw)
To: openembedded-core; +Cc: Malte Schmidt, Stefan Herbrechtsmeier
From: Malte Schmidt <malte.schmidt@weidmueller.com>
The documentation of systemd states that /etc/tmpfiles.d should be
reserved for the local administrator and packages should put their files
in /usr/lib/tmpfiles.d [1].
[1] https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
Signed-off-by: Malte Schmidt <malte.schmidt@weidmueller.com>
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
---
meta/recipes-extended/pam/libpam_1.5.3.bb | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/pam/libpam_1.5.3.bb b/meta/recipes-extended/pam/libpam_1.5.3.bb
index 1aa307af4d..7af3ea99d1 100644
--- a/meta/recipes-extended/pam/libpam_1.5.3.bb
+++ b/meta/recipes-extended/pam/libpam_1.5.3.bb
@@ -49,7 +49,10 @@ PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit,"
PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db,"
PACKAGES += "${PN}-runtime ${PN}-xtests"
-FILES:${PN} = "${base_libdir}/lib*${SOLIBS}"
+FILES:${PN} = " \
+ ${base_libdir}/lib*${SOLIBS} \
+ ${nonarch_libdir}/tmpfiles.d/*.conf \
+"
FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}"
FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}"
FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests"
@@ -130,9 +133,9 @@ do_install() {
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then
rm -rf ${D}${sysconfdir}/init.d/
rm -rf ${D}${sysconfdir}/rc*
- install -d ${D}${sysconfdir}/tmpfiles.d
+ install -d ${D}${nonarch_libdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/pam-volatiles.conf \
- ${D}${sysconfdir}/tmpfiles.d/pam.conf
+ ${D}${nonarch_libdir}/tmpfiles.d/pam.conf
else
install -d ${D}${sysconfdir}/default/volatiles
install -m 0644 ${WORKDIR}/99_pam \
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [OE-Core][PATCH 3/4] sysstat: use nonarch libdir for tmpfiles.d
2023-11-14 11:00 [OE-Core][PATCH 0/4] tmpfiles.d: use nonarch libdir lukas.funke-oss
2023-11-14 11:00 ` [OE-Core][PATCH 1/4] systemd: use nonarch libdir for tmpfiles.d lukas.funke-oss
2023-11-14 11:00 ` [OE-Core][PATCH 2/4] pam: " lukas.funke-oss
@ 2023-11-14 11:00 ` lukas.funke-oss
2023-11-14 11:00 ` [OE-Core][PATCH 4/4] glibc: " lukas.funke-oss
3 siblings, 0 replies; 6+ messages in thread
From: lukas.funke-oss @ 2023-11-14 11:00 UTC (permalink / raw)
To: openembedded-core; +Cc: Malte Schmidt, Stefan Herbrechtsmeier
From: Malte Schmidt <malte.schmidt@weidmueller.com>
The documentation of systemd states that /etc/tmpfiles.d should be
reserved for the local administrator and packages should put their files
in /usr/lib/tmpfiles.d [1].
[1] https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
Signed-off-by: Malte Schmidt <malte.schmidt@weidmueller.com>
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
---
meta/recipes-extended/sysstat/sysstat_12.7.4.bb | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.4.bb b/meta/recipes-extended/sysstat/sysstat_12.7.4.bb
index 134fd5cf96..660bc634a0 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.7.4.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.7.4.bb
@@ -48,9 +48,9 @@ do_install() {
install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
fi
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -d ${D}${sysconfdir}/tmpfiles.d
+ install -d ${D}${nonarch_libdir}/tmpfiles.d
echo "d ${localstatedir}/log/sa - - - -" \
- > ${D}${sysconfdir}/tmpfiles.d/sysstat.conf
+ > ${D}${nonarch_libdir}/tmpfiles.d/sysstat.conf
# Unless both cron and systemd are enabled, install our own
# systemd unit file. Otherwise the package will install one.
@@ -70,7 +70,11 @@ pkg_postinst:${PN} () {
fi
}
-FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd"
+FILES:${PN} += " \
+ ${systemd_system_unitdir} \
+ ${nonarch_base_libdir}/systemd \
+ ${nonarch_libdir}/tmpfiles.d \
+"
TARGET_CC_ARCH += "${LDFLAGS}"
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [OE-Core][PATCH 4/4] glibc: use nonarch libdir for tmpfiles.d
2023-11-14 11:00 [OE-Core][PATCH 0/4] tmpfiles.d: use nonarch libdir lukas.funke-oss
` (2 preceding siblings ...)
2023-11-14 11:00 ` [OE-Core][PATCH 3/4] sysstat: " lukas.funke-oss
@ 2023-11-14 11:00 ` lukas.funke-oss
3 siblings, 0 replies; 6+ messages in thread
From: lukas.funke-oss @ 2023-11-14 11:00 UTC (permalink / raw)
To: openembedded-core; +Cc: Stefan Herbrechtsmeier
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
The documentation of systemd states that /etc/tmpfiles.d should be
reserved for the local administrator and packages should put their files
in /usr/lib/tmpfiles.d [1].
[1] https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
---
meta/recipes-core/glibc/glibc-package.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 1d4e4c5274..1ef987be0a 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -42,7 +42,7 @@ FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
RDEPENDS:${PN}-dev = "linux-libc-headers-dev"
FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
-FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
+FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \
${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd"
FILES:${PN}-mtrace = "${bindir}/mtrace"
FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump"
@@ -132,9 +132,9 @@ def get_libc_fpu_setting(bb, d):
do_install:append:class-target() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -d ${D}${sysconfdir}/tmpfiles.d
+ install -d ${D}${nonarch_libdir}/tmpfiles.d
echo "d /run/nscd 755 root root -" \
- > ${D}${sysconfdir}/tmpfiles.d/nscd.conf
+ > ${D}${nonarch_libdir}/tmpfiles.d/nscd.conf
fi
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
@@ -280,7 +280,7 @@ python populate_packages:prepend () {
pkg_postinst:nscd () {
if [ -z "$D" ]; then
if command -v systemd-tmpfiles >/dev/null; then
- systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf
+ systemd-tmpfiles --create ${nonarch_libdir}/tmpfiles.d/nscd.conf
elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
${sysconfdir}/init.d/populate-volatile.sh update
fi
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread