aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-10-25 11:29:09 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-10-26 13:00:24 +0200
commit1571c2c566c51799eceea2aabe13d1c3116f36b3 (patch)
tree6a2d9a2b42f68b10889fc13c8b6d4033188696e3 /meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
parent00fe75fb5773cf5602a20a50ed299ed287dd6ebd (diff)
downloadmeta-openembedded-1571c2c566c51799eceea2aabe13d1c3116f36b3.tar.gz
meta-openembedded-1571c2c566c51799eceea2aabe13d1c3116f36b3.tar.bz2
meta-openembedded-1571c2c566c51799eceea2aabe13d1c3116f36b3.zip
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/recipes-connectivity/samba/samba_3.6.8.bb')
-rw-r--r--meta-oe/recipes-connectivity/samba/samba_3.6.8.bb2
1 files changed, 2 insertions, 0 deletions
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
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
+PR = "r1"
+
SRC_URI += "\
file://config-h.patch \
file://documentation.patch;patchdir=.. \