diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-10-25 11:29:09 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-11-29 11:03:34 +0100 |
| commit | 7cec8502b30db89a83b39c13bb37e3f54620abe1 (patch) | |
| tree | a56eed6f99a71bab92eb17898fbbf56f6dedfe7c /meta-oe/recipes-connectivity | |
| parent | 0c398b0c7997dc2fce0c681899872345fb56a117 (diff) | |
| download | meta-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')
| -rw-r--r-- | meta-oe/recipes-connectivity/samba/samba-3.6.8/waf-as-source.patch | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 |
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 3ba7d23aef..985ed5af1f 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 cc09a489d9..7c54dae689 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 \ |