Ping > -----Original Message----- > From: Lei, Maohui > Sent: Sunday, May 27, 2018 5:36 AM > To: openembedded-devel@lists.openembedded.org > Cc: Lei, Maohui > Subject: [oe] [meta-networking][PATCH] samba:Deleted config for lsb, since > this > part has been deleted from samba upstream. > > Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> > --- > .../recipes-connectivity/samba/samba_4.7.6.bb | 25 > ++++++++-------------- > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb b/meta- > networking/recipes-connectivity/samba/samba_4.7.6.bb > index a8517c5..b570e4b 100644 > --- a/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb > +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb > @@ -46,8 +46,6 @@ DEPENDS_append_libc-musl = " libtirpc" > CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" > LDFLAGS_append_libc-musl = " -ltirpc" > > -LSB = "" > -LSB_linuxstdbase = "lsb" > > INITSCRIPT_NAME = "samba" > INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." > @@ -68,7 +66,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', > 'systemd zeroconf', d)} > acl ad-dc cups gnutls ldap mitkrb5 \ > " > > -RDEPENDS_${PN}-base += "${LSB}" > RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" > > PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" > @@ -150,19 +147,15 @@ do_install_append() { > 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 > - if [ "${LSB}" = "lsb" ]; then > - install -d ${D}${sysconfdir}/init.d > - install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba > - else > - install -d ${D}${sysconfdir}/init.d > - install -m 0755 packaging/sysv/samba.init > ${D}${sysconfdir}/init.d/samba > - sed -e 's,/opt/samba/bin,${sbindir},g' \ > - -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ > - -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ > - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ > - -e 's,/usr/bin,${base_bindir},g' \ > - -i ${D}${sysconfdir}/init.d/samba > - fi > + > + install -d ${D}${sysconfdir}/init.d > + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba > + sed -e 's,/opt/samba/bin,${sbindir},g' \ > + -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ > + -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ > + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ > + -e 's,/usr/bin,${base_bindir},g' \ > + -i ${D}${sysconfdir}/init.d/samba > > install -d ${D}${sysconfdir}/samba > echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts > -- > 1.9.1
-- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel