diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 13:04:04 +0100 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-17 10:57:42 -0500 |
| commit | 380f0cef364c1a3749b574ee29f44cca004088b0 (patch) | |
| tree | e775df9921c037911a8abe4505c6c19c7c178c56 /meta-networking | |
| parent | cb9e340867bc12b440a9ac25363b412168ad8f13 (diff) | |
| download | meta-openembedded-contrib-380f0cef364c1a3749b574ee29f44cca004088b0.tar.gz | |
samba: simplify LSB handling
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 13 |
1 files changed, 5 insertions, 8 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 804a4d2dd8..c2436af4ef 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -38,8 +38,8 @@ DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" LDFLAGS_append_libc-musl = " -ltirpc" -SYSVINITTYPE_linuxstdbase = "lsb" -SYSVINITTYPE = "sysv" +LSB = "" +LSB_linuxstdbase = "lsb" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." @@ -48,19 +48,16 @@ SYSTEMD_PACKAGES = "${PN}-base winbind" SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" SYSTEMD_SERVICE_winbind = "winbind.service" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ +PACKAGECONFIG ??= "${@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 util-linux-getopt" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[lsb] = ",,lsb" -PACKAGECONFIG[sysv] = ",,sysvinit" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[sasl] = ",,cyrus-sasl" @@ -121,7 +118,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 |