mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-06 16:58:24 +00:00
libtdb: upgrade 1.4.8 -> 1.4.9
* Remove PACKAGECONFIG[libaio] as libaio is no longer required by libtdb. * Add ptest. * Refresh patches. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
Khem Raj
@@ -1,4 +1,4 @@
|
||||
From d3b1d23e01e323b9610843ab6bef096512f6c244 Mon Sep 17 00:00:00 2001
|
||||
From 613cfb43622f0138edfcf3ad7a8fecc568e17db4 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Wed, 19 Jun 2019 17:53:34 +0800
|
||||
Subject: [PATCH] tdb: Add configure options for packages
|
||||
@@ -6,7 +6,6 @@ Subject: [PATCH] tdb: Add configure options for packages
|
||||
Add configure options for the following packages:
|
||||
- acl
|
||||
- attr
|
||||
- libaio
|
||||
- libbsd
|
||||
- libcap
|
||||
- valgrind
|
||||
@@ -18,16 +17,20 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
Update to 1.4.0
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
|
||||
Rebase to 1.4.9
|
||||
Remove libaio option
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
lib/replace/wscript | 92 ++++++++++++++++++++++++++++++++++-----------
|
||||
wscript | 6 +++
|
||||
2 files changed, 77 insertions(+), 21 deletions(-)
|
||||
lib/replace/wscript | 79 +++++++++++++++++++++++++++++++++------------
|
||||
wscript | 6 ++++
|
||||
2 files changed, 65 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/lib/replace/wscript b/lib/replace/wscript
|
||||
index 827d74f..70cde6f 100644
|
||||
index 199e636..cb13b62 100644
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -25,6 +25,41 @@ def options(opt):
|
||||
@@ -25,6 +25,34 @@ def options(opt):
|
||||
opt.PRIVATE_EXTENSION_DEFAULT('')
|
||||
opt.RECURSE('buildtools/wafsamba')
|
||||
|
||||
@@ -45,13 +48,6 @@ index 827d74f..70cde6f 100644
|
||||
+ help=("Disable use of attr"),
|
||||
+ action="store_false", dest='enable_attr', default=False)
|
||||
+
|
||||
+ opt.add_option('--with-libaio',
|
||||
+ help=("Enable use of libaio"),
|
||||
+ action="store_true", dest='enable_libaio')
|
||||
+ opt.add_option('--without-libaio',
|
||||
+ help=("Disable use of libaio"),
|
||||
+ action="store_false", dest='enable_libaio', default=False)
|
||||
+
|
||||
+ opt.add_option('--with-libbsd',
|
||||
+ help=("Enable use of libbsd"),
|
||||
+ action="store_true", dest='enable_libbsd')
|
||||
@@ -69,51 +65,45 @@ index 827d74f..70cde6f 100644
|
||||
@Utils.run_once
|
||||
def configure(conf):
|
||||
conf.RECURSE('buildtools/wafsamba')
|
||||
@@ -35,12 +70,25 @@ def configure(conf):
|
||||
@@ -38,12 +66,21 @@ def configure(conf):
|
||||
conf.DEFINE('HAVE_LIBREPLACE', 1)
|
||||
conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
|
||||
|
||||
- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
|
||||
- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
|
||||
+ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h')
|
||||
+ conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h')
|
||||
+ conf.CHECK_HEADERS('compat.h ctype.h dustat.h')
|
||||
conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
|
||||
conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
|
||||
- conf.CHECK_HEADERS('shadow.h sys/acl.h')
|
||||
- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
|
||||
+ conf.CHECK_HEADERS('shadow.h')
|
||||
+ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h')
|
||||
+
|
||||
+ if Options.options.enable_acl:
|
||||
+ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h')
|
||||
+
|
||||
+ if Options.options.enable_attr:
|
||||
+ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h')
|
||||
+
|
||||
+ if Options.options.enable_libaio:
|
||||
+ conf.CHECK_HEADERS('libaio.h')
|
||||
+
|
||||
+ if Options.options.enable_libcap:
|
||||
+ 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')
|
||||
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,9 +158,10 @@ def configure(conf):
|
||||
conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h')
|
||||
@@ -113,8 +150,9 @@ 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')
|
||||
- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.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('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.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')
|
||||
conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h')
|
||||
@@ -431,20 +480,21 @@ def configure(conf):
|
||||
@@ -443,20 +481,21 @@ def configure(conf):
|
||||
|
||||
strlcpy_in_bsd = False
|
||||
|
||||
@@ -150,7 +140,7 @@ index 827d74f..70cde6f 100644
|
||||
conf.CHECK_CODE('''
|
||||
struct ucred cred;
|
||||
diff --git a/wscript b/wscript
|
||||
index 71ada31..10b16a7 100644
|
||||
index 5e6a928..5443b43 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -69,6 +69,12 @@ def options(opt):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 10b4546edb194ede7a5e8bb5e4c9f5fdc67984eb Mon Sep 17 00:00:00 2001
|
||||
From de39c696a62894fd9c6626d3e2931e42e3407be5 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Wed, 24 Nov 2021 13:33:35 +0800
|
||||
Subject: [PATCH] Fix pyext_PATTERN for cross compilation
|
||||
@@ -25,10 +25,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
|
||||
index a23bd01..af202e0 100644
|
||||
index b2dd1a9..2bd3545 100644
|
||||
--- a/third_party/waf/waflib/Tools/python.py
|
||||
+++ b/third_party/waf/waflib/Tools/python.py
|
||||
@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'):
|
||||
@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'):
|
||||
x = 'MACOSX_DEPLOYMENT_TARGET'
|
||||
if dct[x]:
|
||||
env[x] = conf.environ[x] = str(dct[x])
|
||||
|
||||
17
meta-networking/recipes-support/libtdb/libtdb/run-ptest
Normal file
17
meta-networking/recipes-support/libtdb/libtdb/run-ptest
Normal file
@@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
|
||||
ptestdir=$(dirname "$(readlink -f "$0")")
|
||||
cd "$ptestdir"/tests || exit
|
||||
|
||||
tests=$(find * -type f -name 'tdb1-*')
|
||||
|
||||
for f in replace_testsuite $tests
|
||||
do
|
||||
if test -x ./"$f"; then
|
||||
if ./"$f" > ./"$f".out 2> ./"$f".err; then
|
||||
echo "PASS: $f"
|
||||
else
|
||||
echo "FAIL: $f"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@@ -11,9 +11,10 @@ export PYTHONHASHSEED="1"
|
||||
SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \
|
||||
file://0001-tdb-Add-configure-options-for-packages.patch \
|
||||
file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "8434c9c857d13ce3fa8466f75601f25c3693676b36919f159e0ad6121baf5ce8"
|
||||
SRC_URI[sha256sum] = "0ac226073e3a2db8648da7af744cb95f50766a52feeb001d558b2b321b74a765"
|
||||
|
||||
PACKAGECONFIG ??= "\
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \
|
||||
@@ -22,17 +23,16 @@ PACKAGECONFIG ??= "\
|
||||
|
||||
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
|
||||
inherit waf-samba pkgconfig ptest
|
||||
|
||||
#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
|
||||
#to cross Popen
|
||||
# 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 \
|
||||
@@ -42,6 +42,15 @@ EXTRA_OECONF += "--disable-rpath \
|
||||
--with-libiconv=${STAGING_DIR_HOST}${prefix}\
|
||||
"
|
||||
|
||||
do_install_ptest() {
|
||||
install -d ${D}${PTEST_PATH}/tests
|
||||
install -m 0755 ${B}/bin/tdb1-* ${D}${PTEST_PATH}/tests/
|
||||
install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/
|
||||
install -d ${D}${PTEST_PATH}/tests/test
|
||||
install -m 0644 ${B}/test/*.tdb ${D}${PTEST_PATH}/tests/test/
|
||||
install -m 0644 ${B}/test/*.corrupt ${D}${PTEST_PATH}/tests/test/
|
||||
}
|
||||
|
||||
PACKAGES += "tdb-tools python3-tdb"
|
||||
|
||||
RPROVIDES:${PN}-dbg += "python3-tdb-dbg"
|
||||
Reference in New Issue
Block a user