From 7cec8502b30db89a83b39c13bb37e3f54620abe1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 25 Oct 2012 11:29:09 +0200 Subject: 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 --- meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch | 4 ---- meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'meta-oe/recipes-connectivity/samba') 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 -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.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 LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r1" +PR = "r2" SRC_URI += "\ file://config-h.patch \ -- cgit v1.2.3-54-g00ecf