[oe] [oe-commits] Otavio Salvador : samba: update to version 3.6.8

[Martin Jansa]

On Thu, Oct 25, 2012 at 09:20:05AM +0200, Martin Jansa wrote:
> On Wed, Oct 24, 2012 at 06:30:14AM +0000, git at git.openembedded.org wrote:
> > Module: meta-openembedded.git
> > Branch: master
> > Commit: be304441d8a63df14d91c2c8ee79aa126f87d74a
> > URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=be304441d8a63df14d91c2c8ee79aa126f87d74a
> > 
> > Author: Otavio Salvador <otavio at ossystems.com.br>
> > Date:   Tue Oct 23 19:25:05 2012 +0000
> > 
> > samba: update to version 3.6.8
> > 
> > Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
> 
> Hmm, here it fails to patch:
> 
> Applying patch documentation2.patch
> patching file docs-xml/manpages-3/nmbd.8.xml
> patching file docs-xml/manpages-3/samba.7.xml
> patching file docs-xml/manpages-3/smb.conf.5.xml
> patching file docs-xml/manpages-3/smbd.8.xml
> patching file docs-xml/using_samba/appd.xml
> patching file docs-xml/using_samba/ch01.xml
> patching file docs-xml/using_samba/ch07.xml
> patching file docs/htmldocs/manpages/nmbd.8.html
> patching file docs/htmldocs/manpages/samba.7.html
> patching file docs/htmldocs/manpages/smb.conf.5.html
> patching file docs/htmldocs/manpages/smbd.8.html
> patching file docs/manpages/nmbd.8
> patching file docs/manpages/samba.7
> patching file docs/manpages/smb.conf.5
> patching file docs/manpages/smbd.8
> patching file examples/tridge/smb.conf
> patching file swat/lang/tr/help/welcome.html
> Hunk #1 FAILED at 40.
> Hunk #2 succeeded at 66 with fuzz 2.
> 1 out of 2 hunks FAILED -- rejects in file swat/lang/tr/help/welcome.html
> Patch documentation2.patch does not apply (enforce with -f)
> ERROR: Function failed: patch_do_patch
> ERROR: Logfile of failure stored in: /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/samba-3.6.8-r0/temp/log.do_patch.23000
> NOTE: recipe samba-3.6.8-r0: task do_patch: Failed

This one is caused by non-ascii characters (probably mangled by
patchwork) and I have patch for this in jansa/pull, but there is also:

ERROR: Command Error: exit status: 1  Output:
Applying patch waf-as-source.patch
patching file buildtools/README
patching file buildtools/bin/README
patching file buildtools/bin/waf-svn
File buildtools/bin/waf-svn is not empty after patch; not deleting

waf-as-source.patch:
diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn
deleted file mode 100755
index 6d54d5f..0000000
Binary files a/buildtools/bin/waf-svn and /dev/null differ

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20121025/f40f228d/attachment-0002.sig>