summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorJoe MacDonald <joe_macdonald@mentor.com>2016-04-18 17:00:52 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2016-04-20 08:55:42 -0400
commit37c158f79acda29710946e64d2eb42bce6874e45 (patch)
tree80ae8ecba092b31479deebc58ac7161f3527e752 /meta-networking
parent70bde9accebb072b42ec5b9557411caef7e9ee54 (diff)
downloadmeta-openembedded-37c158f79acda29710946e64d2eb42bce6874e45.tar.gz
libldb: Update to latest stable
The update of Samba requires a newer version of libldb, so update it. Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rwxr-xr-xmeta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch19
-rw-r--r--meta-networking/recipes-support/libldb/libldb_1.1.26.bb (renamed from meta-networking/recipes-support/libldb/libldb_1.1.21.bb)4
2 files changed, 12 insertions, 11 deletions
diff --git a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
index 2425a55e3..fdd312c0a 100755
--- a/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
+++ b/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
@@ -3,18 +3,19 @@ we just check whether does the module exist.
3 3
4Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> 4Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
5 5
6--- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:42:12.265127110 +0800 6Index: ldb-1.1.26/buildtools/wafsamba/samba_bundled.py
7+++ ldb-1.1.17/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:45:25.717119550 +0800 7===================================================================
8@@ -1,7 +1,7 @@ 8--- ldb-1.1.26.orig/buildtools/wafsamba/samba_bundled.py
9 # functions to support bundled libraries 9+++ ldb-1.1.26/buildtools/wafsamba/samba_bundled.py
10@@ -2,6 +2,7 @@
10 11
12 import sys
13 import Build, Options, Logs
14+import imp, os
11 from Configure import conf 15 from Configure import conf
12-import sys, Logs 16 from samba_utils import TO_LIST
13+import sys, Logs, imp
14 from samba_utils import *
15 17
16 def PRIVATE_NAME(bld, name, private_extension, private_library): 18@@ -230,17 +231,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li
17@@ -218,17 +218,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li
18 # versions 19 # versions
19 minversion = minimum_library_version(conf, libname, minversion) 20 minversion = minimum_library_version(conf, libname, minversion)
20 21
diff --git a/meta-networking/recipes-support/libldb/libldb_1.1.21.bb b/meta-networking/recipes-support/libldb/libldb_1.1.26.bb
index bdad87d38..5458d4728 100644
--- a/meta-networking/recipes-support/libldb/libldb_1.1.21.bb
+++ b/meta-networking/recipes-support/libldb/libldb_1.1.26.bb
@@ -17,8 +17,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=b
17 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ 17 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
18 file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" 18 file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
19 19
20SRC_URI[md5sum] = "94ba09c7452fff68df3481686c56677e" 20SRC_URI[md5sum] = "31780b702b638ad32aa5d9853d257839"
21SRC_URI[sha256sum] = "267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1" 21SRC_URI[sha256sum] = "8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6"
22 22
23inherit waf-samba 23inherit waf-samba
24 24