diff options
Diffstat (limited to 'meta-networking/recipes-support/libtevent')
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch (renamed from meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch) | 81 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch | 32 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch | 42 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch | 13 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/run-ptest | 17 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb | 57 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb | 62 |
7 files changed, 179 insertions, 125 deletions
diff --git a/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index 42da2468f2..7fdeec61f4 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From c012aa03613e6e74a0598185b222c7b531df1e2d Mon Sep 17 00:00:00 2001 +From c2241d7a1371ece3b89dfdad4861dcf0a152d5d4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 15:03:17 +0900 Subject: [PATCH] Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -21,16 +20,23 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> Update patch to version 0.10.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Update patch to version 0.14.1 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> + +Rebase to 0.16.0 +Remove libaio option +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 87 ++++++++++++++++++++++++++++++++++----------- - wscript | 6 ++++ - 2 files changed, 73 insertions(+), 20 deletions(-) + lib/replace/wscript | 100 +++++++++++++++++++++++++++++++------------- + wscript | 6 +++ + 2 files changed, 77 insertions(+), 29 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index a2bc604..e4642e8 100644 +index 77e655b..452c741 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') @@ -48,13 +54,6 @@ index a2bc604..e4642e8 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') @@ -72,7 +71,7 @@ index a2bc604..e4642e8 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -34,12 +69,25 @@ def configure(conf): +@@ -38,12 +66,24 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -82,39 +81,36 @@ index a2bc604..e4642e8 100644 + 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 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') -@@ -121,8 +169,9 @@ 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 +153,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('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') -@@ -418,20 +467,18 @@ def configure(conf): +@@ -443,31 +484,32 @@ def configure(conf): strlcpy_in_bsd = False @@ -123,6 +119,17 @@ index a2bc604..e4642e8 100644 - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', - checklibc=True): - strlcpy_in_bsd = True +- elif conf.env.enable_fuzzing: +- # Just to complicate it more, some versions of Honggfuzz have +- # got strlcpy and strlcat in libc, but not in <string.h> +- # (unless it is there coincidentally, on a BSD). Therefore we +- # can't use CHECK_FUNCS alone to decide whether to add the +- # headers to replace.h. +- # +- # As this is only known to happen on a fuzzing compiler, we'll +- # skip the check when not in fuzzing mode. +- conf.CHECK_HEADERS('bsd/string.h') +- - if not conf.CHECK_FUNCS('getpeereid'): - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): @@ -135,12 +142,26 @@ index a2bc604..e4642e8 100644 + if Options.options.enable_libbsd: + # libbsd on some platforms provides strlcpy and strlcat + if not conf.CHECK_FUNCS('strlcpy strlcat'): -+ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -+ checklibc=True) ++ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True): ++ strlcpy_in_bsd = True ++ elif conf.env.enable_fuzzing: ++ # Just to complicate it more, some versions of Honggfuzz have ++ # got strlcpy and strlcat in libc, but not in <string.h> ++ # (unless it is there coincidentally, on a BSD). Therefore we ++ # can't use CHECK_FUNCS alone to decide whether to add the ++ # headers to replace.h. ++ # ++ # As this is only known to happen on a fuzzing compiler, we'll ++ # skip the check when not in fuzzing mode. ++ conf.CHECK_HEADERS('bsd/string.h') ++ + if not conf.CHECK_FUNCS('getpeereid'): + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS('setproctitle_init'): ++ conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') + + if not conf.CHECK_FUNCS('closefrom'): + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') @@ -148,10 +169,10 @@ index a2bc604..e4642e8 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 93af416..a0898b1 100644 +index d912a8a..484a6fa 100644 --- a/wscript +++ b/wscript -@@ -25,6 +25,12 @@ def options(opt): +@@ -28,6 +28,12 @@ def options(opt): opt.RECURSE('lib/replace') opt.RECURSE('lib/talloc') diff --git a/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch deleted file mode 100644 index e3aeda9c33..0000000000 --- a/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ba1de909c587b6773a39ba9f6f9890987f35b24 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 11:30:53 +0800 -Subject: [PATCH] libtevent: fix musl libc compile error - -libldb depend on libtevent, build libldb with musl libc, -will report error: -tevent.h:1440:8: error: unknown type name 'pid_t'; did you mean 'div_t'? - -add missing headers to fix it. - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - tevent.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tevent.h b/tevent.h -index aa6fe0d..2572696 100644 ---- a/tevent.h -+++ b/tevent.h -@@ -32,6 +32,8 @@ - #include <talloc.h> - #include <sys/time.h> - #include <stdbool.h> -+#include <sys/stat.h> -+#include <sys/types.h> - - struct tevent_context; - struct tevent_ops; --- -2.7.4 - diff --git a/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..f1b8f8e9b1 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,42 @@ +From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 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 + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so +/usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/_tevent.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so +/usr/lib/python3.10/site-packages/_tevent.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 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 b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -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]) +- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.25.1 + diff --git a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index b71192b7d2..a8cddcd045 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -1,17 +1,18 @@ -From 6c4a634cdf70147f773bb1806692c78bbb95c6f2 Mon Sep 17 00:00:00 2001 +From ace8fed037ec3d03f65f861b4da217faff94015b Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 15:10:58 +0900 -Subject: [PATCH] test +Subject: [PATCH] avoid attr unless wanted +Upstream-Status: Inappropriate [embedded specific] --- lib/replace/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index e4642e8..163e94d 100644 +index 452c741..61fcde0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -945,8 +945,6 @@ def build(bld): +@@ -983,8 +983,6 @@ def build(bld): if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c' if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c' if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c' @@ -20,10 +21,10 @@ index e4642e8..163e94d 100644 if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -960,7 +958,7 @@ def build(bld): - # at the moment: +@@ -999,7 +997,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, + provide_builtin_linking=True, - deps='dl attr' + extra_libs) + deps='dl' + extra_libs) diff --git a/meta-networking/recipes-support/libtevent/libtevent/run-ptest b/meta-networking/recipes-support/libtevent/libtevent/run-ptest new file mode 100644 index 0000000000..19f7a4a3a6 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite test_tevent_tag test_tevent_trace" + +for f in $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 diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb deleted file mode 100644 index 21f83ad35e..0000000000 --- a/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://tevent.samba.org" -SECTION = "libs" -LICENSE = "LGPLv3+" - -DEPENDS += "libtalloc libtirpc" -RDEPENDS_python3-tevent = "python3" - -SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://options-0.10.0.patch \ - file://0001-libtevent-fix-musl-libc-compile-error.patch \ -" -LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" - -SRC_URI[md5sum] = "105c7a4dbb96f1751eb27dfd05e7fa84" -SRC_URI[sha256sum] = "f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696" - -inherit waf-samba - -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" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/tevent-${PV}" - -#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}\ - --without-gettext \ - " -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 _tevent.*.so _tevent.so -} - -PACKAGES += "python3-tevent" - -RPROVIDES_${PN}-dbg += "python3-tevent-dbg" - -FILES_python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" - -INSANE_SKIP_${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb new file mode 100644 index 0000000000..0a37d7977d --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "https://tevent.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0-or-later" + +DEPENDS += "libtalloc libtirpc cmocka" +RDEPENDS:python3-tevent = "python3" + +export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" + +SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ + file://0001-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ + " + +LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" + +SRC_URI[sha256sum] = "362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e" + +inherit pkgconfig ptest waf-samba + +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[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/tevent-${PV}" + +# 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 \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + --without-gettext \ + " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_tevent_* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ +} + +PACKAGES += "python3-tevent" + +RPROVIDES:${PN}-dbg += "python3-tevent-dbg" + +FILES:python3-tevent = "${PYTHON_SITEPACKAGES_DIR}/*" + +INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" |