Patchwork [meta-oe,v3] samba: Split libnss-winbind package

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 5, 2013, 2:32 p.m.
Message ID <1360074758-6672-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/44103/
State Accepted, archived
Commit 3b214e28bc19834d39ff0c441e12a914d494ca54
Headers show

Comments

Otavio Salvador - Feb. 5, 2013, 2:32 p.m.
This allows for applications to resolv wins without the winbindd and
sambad.

Change-Id: Iaa86154a59e758b37f28796963e6550ed2d30464
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes for v3:
-Fixes a parsing error

 meta-oe/recipes-connectivity/samba/samba-basic.inc |    9 +++++----
 meta-oe/recipes-connectivity/samba/samba.inc       |    2 +-
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

Patch

diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index af4e04e..05a5b3a 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 \
@@ -41,13 +41,14 @@  FILES_winbind = "${sbindir}/winbindd \
                  ${bindir}/ntlm_auth \
                  ${sysconfdir}/init.d/winbind \
 "
-FILES_libwinbind = "${libdir}/libnss_*${SOLIBS} \
-                    ${libdir}/idmap/*.so \
-                    ${libdir}/nss_info \
+FILES_libwinbind = "${libdir}/idmap/*.so \
                     ${libdir}/pdb \
                     ${libdir}/gpext \
                     ${libdir}/perfcount \
                     ${libdir}/security/pam_winbind.so \
 "
 
+FILES_libnss-winbind = "${libdir}/libnss_*${SOLIBS} \
+                        ${libdir}/nss_info"
+
 FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
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
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 f144de3..35d20c5 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 = "r6"
+PR = "r7"
 
 SRC_URI += "\
     file://config-h.patch \