Patchwork [meta-oe,PATCHv2,6/6] samba: split winbind into winbind and libwinbind

login
register
mail settings
Submitter Mario Domenech Goulart
Date Dec. 3, 2012, 4:03 p.m.
Message ID <1354550606-10377-6-git-send-email-mario@ossystems.com.br>
Download mbox | patch
Permalink /patch/40045/
State Accepted
Headers show

Comments

Mario Domenech Goulart - Dec. 3, 2012, 4:03 p.m.
Change-Id: Ica6b3223805e35a0702bf20aad24ae13236b4f1c
Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 meta-oe/recipes-connectivity/samba/samba-basic.inc |   21 ++++++++++---------
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb  |    2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

Patch

diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index 5d816f9..d1b905a 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 =+ "libwinbind libwinbind-dbg 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 \
@@ -35,17 +35,18 @@  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_winbind = "${sysconfdir}/init.d/winbind \
-                 ${libdir}/libnss_*${SOLIBS} \
-                 ${sbindir}/winbindd \
+FILES_winbind = "${sbindir}/winbindd \
                  ${bindir}/wbinfo \
                  ${bindir}/ntlm_auth \
-                 ${libdir}/idmap/*.so \
-                 ${libdir}/nss_info \
-                 ${libdir}/pdb \
-                 ${libdir}/gpext \
-                 ${libdir}/perfcount \
-                 ${libdir}/security/pam_winbind.so \
+                 ${sysconfdir}/init.d/winbind \
+"
+FILES_libwinbind = "${libdir}/libnss_*${SOLIBS} \
+                    ${libdir}/idmap/*.so \
+                    ${libdir}/nss_info \
+                    ${libdir}/pdb \
+                    ${libdir}/gpext \
+                    ${libdir}/perfcount \
+                    ${libdir}/security/pam_winbind.so \
 "
 
 FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
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 cc09a48..7c54dae 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 = "r1"
+PR = "r2"
 
 SRC_URI += "\
     file://config-h.patch \