diff options
| author |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-04-18 17:00:52 -0400 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-04-29 11:57:47 -0400 |
| commit | b325ceaf4e08a47dbad413f573796cfa4f95a164 (patch) | |
| tree | 8d82c498a4de6c2bbddc2f4f573a98255406ad0f /meta-networking/recipes-support | |
| parent | 825cf152ccd7ba3ab4f6f41d16cf116c72de7033 (diff) | |
| download | meta-openembedded-contrib-b325ceaf4e08a47dbad413f573796cfa4f95a164.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/recipes-support')
| -rwxr-xr-x | meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch | 19 | ||||
| -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 2425a55e39..fdd312c0ad 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. Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> ---- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:42:12.265127110 +0800 -+++ ldb-1.1.17/buildtools/wafsamba/samba_bundled.py 2015-07-16 16:45:25.717119550 +0800 -@@ -1,7 +1,7 @@ - # functions to support bundled libraries +Index: ldb-1.1.26/buildtools/wafsamba/samba_bundled.py +=================================================================== +--- ldb-1.1.26.orig/buildtools/wafsamba/samba_bundled.py ++++ ldb-1.1.26/buildtools/wafsamba/samba_bundled.py +@@ -2,6 +2,7 @@ + import sys + import Build, Options, Logs ++import imp, os from Configure import conf --import sys, Logs -+import sys, Logs, imp - from samba_utils import * + from samba_utils import TO_LIST - def PRIVATE_NAME(bld, name, private_extension, private_library): -@@ -218,17 +218,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li +@@ -230,17 +231,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li # versions minversion = minimum_library_version(conf, libname, minversion) 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 bdad87d38a..5458d47285 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 file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" -SRC_URI[md5sum] = "94ba09c7452fff68df3481686c56677e" -SRC_URI[sha256sum] = "267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1" +SRC_URI[md5sum] = "31780b702b638ad32aa5d9853d257839" +SRC_URI[sha256sum] = "8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6" inherit waf-samba |