Patchwork samba: update waf-as-source.patch to apply

mail settings
Submitter Martin Jansa
Date Oct. 26, 2012, 7:46 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/38619/
State Accepted
Commit 7cec8502b30db89a83b39c13bb37e3f54620abe1
Headers show


Martin Jansa - Oct. 26, 2012, 7:46 p.m.
* 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
  created by do_install in but used only when cifs is built,
  maybe we should remove it from now

Signed-off-by: Martin Jansa <>
 I've forgot to push updated branch with this part in last pull-request, 
 so here it is with another PR bump.

 meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch | 4 ----
 meta-oe/recipes-connectivity/samba/                  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)


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 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/ b/buildtools/
 new file mode 100755
 index 0000000..bb3a4bf
diff --git a/meta-oe/recipes-connectivity/samba/ b/meta-oe/recipes-connectivity/samba/
index cc09a48..7c54dae 100644
--- a/meta-oe/recipes-connectivity/samba/
+++ b/meta-oe/recipes-connectivity/samba/
@@ -3,7 +3,7 @@  require
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r1"
+PR = "r2"
 SRC_URI += "\
     file://config-h.patch \