summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity/samba
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-11-29 11:03:34 +0100
commit7cec8502b30db89a83b39c13bb37e3f54620abe1 (patch)
treea56eed6f99a71bab92eb17898fbbf56f6dedfe7c /meta-oe/recipes-connectivity/samba
parent0c398b0c7997dc2fce0c681899872345fb56a117 (diff)
downloadmeta-openembedded-7cec8502b30db89a83b39c13bb37e3f54620abe1.tar.gz
samba: update waf-as-source.patch to apply
* 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@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity/samba')
-rw-r--r--meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch4
-rw-r--r--meta-oe/recipes-connectivity/samba/samba_3.6.8.bb2
2 files changed, 1 insertions, 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 3ba7d23ae..985ed5af1 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
44-You can get a svn copy of the upstream source with: 44-You can get a svn copy of the upstream source with:
45- 45-
46- svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only 46- svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only
47diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn
48deleted file mode 100755
49index 6d54d5f..0000000
50Binary files a/buildtools/bin/waf-svn and /dev/null differ
51diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh 47diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
52new file mode 100755 48new file mode 100755
53index 0000000..bb3a4bf 49index 0000000..bb3a4bf
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 cc09a489d..7c54dae68 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -3,7 +3,7 @@ require samba-basic.inc
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" 4LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
5 5
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI += "\ 8SRC_URI += "\
9 file://config-h.patch \ 9 file://config-h.patch \