Message ID | 20231116115457.1462082-5-lukas.funke-oss@weidmueller.com |
---|---|
State | New |
Headers | show |
Series | tmpfiles.d: use nonarch libdir | expand |
I am still seeing ERROR: glibc-2.38+git-r0 do_package: QA Issue: glibc: Files/directories were installed but not shipped in any package: /etc/tmpfiles.d /etc/tmpfiles.d/nscd.conf Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. On Thu, Nov 16, 2023 at 3:55 AM Lukas Funke <lukas.funke-oss@weidmueller.com> wrote: > > 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> > Signed-off-by: Lukas Funke <lukas.funke@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 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#190789): https://lists.openembedded.org/g/openembedded-core/message/190789 > Mute This Topic: https://lists.openembedded.org/mt/102625108/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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