[oe] [meta-oe]PATCH] samba: update documentation2.patch and waf-as-source.patch to apply

[RaNgErS]

My mails are rejected by admin. Why this happens? I am stuck
On Oct 25, 2012 3:39 PM, "Martin Jansa" <martin.jansa at gmail.com> wrote:

> * 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
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  .../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.patch
> b/meta-oe/recipes-connectivity/samba/samba-3.6.8/documentation2.patch
> index 88e98f1..902e8e2 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
>  @@ -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
> -+
> ++
> diff --git
> a/meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch
> b/meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch
> index 3ba7d23..985ed5a 100644
> --- a/meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch
> +++ b/meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch
> @@ -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
> diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bbb/meta-oe/recipes-connectivity/samba/
> samba_3.6.8.bb
> index 61fa4b3..cc09a48 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=.. \
> --
> 1.7.12.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>