diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-10-25 11:29:09 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-26 13:00:24 +0200 |
commit | 1571c2c566c51799eceea2aabe13d1c3116f36b3 (patch) | |
tree | 6a2d9a2b42f68b10889fc13c8b6d4033188696e3 /meta-oe | |
parent | 00fe75fb5773cf5602a20a50ed299ed287dd6ebd (diff) | |
download | meta-openembedded-1571c2c566c51799eceea2aabe13d1c3116f36b3.tar.gz |
samba: update documentation2.patch to apply
* fails here because of non-ASCII characters:
ERROR: Command Error: exit status: 1 Output:
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/armv4t-oe-linux-gnueabi/samba-3.6.8-r0/temp/log.do_patch.2937
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch | 10 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch b/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch index 88e98f1de..902e8e230 100644 --- a/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch +++ b/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch | |||
@@ -300,15 +300,15 @@ Index: samba/swat/lang/tr/help/welcome.html | |||
300 | @@ -40,7 +40,6 @@ | 300 | @@ -40,7 +40,6 @@ |
301 | <ul> | 301 | <ul> |
302 | <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi | 302 | <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi |
303 | <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyas?n? kontrol eder | 303 | <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder |
304 | - <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yaz?c? ayarlar?n? kontrol eder | 304 | - <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder |
305 | <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama arac? | 305 | <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı |
306 | </ul> | 306 | </ul> |
307 | <li><b>Kitaplar</b> | 307 | <li><b>Kitaplar</b> |
308 | @@ -66,4 +65,4 @@ | 308 | @@ -66,4 +65,4 @@ |
309 | 309 | ||
310 | E?er SWAT'?n bu sürümü ile ilgili konular? tart??mak istiyorsan?z, lütfen | 310 | Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen |
311 | <A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun. | 311 | <A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun. |
312 | - | 312 | - |
313 | \ No newline at end of file | 313 | \ No newline at end of file |
314 | + | 314 | + |
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 61fa4b36f..cc09a489d 100644 --- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | |||
@@ -3,6 +3,8 @@ require samba-basic.inc | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | 5 | ||
6 | PR = "r1" | ||
7 | |||
6 | SRC_URI += "\ | 8 | SRC_URI += "\ |
7 | file://config-h.patch \ | 9 | file://config-h.patch \ |
8 | file://documentation.patch;patchdir=.. \ | 10 | file://documentation.patch;patchdir=.. \ |