diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2016-10-18 21:06:37 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2017-06-26 22:59:19 +0200 |
| commit | 6ba715b77b0cad2eba5e433754acb79a55db75dc (patch) | |
| tree | 2305ce8f2d5b825834234cdc2d86e4520702ddc7 | |
| parent | 19b841def5285755c5af3faf1394d796a7ddb995 (diff) | |
| download | meta-openembedded-contrib-6ba715b77b0cad2eba5e433754acb79a55db75dc.tar.gz | |
samba: simplify LSB handling
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index 93fc27813a..abc405fd8f 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -30,8 +30,8 @@ RDEPENDS_${PN}_remove = "perl" DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 libbsd libaio" -SYSVINITTYPE_linuxstdbase = "lsb" -SYSVINITTYPE = "sysv" +LSB = "" +LSB_linuxstdbase = "lsb" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." @@ -41,20 +41,17 @@ SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" SYSTEMD_SERVICE_winbind = "winbind.service" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ " -RDEPENDS_${PN}-base += "${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'lsb', '', d)}" +RDEPENDS_${PN}-base += "${LSB}" RDEPENDS_${PN}-ctdb-tests += "bash" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" PACKAGECONFIG[pam] = "--with-pam --with-pammodulesdir=${base_libdir}/security,--without-pam,libpam" -PACKAGECONFIG[lsb] = ",,lsb" -PACKAGECONFIG[sysv] = ",,sysvinit" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[sasl] = ",,cyrus-sasl" @@ -113,7 +110,7 @@ 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 ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then + if [ "${LSB}" = "lsb" ]; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba else |