| Message ID | 20231116125059.1483544-1-lukas.funke-oss@weidmueller.com |
|---|---|
| State | Accepted, archived |
| Commit | ee162bc2f5fccb5aab6adb48d0f449991b1a6a51 |
| Headers | show |
| Series | [meta-oe,v3] systemd: use nonarch libdir for tmpfiles.d | expand |
Please always resend the whole series so I don't have to cherrypick patches from various threads. Also, is this really for meta-oe? On 16/11/2023 13:50:59+0100, Lukas Funke wrote: > 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> > Signed-off-by: Lukas Funke <lukas.funke@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..6d71fbaba2 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}${nonarch_libdir}/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}${nonarch_libdir}/tmpfiles.d/ > > if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then > install -d ${D}${sysconfdir}/init.d > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#190793): https://lists.openembedded.org/g/openembedded-core/message/190793 > Mute This Topic: https://lists.openembedded.org/mt/102625692/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb index cc0e29fdd2..6d71fbaba2 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}${nonarch_libdir}/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}${nonarch_libdir}/tmpfiles.d/ if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d