diff options
| author |   Jackie Huang <jackie.huang@windriver.com> | 2016-01-06 14:42:46 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-01-20 21:41:42 -0500 |
| commit | 51c35fca0fcbfd7811b2c59a92c666993fbdabe7 (patch) | |
| tree | 2193cd05986bffef5c28612ff32b90d957dc13f6 /meta-networking | |
| parent | 952b92e4b88655ace568969199518e03e1b34660 (diff) | |
| download | meta-openembedded-contrib-51c35fca0fcbfd7811b2c59a92c666993fbdabe7.tar.gz | |
samba: fix the incorrect tmpfiles installed directory
- The tmpfiles are always installed in /usr/lib
even for multilib.
- It makes no sense to have two tmpfiles in both
/usr/lib/tmpfiles.d and /etc/tmpfiles.d, install
it as one in /etc/tmpfiles.d.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb index a51d31f020..fa35038bec 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb @@ -117,8 +117,9 @@ do_install_append() { -i ${D}${systemd_unitdir}/system/*.service install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/log/samba 0755 root root -" \ - > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d @@ -135,9 +136,6 @@ do_install_append() { echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -d ${D}${libdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${libdir}/tmpfiles.d/samba.conf - install -d ${D}${sysconfdir}/sysconfig/ install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba } @@ -281,7 +279,6 @@ FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \ " FILES_${PN} += "${base_libdir}/security/pam_smbpass.so \ - ${libdir}/tmpfiles.d/* \ " SMB_SERVICE="${systemd_unitdir}/system/nmb.service ${systemd_unitdir}/system/smb.service" |