All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] samba: Split libnss-winbind package
@ 2013-01-29 17:00 Otavio Salvador
  2013-01-30 12:49 ` Martin Jansa
  0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2013-01-29 17:00 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Otavio Salvador

This allows for applications to resolv wins without the winbindd and
sambad.

Change-Id: Iaa86154a59e758b37f28796963e6550ed2d30464
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-connectivity/samba/samba-basic.inc |    7 ++++---
 meta-oe/recipes-connectivity/samba/samba.inc       |    2 +-
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index 5d816f9..efdda1a 100644
--- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
+++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
@@ -9,7 +9,7 @@ EXTRA_OECONF += "\
         --without-ldap \
         --without-krb5"
 
-PACKAGES =+ "winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
+PACKAGES =+ "winbind winbind-dbg libnss-winbind libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
 
 FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
                      ${libdir}/security/.debug/pam_winbind.so \
@@ -35,13 +35,14 @@ FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
+FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
+                        ${libdir}/nss_info"
+
 FILES_winbind = "${sysconfdir}/init.d/winbind \
-                 ${libdir}/libnss_*${SOLIBS} \
                  ${sbindir}/winbindd \
                  ${bindir}/wbinfo \
                  ${bindir}/ntlm_auth \
                  ${libdir}/idmap/*.so \
-                 ${libdir}/nss_info \
                  ${libdir}/pdb \
                  ${libdir}/gpext \
                  ${libdir}/perfcount \
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index faa2be0..4727c48 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -92,7 +92,7 @@ do_install_append() {
 
 
 
-pkg_postinst_winbind () {
+pkg_postinst_libnss-winbind () {
     # add wins to the list of resolvers
     ns=$D${sysconfdir}/nsswitch.conf
     if ! grep "hosts:.*wins" $ns > /dev/null; then
diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 7c54dae..7985199 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "\
     file://config-h.patch \
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] samba: Split libnss-winbind package
  2013-01-29 17:00 Otavio Salvador
@ 2013-01-30 12:49 ` Martin Jansa
  0 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2013-01-30 12:49 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Otavio Salvador

