diff options
author | Malte Schmidt <malte.schmidt@weidmueller.com> | 2023-11-16 12:54:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-20 15:30:52 +0000 |
commit | f1350f189692eb1c23d7d14a08c106ad0505b2b2 (patch) | |
tree | 6e89510414918c1ea91b7e586e09e7a0ef96a564 | |
parent | 12da590768b9e51a66f425c07fbef266a0115395 (diff) | |
download | poky-f1350f189692eb1c23d7d14a08c106ad0505b2b2.tar.gz |
pam: use nonarch libdir for tmpfiles.d
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
(From OE-Core rev: 0a1d791e47b71b14c3dd7f41fc175c2aafacd392)
Signed-off-by: Malte Schmidt <malte.schmidt@weidmueller.com>
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Lukas Funke <lukas.funke@weidmueller.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.3.bb | 9 |
1 files 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," | |||
49 | PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," | 49 | PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," |
50 | 50 | ||
51 | PACKAGES += "${PN}-runtime ${PN}-xtests" | 51 | PACKAGES += "${PN}-runtime ${PN}-xtests" |
52 | FILES:${PN} = "${base_libdir}/lib*${SOLIBS}" | 52 | FILES:${PN} = " \ |
53 | ${base_libdir}/lib*${SOLIBS} \ | ||
54 | ${nonarch_libdir}/tmpfiles.d/*.conf \ | ||
55 | " | ||
53 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" | 56 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" |
54 | FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" | 57 | FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" |
55 | FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" | 58 | FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" |
@@ -130,9 +133,9 @@ do_install() { | |||
130 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then | 133 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then |
131 | rm -rf ${D}${sysconfdir}/init.d/ | 134 | rm -rf ${D}${sysconfdir}/init.d/ |
132 | rm -rf ${D}${sysconfdir}/rc* | 135 | rm -rf ${D}${sysconfdir}/rc* |
133 | install -d ${D}${sysconfdir}/tmpfiles.d | 136 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
134 | install -m 0644 ${WORKDIR}/pam-volatiles.conf \ | 137 | install -m 0644 ${WORKDIR}/pam-volatiles.conf \ |
135 | ${D}${sysconfdir}/tmpfiles.d/pam.conf | 138 | ${D}${nonarch_libdir}/tmpfiles.d/pam.conf |
136 | else | 139 | else |
137 | install -d ${D}${sysconfdir}/default/volatiles | 140 | install -d ${D}${sysconfdir}/default/volatiles |
138 | install -m 0644 ${WORKDIR}/99_pam \ | 141 | install -m 0644 ${WORKDIR}/99_pam \ |