From 91fa0cd42a9e1ea6b0df3a3399064fdff3e3f543 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sat, 18 Feb 2023 14:37:53 +0800 Subject: libtevent: upgrade 0.13.0 -> 0.14.1 0001-Add-configure-options-for-packages.patch refreshed for new version. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-Add-configure-options-for-packages.patch | 25 ++++---- .../recipes-support/libtevent/libtevent_0.13.0.bb | 69 ---------------------- .../recipes-support/libtevent/libtevent_0.14.1.bb | 68 +++++++++++++++++++++ 3 files changed, 82 insertions(+), 80 deletions(-) delete mode 100644 meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb create mode 100644 meta-networking/recipes-support/libtevent/libtevent_0.14.1.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 d98559b4ef..cb66adba9c 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 @@ -21,13 +21,16 @@ Signed-off-by: Joe Slater Update patch to version 0.10.0 Signed-off-by: Changqing Li + +Update patch to version 0.14.1 +Signed-off-by: Wang Mingyu --- - lib/replace/wscript | 87 ++++++++++++++++++++++++++++++++++----------- + lib/replace/wscript | 85 +++++++++++++++++++++++++++++++++++---------- wscript | 6 ++++ - 2 files changed, 73 insertions(+), 20 deletions(-) + 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 4c774d9..21a746a 100644 +index 5c2b750..28835ac 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -72,7 +75,7 @@ index 4c774d9..21a746a 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,12 +73,27 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -82,8 +85,8 @@ index 4c774d9..21a746a 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') + @@ -99,10 +102,10 @@ index 4c774d9..21a746a 100644 + 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,8 +158,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 +163,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') @@ -114,7 +117,7 @@ index 4c774d9..21a746a 100644 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') -@@ -434,20 +483,18 @@ def configure(conf): +@@ -436,20 +487,18 @@ def configure(conf): strlcpy_in_bsd = False @@ -148,7 +151,7 @@ index 4c774d9..21a746a 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 5c6f02c..75eecd4 100644 +index 0f6e92f..5a54f3a 100644 --- a/wscript +++ b/wscript @@ -28,6 +28,12 @@ def options(opt): @@ -165,5 +168,5 @@ index 5c6f02c..75eecd4 100644 def configure(conf): conf.RECURSE('lib/replace') -- -2.25.1 +2.34.1 diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb deleted file mode 100644 index 0d898be82e..0000000000 --- a/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb +++ /dev/null @@ -1,69 +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" -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 \ - " - -SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" - -LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" - -SRC_URI[md5sum] = "9f413f3184f79a4deecd9444242a5dca" -SRC_URI[sha256sum] = "b9437a917fa55344361beb64ec9e0042e99cae8879882a62dd38f6abe2371d0c" - -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=cmocka \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - --without-gettext \ - " - -do_install:append() { - install -Dm 0755 ${B}/bin/test_tevent_trace ${D}${bindir}/test_tevent_trace - install -Dm 0755 ${B}/bin/test_tevent_tag ${D}${bindir}/test_tevent_tag - install -Dm 0755 ${B}/bin/replace_testsuite ${D}${bindir}/replace_testsuite -} - -PACKAGES += "python3-tevent" - -RPROVIDES:${PN}-dbg += "python3-tevent-dbg" - -FILES:${PN} += "${libdir}/tevent/*" -FILES:${PN}-ptest += "${bindir}/replace_testsuite \ - ${bindir}/test_tevent_tag \ - ${bindir}/test_tevent_trace \ - ${libdir}/libcmocka-tevent.so" -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.14.1.bb b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb new file mode 100644 index 0000000000..b34c186ca5 --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb @@ -0,0 +1,68 @@ +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" +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 \ + " + +SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" + +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=cmocka \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + --without-gettext \ + " + +do_install:append() { + install -Dm 0755 ${B}/bin/test_tevent_trace ${D}${bindir}/test_tevent_trace + install -Dm 0755 ${B}/bin/test_tevent_tag ${D}${bindir}/test_tevent_tag + install -Dm 0755 ${B}/bin/replace_testsuite ${D}${bindir}/replace_testsuite +} + +PACKAGES += "python3-tevent" + +RPROVIDES:${PN}-dbg += "python3-tevent-dbg" + +FILES:${PN} += "${libdir}/tevent/*" +FILES:${PN}-ptest += "${bindir}/replace_testsuite \ + ${bindir}/test_tevent_tag \ + ${bindir}/test_tevent_trace \ + ${libdir}/libcmocka-tevent.so" +FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" + +INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" -- cgit v1.2.3-54-g00ecf