From 6e5e1505cc83ae27221b9f77489e3e01f09d58ab Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 2 Jul 2019 09:58:09 +0800 Subject: libtdb: upgrade 1.3.17 -> 1.4.0 1. switch to python3 2. fix cross-compile problem caused by waf 3. refresh patches Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- ...akefile-fix-problem-that-waf-cannot-found.patch | 35 ------------- .../libtdb/do-not-check-xsltproc-manpages.patch | 15 ------ .../tdb-Add-configure-options-for-packages.patch | 33 +++++-------- .../recipes-support/libtdb/libtdb_1.3.17.bb | 52 -------------------- .../recipes-support/libtdb/libtdb_1.4.0.bb | 57 ++++++++++++++++++++++ 5 files changed, 70 insertions(+), 122 deletions(-) delete mode 100644 meta-networking/recipes-support/libtdb/libtdb/0001-Makefile-fix-problem-that-waf-cannot-found.patch delete mode 100644 meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch delete mode 100644 meta-networking/recipes-support/libtdb/libtdb_1.3.17.bb create mode 100644 meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb (limited to 'meta-networking/recipes-support') diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-Makefile-fix-problem-that-waf-cannot-found.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-Makefile-fix-problem-that-waf-cannot-found.patch deleted file mode 100644 index 10f2ef84d3..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb/0001-Makefile-fix-problem-that-waf-cannot-found.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7205761d654636a6c1fad03a3ca40d38e253e192 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 25 Jan 2019 16:01:07 +0800 -Subject: [PATCH] Makefile: fix problem that waf cannot found - -tdb is subfolder of samba, but it can also build independently. -so both path need to be added into PATH - -Upsteam-Status: Inappropriate [oe specific] - -Fix reject by upstream since upsteam need to support both python2/3, -so drop add append PATH. refer link: -https://gitlab.com/samba-team/samba/merge_requests/209 -https://gitlab.com/samba-team/samba/merge_requests/211 - -Signed-off-by: Changqing Li ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3e70146..64bb393 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - # simple makefile wrapper to run waf - --WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf -+WAF_BINARY=PATH=buildtools/bin:../../buildtools/bin:$$PATH waf - WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) - - all: --- -2.7.4 - diff --git a/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch deleted file mode 100644 index bcc45c9fc3..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch +++ /dev/null @@ -1,15 +0,0 @@ -Don't check manpages for xsltproc. - -Signed-off-by: Bian Naimeng - ---- tdb-1.3.0.orig/wscript 2015-04-22 09:52:32.366000222 +0900 -+++ tdb-1.3.0/wscript 2015-04-22 09:51:57.720000205 +0900 -@@ -90,7 +90,7 @@ def configure(conf): - not conf.env.disable_tdb_mutex_locking): - conf.define('USE_TDB_MUTEX_LOCKING', 1) - -- conf.CHECK_XSLTPROC_MANPAGES() -+ conf.find_program('xsltproc', var='XSLTPROC') - - if not conf.env.disable_python: - # also disable if we don't have the python libs installed diff --git a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch index e6e10238f1..481fd68a4f 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch @@ -1,6 +1,6 @@ -From 13bbc851d9fd7396f087758e614abba60eeb2aad Mon Sep 17 00:00:00 2001 +From 71a10c176c34da898c0169371b3c1b032d2f88b1 Mon Sep 17 00:00:00 2001 From: Changqing Li -Date: Wed, 23 Jan 2019 10:14:05 +0800 +Date: Wed, 19 Jun 2019 17:53:34 +0800 Subject: [PATCH] tdb: Add configure options for packages Add configure options for the following packages: @@ -15,22 +15,16 @@ Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Jackie Huang -Update for libtdb_1.3.14. +Update to 1.4.0 -Signed-off-by: Huang Qiyu - -Update for libtdb_1.3.16 -Signed-off-by: Changqing Li - -Update for libtdb_1.3.17 Signed-off-by: Changqing Li --- - lib/replace/wscript | 95 ++++++++++++++++++++++++++++++++++++++++------------- + lib/replace/wscript | 94 ++++++++++++++++++++++++++++++++++++++++------------- wscript | 6 ++++ - 2 files changed, 79 insertions(+), 22 deletions(-) + 2 files changed, 78 insertions(+), 22 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 6cbae93..7aeaf46 100644 +index 1d01e1e..2336dc3 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -104,26 +98,26 @@ index 6cbae93..7aeaf46 100644 + conf.CHECK_HEADERS('sys/capability.h') + conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,10 @@ def configure(conf): +@@ -110,9 +158,10 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') - conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') +- conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + if Options.options.enable_valgrind: + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') + conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h') + - conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -379,21 +429,22 @@ def configure(conf): - conf.CHECK_FUNCS('prctl dirname basename') + conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h') +@@ -380,20 +429,21 @@ def configure(conf): strlcpy_in_bsd = False -- + - # libbsd on some platforms provides strlcpy and strlcat - if not conf.CHECK_FUNCS('strlcpy strlcat'): - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', @@ -138,7 +132,6 @@ index 6cbae93..7aeaf46 100644 - - if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -+ + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): @@ -158,7 +151,7 @@ index 6cbae93..7aeaf46 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index bc5ee26..9ac10b6 100644 +index 5598d02..8d47244 100644 --- a/wscript +++ b/wscript @@ -69,6 +69,12 @@ def options(opt): diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.17.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.17.bb deleted file mode 100644 index 4c7755cba3..0000000000 --- a/meta-networking/recipes-support/libtdb/libtdb_1.3.17.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "The tdb library" -HOMEPAGE = "http://tdb.samba.org/" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ - file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" - -SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://do-not-check-xsltproc-manpages.patch \ - file://tdb-Add-configure-options-for-packages.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://0001-Makefile-fix-problem-that-waf-cannot-found.patch \ -" - -SRC_URI[md5sum] = "519d373ac72a66b0a2739dbb495de127" -SRC_URI[sha256sum] = "1cb4399394c60a773430ca54848359adcf54fb6f136afdcfcbbe62b5f4245614" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" - -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" - -S = "${WORKDIR}/tdb-${PV}" - -inherit waf-samba - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES += "tdb-tools python-tdb" - -RPROVIDES_${PN}-dbg += "python-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -RDEPENDS_python-tdb = "python" diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb new file mode 100644 index 0000000000..acc94d923f --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "The tdb library" +HOMEPAGE = "http://tdb.samba.org/" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" + +LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ + file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" + +SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ + file://tdb-Add-configure-options-for-packages.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ +" + +SRC_URI[md5sum] = "c4c2f8cf9e691244a7f2ecfa3baadecc" +SRC_URI[sha256sum] = "c1a0729c5400fb495465fa4bd953ae290db43c28dacd0506aef50dc482132d35" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" + +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +S = "${WORKDIR}/tdb-${PV}" + +inherit waf-samba + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +do_install_append() { + # add this link for cross check python module existence. eg: on x86-64 host, check python module + # under recipe-sysroot which is mips64. + cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so +} + +PACKAGES += "tdb-tools python3-tdb" + +RPROVIDES_${PN}-dbg += "python3-tdb-dbg" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_tdb-tools = "${bindir}/*" +FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +RDEPENDS_python3-tdb = "python3" +INSANE_SKIP_python3-tdb = "dev-so" -- cgit 1.2.3-korg