On Mon, Nov 02, 2015 at 07:48:51PM +0800, [email protected] wrote: > From: Jackie Huang <[email protected]> > > - 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.
Please rebase on latest master and resend. > > Signed-off-by: Jackie Huang <[email protected]> > --- > meta-oe/recipes-connectivity/samba/samba_4.1.12.bb | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb > b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb > index 22c2bb4..45fdaa7 100644 > --- a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb > +++ b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb > @@ -94,18 +94,16 @@ do_install_append() { > -e 's,@SBINDIR@,${sbindir},g' \ > -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 -d ${D}${sysconfdir}/tmpfiles.d > + 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 > fi > > install -d ${D}${sysconfdir}/samba > 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 > } > @@ -114,7 +112,6 @@ PACKAGES += "${PN}-python ${PN}-python-dbg ${PN}-pidl > libwinbind libwinbind-dbg > > FILES_${PN} += "/run \ > ${libdir}/security/pam_smbpass.so \ > - ${libdir}/tmpfiles.d/* \ > " > > SMB_SERVICE="${systemd_unitdir}/system/nmb.service > ${systemd_unitdir}/system/smb.service" > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
