[oe-commits] [meta-openembedded] 04/04: quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d

git at git.openembedded.org git at git.openembedded.org
Wed Feb 19 17:36:23 UTC 2020


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 7cd9fcb9726c73622a75722564e3f33753063748
Author: Callaghan, Dan <dan.callaghan at opengear.com>
AuthorDate: Wed Feb 19 22:08:03 2020 +1000

    quagga: install tmpfiles snippet to /usr/lib/tmpfiles.d
    
    Package-owned tmpfiles snippets belong in /usr/lib/tmpfiles.d,
    /etc/tmpfiles.d is for administrator customisations.
    
    Signed-off-by: Dan Callaghan <dan.callaghan at opengear.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-protocols/quagga/quagga.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 2673a89..310bc7e 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -116,9 +116,9 @@ do_install () {
     done
 
     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/quagga 0755 quagga quagga -" \
-        > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
+        > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf
     fi
 
     # Remove sysinit script if sysvinit is not in DISTRO_FEATURES
@@ -166,6 +166,8 @@ FILES_${PN}-ospfclient  = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.*
 FILES_${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \
                            ${sysconfdir}/init.d/watchquagga"
 
+FILES_${PN} += "${nonarch_libdir}/tmpfiles.d/*.conf"
+
 # Indicate that the default files are configuration files
 CONFFILES_${PN} = "${sysconfdir}/default/quagga \
                    ${sysconfdir}/quagga/bgpd.conf \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list