[-- Attachment #1: Type: text/plain, Size: 4041 bytes --]

On Tue, Jan 29, 2013 at 03:00:38PM -0200, Otavio Salvador wrote:
> This allows for applications to resolv wins without the winbindd and
> sambad.
> 

Please send patches for master (and tested in master), not danny

patching file meta-oe/recipes-connectivity/samba/samba-basic.inc
Hunk #1 FAILED at 9.
Hunk #2 FAILED at 35.
2 out of 2 hunks FAILED -- saving rejects to file
meta-oe/recipes-connectivity/samba/samba-basic.inc.rej
patching file meta-oe/recipes-connectivity/samba/samba.inc
Hunk #1 succeeded at 96 (offset 4 lines).
patching file meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file
meta-oe/recipes-connectivity/samba/samba_3.6.8.bb.rej

Cheers,

> Change-Id: Iaa86154a59e758b37f28796963e6550ed2d30464
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta-oe/recipes-connectivity/samba/samba-basic.inc |    7 ++++---
>  meta-oe/recipes-connectivity/samba/samba.inc       |    2 +-
>  meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |    2 +-
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
> index 5d816f9..efdda1a 100644
> --- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
> @@ -9,7 +9,7 @@ EXTRA_OECONF += "\
>          --without-ldap \
>          --without-krb5"
>  
> -PACKAGES =+ "winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
> +PACKAGES =+ "winbind winbind-dbg libnss-winbind libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
>  
>  FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
>                       ${libdir}/security/.debug/pam_winbind.so \
> @@ -35,13 +35,14 @@ FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
>  FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
>  FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
>  FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
> +FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
> +                        ${libdir}/nss_info"
> +
>  FILES_winbind = "${sysconfdir}/init.d/winbind \
> -                 ${libdir}/libnss_*${SOLIBS} \
>                   ${sbindir}/winbindd \
>                   ${bindir}/wbinfo \
>                   ${bindir}/ntlm_auth \
>                   ${libdir}/idmap/*.so \
> -                 ${libdir}/nss_info \
>                   ${libdir}/pdb \
>                   ${libdir}/gpext \
>                   ${libdir}/perfcount \
> diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
> index faa2be0..4727c48 100644
> --- a/meta-oe/recipes-connectivity/samba/samba.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba.inc
> @@ -92,7 +92,7 @@ do_install_append() {
>  
>  
>  
> -pkg_postinst_winbind () {
> +pkg_postinst_libnss-winbind () {
>      # add wins to the list of resolvers
>      ns=$D${sysconfdir}/nsswitch.conf
>      if ! grep "hosts:.*wins" $ns > /dev/null; then
> diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
> index 7c54dae..7985199 100644
> --- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
> +++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
> @@ -3,7 +3,7 @@ require samba-basic.inc
>  LICENSE = "GPLv3"
>  LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
>  
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI += "\
>      file://config-h.patch \
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [meta-oe][PATCH] samba: Split libnss-winbind package
@ 2013-02-04 17:19 Otavio Salvador
  2013-02-05 10:13 ` Martin Jansa
  0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2013-02-04 17:19 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Otavio Salvador

This allows for applications to resolv wins without the winbindd and
sambad.

Change-Id: Iaa86154a59e758b37f28796963e6550ed2d30464
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-oe/recipes-connectivity/samba/samba-basic.inc |    7 ++++---
 meta-oe/recipes-connectivity/samba/samba.inc       |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index 0b24879..d6d8d12 100644
--- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
+++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
@@ -9,7 +9,7 @@ EXTRA_OECONF += "\
         --without-ldap \
         --without-krb5"
 
-PACKAGES =+ "libwbclient libwinbind libwinbind-dbg winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
+PACKAGES =+ "libwbclient libwinbind libwinbind-dbg libnss-winbind winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
 
 FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
                      ${libdir}/security/.debug/pam_winbind.so \
@@ -36,13 +36,14 @@ FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
+FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
+                        ${libdir}/nss_info"
+
 FILES_winbind = "${sysconfdir}/init.d/winbind \
-                 ${libdir}/libnss_*${SOLIBS} \
                  ${sbindir}/winbindd \
                  ${bindir}/wbinfo \
                  ${bindir}/ntlm_auth \
                  ${libdir}/idmap/*.so \
-                 ${libdir}/nss_info \
                  ${libdir}/pdb \
                  ${libdir}/gpext \
                  ${libdir}/perfcount \
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index a86c8be..3ee43ad 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -96,7 +96,7 @@ do_install_append() {
 
 
 
-pkg_postinst_winbind () {
+pkg_postinst_libnss-winbind () {
     # add wins to the list of resolvers
     ns=$D${sysconfdir}/nsswitch.conf
     if ! grep "hosts:.*wins" $ns > /dev/null; then
-- 
1.7.2.5




^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] samba: Split libnss-winbind package
  2013-02-04 17:19 [meta-oe][PATCH] samba: Split libnss-winbind package Otavio Salvador
@ 2013-02-05 10:13 ` Martin Jansa
  2013-02-05 14:30   ` Otavio Salvador
  0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2013-02-05 10:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Otavio Salvador

[-- Attachment #1: Type: text/plain, Size: 3765 bytes --]

On Mon, Feb 04, 2013 at 03:19:24PM -0200, Otavio Salvador wrote:
> This allows for applications to resolv wins without the winbindd and
> sambad.

Is this for master?

2013-02-05 11:09:04 URL:http://patchwork.openembedded.org/patch/44029/mbox/ [2894] -> "pw-am-44029.patch" [1]
Applying: samba: Split libnss-winbind package
error: patch failed: meta-oe/recipes-connectivity/samba/samba-basic.inc:36
error: meta-oe/recipes-connectivity/samba/samba-basic.inc: patch does not apply
Patch failed at 0001 samba: Split libnss-winbind package
The copy of the patch that failed is found in:
   /OE/meta-openembedded/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Looks almost the same as:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-January/043763.html


> 
> Change-Id: Iaa86154a59e758b37f28796963e6550ed2d30464
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta-oe/recipes-connectivity/samba/samba-basic.inc |    7 ++++---
>  meta-oe/recipes-connectivity/samba/samba.inc       |    2 +-
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
> index 0b24879..d6d8d12 100644
> --- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
> @@ -9,7 +9,7 @@ EXTRA_OECONF += "\
>          --without-ldap \
>          --without-krb5"
>  
> -PACKAGES =+ "libwbclient libwinbind libwinbind-dbg winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
> +PACKAGES =+ "libwbclient libwinbind libwinbind-dbg libnss-winbind winbind winbind-dbg libnetapi libtdb libsmbsharemodes libsmbclient libsmbclient-dev cifs cifs-doc swat"
>  
>  FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
>                       ${libdir}/security/.debug/pam_winbind.so \
> @@ -36,13 +36,14 @@ FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
>  FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
>  FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
>  FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
> +FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
> +                        ${libdir}/nss_info"
> +
>  FILES_winbind = "${sysconfdir}/init.d/winbind \
> -                 ${libdir}/libnss_*${SOLIBS} \
>                   ${sbindir}/winbindd \
>                   ${bindir}/wbinfo \
>                   ${bindir}/ntlm_auth \
>                   ${libdir}/idmap/*.so \
> -                 ${libdir}/nss_info \
>                   ${libdir}/pdb \
>                   ${libdir}/gpext \
>                   ${libdir}/perfcount \
> diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
> index a86c8be..3ee43ad 100644
> --- a/meta-oe/recipes-connectivity/samba/samba.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba.inc
> @@ -96,7 +96,7 @@ do_install_append() {
>  
>  
>  
> -pkg_postinst_winbind () {
> +pkg_postinst_libnss-winbind () {
>      # add wins to the list of resolvers
>      ns=$D${sysconfdir}/nsswitch.conf
>      if ! grep "hosts:.*wins" $ns > /dev/null; then
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] samba: Split libnss-winbind package
  2013-02-05 10:13 ` Martin Jansa
@ 2013-02-05 14:30   ` Otavio Salvador
  0 siblings, 0 replies; 5+ messages in thread
From: Otavio Salvador @ 2013-02-05 14:30 UTC (permalink / raw)
  To: Martin Jansa; +Cc: OpenEmbedded Devel List

On Tue, Feb 5, 2013 at 8:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Feb 04, 2013 at 03:19:24PM -0200, Otavio Salvador wrote:
>> This allows for applications to resolv wins without the winbindd and
>> sambad.
>
> Is this for master?
>
> 2013-02-05 11:09:04 URL:http://patchwork.openembedded.org/patch/44029/mbox/ [2894] -> "pw-am-44029.patch" [1]
> Applying: samba: Split libnss-winbind package
> error: patch failed: meta-oe/recipes-connectivity/samba/samba-basic.inc:36
> error: meta-oe/recipes-connectivity/samba/samba-basic.inc: patch does not apply
> Patch failed at 0001 samba: Split libnss-winbind package
> The copy of the patch that failed is found in:
>    /OE/meta-openembedded/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --resolved".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> Looks almost the same as:
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-January/043763.html

Sorry; I sent v2 which applies properly in master.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-05 14:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-04 17:19 [meta-oe][PATCH] samba: Split libnss-winbind package Otavio Salvador
2013-02-05 10:13 ` Martin Jansa
2013-02-05 14:30   ` Otavio Salvador
  -- strict thread matches above, loose matches on Subject: below --
2013-01-29 17:00 Otavio Salvador
2013-01-30 12:49 ` Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.