From 03e1353cb72c7fa4362cf70c802ddd9de62ab186 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 1 Jan 2024 15:49:56 +0800 Subject: libtevent: upgrade 0.14.1 -> 0.16.0 * Remove PACKAGECONFIG[libaio] as libaio is no longer required by libtevent. * Refresh patches. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../0001-Add-configure-options-for-packages.patch | 70 ++++++++++++++-------- ...2-Fix-pyext_PATTERN-for-cross-compilation.patch | 6 +- .../libtevent/avoid-attr-unless-wanted.patch | 11 ++-- .../recipes-support/libtevent/libtevent_0.14.1.bb | 62 ------------------- .../recipes-support/libtevent/libtevent_0.16.0.bb | 61 +++++++++++++++++++ 5 files changed, 113 insertions(+), 97 deletions(-) delete mode 100644 meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb create mode 100644 meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index cb66adba9c..7fdeec61f4 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From d9fd1c52d1646254944bfee37be611e04d4daddb Mon Sep 17 00:00:00 2001 +From c2241d7a1371ece3b89dfdad4861dcf0a152d5d4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu 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 @@ -24,16 +23,20 @@ Signed-off-by: Changqing Li Update patch to version 0.14.1 Signed-off-by: Wang Mingyu + +Rebase to 0.16.0 +Remove libaio option +Signed-off-by: Yi Zhao --- - lib/replace/wscript | 85 +++++++++++++++++++++++++++++++++++---------- - wscript | 6 ++++ - 2 files changed, 73 insertions(+), 18 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 5c2b750..28835ac 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') @@ -51,13 +54,6 @@ index 5c2b750..28835ac 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') @@ -75,7 +71,7 @@ index 5c2b750..28835ac 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -38,12 +73,27 @@ def configure(conf): +@@ -38,12 +66,24 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -96,28 +92,25 @@ index 5c2b750..28835ac 100644 + 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('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') conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') -@@ -113,8 +163,9 @@ def configure(conf): +@@ -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') -@@ -436,20 +487,18 @@ def configure(conf): +@@ -443,31 +484,32 @@ def configure(conf): strlcpy_in_bsd = False @@ -126,6 +119,17 @@ index 5c2b750..28835ac 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 +- # (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'): @@ -138,12 +142,26 @@ index 5c2b750..28835ac 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 ++ # (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') @@ -151,7 +169,7 @@ index 5c2b750..28835ac 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 0f6e92f..5a54f3a 100644 +index d912a8a..484a6fa 100644 --- a/wscript +++ b/wscript @@ -28,6 +28,12 @@ def options(opt): @@ -168,5 +186,5 @@ index 0f6e92f..5a54f3a 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.34.1 +2.25.1 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 index ba3f4ca7a6..f1b8f8e9b1 100644 --- 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 @@ -1,4 +1,4 @@ -From da1dc659fd351ff6283f843eeba5e0b3f7b2d584 Mon Sep 17 00:00:00 2001 +From 2bb7bf2d945d4ea0dafe3858adc6b8faae18b1e8 Mon Sep 17 00:00:00 2001 From: Yi Zhao 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 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]) 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 e15f14ab78..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,19 +1,18 @@ -From 82dc31b72e77f263574645092ba1597a8f1152e7 Mon Sep 17 00:00:00 2001 +From ace8fed037ec3d03f65f861b4da217faff94015b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 25 Dec 2020 15:10:58 +0900 Subject: [PATCH] avoid attr unless wanted +Upstream-Status: Inappropriate [embedded specific] --- -Upstream-Status: Pending - lib/replace/wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 21a746a..6be3276 100644 +index 452c741..61fcde0 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -968,8 +968,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' @@ -22,7 +21,7 @@ index 21a746a..6be3276 100644 if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -984,7 +982,7 @@ def build(bld): +@@ -999,7 +997,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, provide_builtin_linking=True, diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb deleted file mode 100644 index 9a2b5ede27..0000000000 --- a/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb +++ /dev/null @@ -1,62 +0,0 @@ -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" - -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] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" - -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[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 \ - --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 = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" - -INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb new file mode 100644 index 0000000000..0158f8bc74 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb @@ -0,0 +1,61 @@ +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" + +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] = "1aa58f21017ed8c2f606ae84aa7e795b5439edd4dd5f68f1a388a7d6fb40f682" + +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 = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" + +INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" -- cgit v1.2.3-54-g00ecf