| Submitter | Otavio Salvador |
|---|---|
| Date | Feb. 4, 2013, 5:19 p.m. |
| Message ID | <1359998364-9245-1-git-send-email-otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/44029/ |
| State | Changes Requested, archived |
| Headers | show |
Comments
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
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
Patch
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
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(-)