Otavio Salvador : samba: update to version 3.6.8
Quoted 11 lines · On Wed, Oct 24, 2012 at 06:30:14AM +0000, [email protected] wrote:
Module: meta-openembedded.git Branch: master Commit: be304441d8a63df14d91c2c8ee79aa126f87d74a URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=be304441d8a63df14d91c2c8ee79aa126f87d74aAuthor: Otavio Salvador <[email protected]> Date: Tue Oct 23 19:25:05 2012 +0000samba: update to version 3.6.8
Signed-off-by Koen Kooi <[email protected]>
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
Quoted 32 lines · Martin Jansa
Quoted 11 lines · On Wed, Oct 24, 2012 at 06:30:14AM +0000, [email protected] wrote:
Module: meta-openembedded.git Branch: master Commit: be304441d8a63df14d91c2c8ee79aa126f87d74a URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=be304441d8a63df14d91c2c8ee79aa126f87d74aAuthor: Otavio Salvador <[email protected]> Date: Tue Oct 23 19:25:05 2012 +0000samba: update to version 3.6.8
Signed-off-by Koen Kooi <[email protected]>Hmm, here it fails to patch:
Applying patch documentation2.patch
patching filedocs-xml/manpages-3/nmbd.8.xmlpatching filedocs-xml/manpages-3/samba.7.xmlpatching filedocs-xml/manpages-3/smb.conf.5.xmlpatching filedocs-xml/manpages-3/smbd.8.xmlpatching filedocs-xml/using_samba/appd.xmlpatching filedocs-xml/using_samba/ch01.xmlpatching filedocs-xml/using_samba/ch07.xmlpatching 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 fileexamples/tridge/smb.conf
Quoted 8 lines
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: taskdo_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:
buildtools/bin/waf-svn deleted binary +0 -0
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
[meta-oe]PATCH] samba: update documentation2.patch and waf-as-source.patch to apply
* fails here because of non-ASCII characters:
ERROR: Command Error: exit status: 1 Output:
Applying patch documentation2.patch
...
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)
* and Applying patch waf-as-source.patch
...
File buildtools/bin/waf-svn is not empty after patch; not deleting
...
Patch waf-as-source.patch does not apply (enforce with -f) I've dropped this chunk and now it builds
* there is also WARNING about unpackaged but empty base_sbindir
WARNING: QA Issue: samba: Files/directories were installed but not shipped
/sbin
created by do_install in samba.inc but used only when cifs is built, maybe we should remove it from samba.inc now
--- .../samba/samba-3.6.8/documentation2.patch | 10 +++++----- .../recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch | 4 ---- meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 ++ 3 files changed, 7 insertions(+), 9 deletions(-)
meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch +5 -5
@@ -300,15 +300,15 @@ Index: samba/swat/lang/tr/help/welcome.html @@ -40,7 +40,6 @@ <ul> <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi - <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyas?n? kontrol eder -- <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yaz?c? ayarlar?n? kontrol eder - <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama arac? + <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder +- <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder + <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı </ul> <li><b>Kitaplar</b> @@ -66,4 +65,4 @@ - E?er SWAT'?n bu sürümü ile ilgili konular? tart??mak istiyorsan?z, lütfen + Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen <A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun. - \ No newline at end of file -+ ++
meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch +0 -4
@@ -44,10 +44,6 @@ index 9ef8a1f..0000000 -You can get a svn copy of the upstream source with: - - svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only -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 diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh new file mode 100755 index 0000000..bb3a4bf
meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +2 -0
@@ -3,6 +3,8 @@ require samba-basic.inc LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" +PR = "r1" + SRC_URI += "\ file://config-h.patch \ file://documentation.patch;patchdir=.. \
Signature · 1 line
1.7.12.4
Re: [meta-oe]PATCH] samba: update documentation2.patch and waf-as-source.patch to apply
My mails are rejected by admin. Why this happens? I am stuck
Quoted 109 lines · Martin Jansa
* fails here because of non-ASCII characters:
ERROR: Command Error: exit status: 1 Output:
Applying patch documentation2.patch
...
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)* and Applying patch waf-as-source.patch
...
File buildtools/bin/waf-svn is not empty after patch; not deleting
...
Patch waf-as-source.patch does not apply (enforce with -f) I've dropped this chunk and now it builds* there is also WARNING about unpackaged but empty
base_sbindir
WARNING: QA Issue: samba: Files/directories were installed but not shipped
/sbin
created bydo_installin samba.inc but used only when cifs is built, maybe we should remove it from samba.inc nowSigned-off-by Martin Jansa <[email protected]>--- .../samba/samba-3.6.8/documentation2.patch | 10 +++++----- .../recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch | 4 ---- meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 ++ 3 files changed, 7 insertions(+), 9 deletions(-)diff --git
a/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patchb/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patchindex 88e98f1..902e8e2 100644meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch +0
-0@@ -300,15 +300,15 @@ Index: samba/swat/lang/tr/help/welcome.html @@ -40,7 +40,6 @@ <ul> <li><a href="/swat/help/smbstatus.1.html"target="docs">smbstatus</a> - Samba gözlemcisi
meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch +0
-5- <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyas?n? kontrol eder -- <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yaz?c? ayarlar?n? kontrol eder - <li><a href="/swat/help/nmblookup.1.html"target="docs">nmblookup</a> - NetBIOS isim sorgulama arac?
meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch +3
-2+ <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder +- <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder + <li><a href="/swat/help/nmblookup.1.html"target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı
</ul><li><b>Kitaplar</b>
@@ -66,4 +65,4 @@- E?er SWAT'?n bu sürümü ile ilgili konular? tart??mak istiyorsan?z, lütfen
+ Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen
<A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun.
-
\ No newline at end of file
-+
++
diff --gita/meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patchb/meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patchindex 3ba7d23..985ed5a 100644meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch +0
-4@@ -44,10 +44,6 @@ index 9ef8a1f..0000000 -You can get a svn copy of the upstream source with: - - svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only -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 diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh new file mode 100755 index 0000000..bb3a4bf(quoted diff) +0
-0samba_3.6.8.bb
index 61fa4b3..cc09a48 100644meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +0
-0@@ -3,6 +3,8 @@ require samba-basic.inc LICENSE = "GPLv3" LIC_FILES_CHKSUM ="file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +2
-1+PR = "r1" + SRC_URI += "\ file://config-h.patch \ file://documentation.patch;patchdir=.. \ --1.7.12.4
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel