From cf1dd83b6fbbacc0e845137cf832990aa4cf1fc2 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 1 Jan 2024 15:49:55 +0800 Subject: libtalloc: upgrade 2.4.0 -> 2.4.1 * Remove PACKAGECONFIG[libaio] as libaio is no longer required by libtalloc. * Add ptest. * Refresh patches. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...talloc-Add-configure-options-for-packages.patch | 52 +++++++++---------- ...2-Fix-pyext_PATTERN-for-cross-compilation.patch | 6 +-- .../libtalloc/avoid-attr-unless-wanted.patch | 11 ++-- .../recipes-support/libtalloc/libtalloc/run-ptest | 17 ++++++ .../recipes-support/libtalloc/libtalloc_2.4.0.bb | 55 -------------------- .../recipes-support/libtalloc/libtalloc_2.4.1.bb | 60 ++++++++++++++++++++++ 6 files changed, 110 insertions(+), 91 deletions(-) create mode 100644 meta-networking/recipes-support/libtalloc/libtalloc/run-ptest delete mode 100644 meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb create mode 100644 meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch index 026a348992..45d847c852 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From 888bfe48236b4ce382dc3aa49791cadb70a1fbe4 Mon Sep 17 00:00:00 2001 +From 18e3d62f5c8f957acc45695cb99c24510d23b457 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 25 Dec 2020 14:14:08 +0900 Subject: [PATCH] talloc: Add configure options for packages @@ -6,7 +6,6 @@ Subject: [PATCH] talloc: Add configure options for packages Add configure options for the following packages: - acl - attr - - libaio - libbsd - libcap - valgrind @@ -21,16 +20,20 @@ Signed-off-by: Joe Slater Modified tp apply to version 2.2.0 Signed-off-by: Changqing Li + +Rebase to 2.4.1 +Remove libaio option +Signed-off-by: Yi Zhao --- - lib/replace/wscript | 89 +++++++++++++++++++++++++++++++++++---------- + lib/replace/wscript | 78 +++++++++++++++++++++++++++++++++------------ wscript | 7 +++- - 2 files changed, 75 insertions(+), 21 deletions(-) + 2 files changed, 64 insertions(+), 21 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 827d74f..0348715 100644 +index 199e636..3593eaf 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 +51,6 @@ index 827d74f..0348715 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,49 +68,51 @@ index 827d74f..0348715 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -35,12 +70,25 @@ def configure(conf): +@@ -38,18 +66,27 @@ 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') -+ + 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') + conf.CHECK_HEADERS('sys/vfs.h sys/xattr.h termio.h termios.h sys/file.h') + conf.CHECK_HEADERS('sys/ucontext.h sys/wait.h sys/stat.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,8 +158,9 @@ def configure(conf): + if not conf.CHECK_DECLS('malloc', headers='stdlib.h'): + conf.CHECK_HEADERS('malloc.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('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') -@@ -431,20 +480,20 @@ def configure(conf): +@@ -443,20 +481,20 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,7 +148,7 @@ index 827d74f..0348715 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 3089663..fdf9510 100644 +index 075f1ec..6b4f273 100644 --- a/wscript +++ b/wscript @@ -31,7 +31,12 @@ def options(opt): diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 058ac34f81..59461412a6 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 6580e8191c219909d50c991662310e668973722d Mon Sep 17 00:00:00 2001 +From 843d1dc810efc61275b1121d6b35649d00570851 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 @@ -40,10 +40,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/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch index fe8d10d6f4..93c8a1e846 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -1,19 +1,18 @@ -From e18370c204056de799064d8ac72a656eb3745f95 Mon Sep 17 00:00:00 2001 +From 9130d340c37861a59e812e334e2b13577e705a6c 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 0348715..a8554d9 100644 +index 3593eaf..504a1cb 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -967,8 +967,6 @@ def build(bld): +@@ -968,8 +968,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 0348715..a8554d9 100644 if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -983,7 +981,7 @@ def build(bld): +@@ -984,7 +982,7 @@ def build(bld): # hide_symbols=bld.BUILTIN_LIBRARY('replace'), private_library=True, provide_builtin_linking=True, diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest b/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest new file mode 100644 index 0000000000..84e5381501 --- /dev/null +++ b/meta-networking/recipes-support/libtalloc/libtalloc/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite talloc_testsuite" + +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/libtalloc/libtalloc_2.4.0.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb deleted file mode 100644 index f8fef9f825..0000000000 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.0.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "https://talloc.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ - file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \ - " - -export PYTHONHASHSEED="1" - -SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ - file://0001-talloc-Add-configure-options-for-packages.patch \ - file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ -" -SRC_URI[sha256sum] = "6df36862c42466ef88f360444513870ef46934f9016c84383cc4008a7d0c46ba" - -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}/talloc-${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 \ - --disable-silent-rules \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES += "pytalloc pytalloc-dev" - -RPROVIDES:${PN}-dbg += "pytalloc-dbg" - -FILES:pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpytalloc-util.so.2 \ - ${libdir}/libpytalloc-util.so.2.1.1 \ - " -FILES:pytalloc-dev = "${libdir}/libpytalloc-util.so" -RDEPENDS:pytalloc = "python3" diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb new file mode 100644 index 0000000000..bf7fbc8649 --- /dev/null +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb @@ -0,0 +1,60 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "https://talloc.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ + file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \ + " + +export PYTHONHASHSEED="1" + +SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ + file://0001-talloc-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "410a547f08557007be0e88194f218868358edc0ab98c98ba8c167930db3d33f9" + +inherit waf-samba pkgconfig ptest + +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}/talloc-${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 \ + --disable-silent-rules \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/*_testsuite ${D}${PTEST_PATH}/tests/ +} + +PACKAGES += "pytalloc pytalloc-dev" + +RPROVIDES:${PN}-dbg += "pytalloc-dbg" + +FILES:pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpytalloc-util.so.2 \ + ${libdir}/libpytalloc-util.so.2.1.1 \ + " +FILES:pytalloc-dev = "${libdir}/libpytalloc-util.so" +RDEPENDS:pytalloc = "python3" -- cgit v1.2.3-54-g00ecf