[meta-oe][PATCH 1/2] samba: add winbind.service to winbind package

[meta-oe][PATCH 1/2] samba: add winbind.service to winbind package

[Chong Lu]

This solves the following warning:

lib32-samba-3.6.24: lib32-samba: Files/directories were installed but not shipped
  /lib/systemd/system/winbind.service [installed-vs-shipped]

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 recipes-connectivity/samba/samba-basic.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index d0fa8e6..e9f891f 100644
--- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
+++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
@@ -40,6 +40,7 @@ FILES_winbind = "${sbindir}/winbindd \
                  ${bindir}/wbinfo \
                  ${bindir}/ntlm_auth \
                  ${sysconfdir}/init.d/winbind \
+                 ${systemd_unitdir}/system/winbind.service \
 "
 FILES_libwinbind = "${libdir}/idmap/*.so \
                     ${libdir}/pdb \
-- 
1.9.1

[meta-oe][PATCH 2/2] samba: fix error messages when startup samba service

[Chong Lu]

This solves the following error messages when startup samba:

  Unable to open new log file '/var/log/samba/log.smbd': No such file or directory

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 recipes-connectivity/samba/samba.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index 4392821..68e1b1f 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -35,7 +35,7 @@ EXTRA_OECONF='--disable-cups \
               --with-privatedir=${sysconfdir}/samba/private \
               --with-lockdir=${localstatedir}/lock \
               --with-piddir=${localstatedir}/run \
-              --with-logfilebase=${localstatedir}/log \
+              --with-logfilebase=${localstatedir}/log/samba \
               --libdir=${libdir} \
               --with-mandir=${mandir} \
               --with-swatdir=${datadir}/swat \
@@ -123,6 +123,12 @@ do_install_append() {
     sed -e 's,@BASE_BINDIR@,${base_bindir},g' \
         -e 's,@SBINDIR@,${sbindir},g' \
         -i ${D}${systemd_unitdir}/system/*.service
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+	install -d ${D}${sysconfdir}/tmpfiles.d
+	echo "d ${localstatedir}/log/samba 0755 root root -" \
+            > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf
+    fi
 }
 
 DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}"
-- 
1.9.1

Re: [meta-oe][PATCH 1/2] samba: add winbind.service to winbind package

[Chong Lu]

ping

//Chong

On 10/30/2014 06:23 PM, Chong Lu wrote:
> This solves the following warning:
>
> lib32-samba-3.6.24: lib32-samba: Files/directories were installed but not shipped
>    /lib/systemd/system/winbind.service [installed-vs-shipped]
>
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>   recipes-connectivity/samba/samba-basic.inc | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
> index d0fa8e6..e9f891f 100644
> --- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
> @@ -40,6 +40,7 @@ FILES_winbind = "${sbindir}/winbindd \
>                    ${bindir}/wbinfo \
>                    ${bindir}/ntlm_auth \
>                    ${sysconfdir}/init.d/winbind \
> +                 ${systemd_unitdir}/system/winbind.service \
>   "
>   FILES_libwinbind = "${libdir}/idmap/*.so \
>                       ${libdir}/pdb \

Re: [meta-oe][PATCH 2/2] samba: fix error messages when startup samba service

[Chong Lu]

ping

//Chong

On 10/30/2014 06:23 PM, Chong Lu wrote:
> This solves the following error messages when startup samba:
>
>    Unable to open new log file '/var/log/samba/log.smbd': No such file or directory
>
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>   recipes-connectivity/samba/samba.inc | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
> index 4392821..68e1b1f 100644
> --- a/meta-oe/recipes-connectivity/samba/samba.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba.inc
> @@ -35,7 +35,7 @@ EXTRA_OECONF='--disable-cups \
>                 --with-privatedir=${sysconfdir}/samba/private \
>                 --with-lockdir=${localstatedir}/lock \
>                 --with-piddir=${localstatedir}/run \
> -              --with-logfilebase=${localstatedir}/log \
> +              --with-logfilebase=${localstatedir}/log/samba \
>                 --libdir=${libdir} \
>                 --with-mandir=${mandir} \
>                 --with-swatdir=${datadir}/swat \
> @@ -123,6 +123,12 @@ do_install_append() {
>       sed -e 's,@BASE_BINDIR@,${base_bindir},g' \
>           -e 's,@SBINDIR@,${sbindir},g' \
>           -i ${D}${systemd_unitdir}/system/*.service
> +
> +    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
> +	install -d ${D}${sysconfdir}/tmpfiles.d
> +	echo "d ${localstatedir}/log/samba 0755 root root -" \
> +            > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf
> +    fi
>   }
>   
>   DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}"