diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
34 files changed, 407 insertions, 170 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.3.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.3.bb index d0e2c4b540..420cc78ca4 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.3.bb @@ -53,14 +53,6 @@ USERADD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '${PN}', ' USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--system -d / -M --shell /bin/nologin chronyd;', '', d)}" # Configuration options: -# - For command line editing support in chronyc, you may specify either -# 'editline' or 'readline' but not both. editline is smaller, but -# many systems already have readline for other purposes so you might want -# to choose that instead. However, beware license incompatibility -# since chrony is GPLv2 and readline versions after 6.0 are GPLv3+. -# You can of course choose neither, but if you're that tight on space -# consider dropping chronyc entirely (you can use it remotely with -# appropriate chrony.conf options). # - Security-related: # - 'sechash' is omitted by default because it pulls in nss which is huge. # - 'privdrop' allows chronyd to run as non-root; would need changes to @@ -70,14 +62,11 @@ USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'privdrop', '--sys PACKAGECONFIG ??= "editline \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " -PACKAGECONFIG[readline] = "--without-editline,--disable-readline,readline" PACKAGECONFIG[editline] = ",--without-editline,libedit" PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" -PACKAGECONFIG[privdrop] = "--with-libcap,--disable-privdrop --without-libcap,libcap" +PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp" PACKAGECONFIG[ipv6] = ",--disable-ipv6," -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" # --disable-static isn't supported by chrony's configure script. DISABLE_STATIC = "" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb deleted file mode 100644 index 793b61d712..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.87.bb +++ /dev/null @@ -1,7 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.87.sha256sum] = "ae39bffde9c37e4d64849b528afeb060be6bad6d1044a3bd94a49fce41357284" -SRC_URI += "\ - file://lua.patch \ -" - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb new file mode 100644 index 0000000000..52ee9aa96e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.88.bb @@ -0,0 +1,7 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.88.sha256sum] = "da9d26aa3f3fc15f3b58b94edbb9ddf744cbce487194ea480bd8e7381b3ca028" +SRC_URI += "\ + file://lua.patch \ +" + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-replace-off64_t-with-off_t.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-replace-off64_t-with-off_t.patch new file mode 100644 index 0000000000..2841d0feaf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-replace-off64_t-with-off_t.patch @@ -0,0 +1,48 @@ +From 5adae6737e919d957a08df437951ccb6996f9882 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 21 Dec 2022 19:16:03 -0800 +Subject: [PATCH 1/2] replace off64_t with off_t + +off_t is already 64-bits when _FILE_OFFSET_BITS=64 +using off_t also makes it portable on musl systems + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + user/v9/drbdadm_main.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/user/v9/drbdadm_main.c b/user/v9/drbdadm_main.c +index 91e9507d..2030946c 100644 +--- a/user/v9/drbdadm_main.c ++++ b/user/v9/drbdadm_main.c +@@ -1264,11 +1264,11 @@ static int adm_resource(const struct cfg_ctx *ctx) + return ex; + } + +-static off64_t read_drbd_dev_size(int minor) ++static off_t read_drbd_dev_size(int minor) + { + char *path; + FILE *file; +- off64_t val; ++ off_t val; + int r; + + m_asprintf(&path, "/sys/block/drbd%d/size", minor); +@@ -1289,9 +1289,9 @@ int adm_resize(const struct cfg_ctx *ctx) + char *argv[MAX_ARGS]; + struct d_option *opt; + bool is_resize = !strcmp(ctx->cmd->name, "resize"); +- off64_t old_size = -1; +- off64_t target_size = 0; +- off64_t new_size; ++ off_t old_size = -1; ++ off_t target_size = 0; ++ off_t new_size; + int argc = 0; + int silent; + int ex; +-- +2.39.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch new file mode 100644 index 0000000000..45f7d6d415 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch @@ -0,0 +1,96 @@ +From b70e5bf5bfa5fa2c2fffe08bcf300da1d3583602 Mon Sep 17 00:00:00 2001 +From: Lars Ellenberg <lars.ellenberg@linbit.com> +Date: Wed, 9 Nov 2022 11:01:54 +0100 +Subject: [PATCH 2/2] drbdadm: drop use of GLOB_MAGCHAR, use strchr heuristic only + +Fixup for +2022-09-05 4a1b5900 drbdadm: allow files from an expanded include glob to vanish + +When using the `include` statement, if the glob did not match any file, +there is nothing to do, silently ignore. Unless it was no glob, but a literal, +which we would expect to exist. + +Also, there is a race between expanding a glob and accessing the file. +That also should not happen for literals, though. + +Since we still had the heuristic anyways, because apparently |GLOB_MAGCHAR +does not happen for GLOB_NOMATCH returns, and there exist non-GNU libc that +don't (and likely won't) implement that extension, just forget about +(gl_flags & GLOB_MAGCHAR) but use the incomplete strchr heuristic only. + +Sourced From Alpine: https://git.alpinelinux.org/aports/tree/main/drbd-utils/drop_use_of_GLOB_MAGCHAR.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + user/v9/drbdadm_parser.c | 35 ++++++++++++++++++++--------------- + 1 file changed, 20 insertions(+), 15 deletions(-) + +diff --git a/user/v9/drbdadm_parser.c b/user/v9/drbdadm_parser.c +index b2f6ed8a..9a0a775d 100644 +--- a/user/v9/drbdadm_parser.c ++++ b/user/v9/drbdadm_parser.c +@@ -1947,14 +1947,29 @@ void include_stmt(char *str) + size_t i; + int r; + +- cwd = pushd_to_current_config_file_unless_stdin(); +- +- /* """ ++ /* ++ * If the glob did not match any file, ++ * there is nothing to do, silently ignore. ++ * Unless it was no glob, but a literal, ++ * which we would expect to exist. ++ * ++ * """ + * As a GNU extension, pglob->gl_flags is set to the + * flags specified, ored with GLOB_MAGCHAR if any + * metacharacters were found. + * """ ++ * ++ * But apparently |GLOB_MAGCHAR does not happen for GLOB_NOMATCH returns, ++ * at least not consistently :-( ++ * Also, there exist non-GNU libc ++ * So we have this incomplete strchr heuristic anyways. + */ ++ bool contains_glob_magic_char = ++ strchr(str, '*') || ++ strchr(str, '?') || ++ strchr(str, '['); ++ ++ cwd = pushd_to_current_config_file_unless_stdin(); + r = glob(str, 0, NULL, &glob_buf); + if (r == 0) { + for (i=0; i<glob_buf.gl_pathc; i++) { +@@ -1965,7 +1980,7 @@ void include_stmt(char *str) + if (f) { + include_file(f, strdup(glob_buf.gl_pathv[i])); + fclose(f); +- } else if (errno == ENOENT && glob_buf.gl_flags & GLOB_MAGCHAR) { ++ } else if (errno == ENOENT && contains_glob_magic_char) { + /* Noisily ignore race between glob expansion + * and actual open. */ + err("%s:%d: include file vanished after glob expansion '%s'.\n", +@@ -1979,17 +1994,7 @@ void include_stmt(char *str) + } + globfree(&glob_buf); + } else if (r == GLOB_NOMATCH) { +- /* +- * If the glob did not match any file, +- * there is nothing to do, silently ignore. +- * Unless it was no glob, but a literal, +- * which we would expect to exist. +- * Apparently |GLOB_MAGCHAR does not happen for GLOB_NOMATCH returns, +- * at least not consistently :-( +- * So we have this strchr heuristic anyways. +- */ +- /* if (!(glob_buf.gl_flags & GLOB_MAGCHAR)) { */ +- if (!strchr(str, '?') && !strchr(str, '*') && !strchr(str, '[')) { ++ if (!contains_glob_magic_char) { + err("%s:%d: Failed to open include file '%s'.\n", + config_save, line, str); + config_valid = 0; +-- +2.39.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.22.0.bb index deaab641e2..89bf529165 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.20.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.22.0.bb @@ -8,14 +8,15 @@ SECTION = "admin" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ +SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;protocol=https \ git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ + file://0001-replace-off64_t-with-off_t.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ " - -SRCREV_drbd-utils = "087ee6b4961ca154d76e4211223b03149373bed8" -SRCREV_drbd-headers = "f1529aa84e9d2f66c96ad283a1bbb708aabf03f7" +SRC_URI:append:libc-musl = " file://0002-drbdadm-drop-use-of-GLOB_MAGCHAR-use-strchr-heuristi.patch " +SRCREV_drbd-utils = "409097fe02187f83790b88ac3e0d94f3c167adab" +SRCREV_drbd-headers = "9a0f151fa0085f57910a2dcbbd658d6069554f62" SRCREV_FORMAT = "drbd-utils_drbd-headers" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.2.1.bb index 0766f7f4bd..48ce2abf09 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.2.1.bb @@ -8,10 +8,10 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" DEPENDS = "virtual/kernel" -SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ +SRC_URI = "https://pkg.linbit.com//downloads/drbd/9/${BP}.tar.gz \ file://check_existence_of_modules_before_installing.patch \ " -SRC_URI[sha256sum] = "14970459f55bc465503b88b24d1a266b2ace0d69fe3cb387005b8477cd6475ed" +SRC_URI[sha256sum] = "f59ee795188f21d4a62c5319c371ebad65ab3fb9b55e5212c3f1dd558978a843" inherit module diff --git a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb index 7d37f41096..b0958e6975 100644 --- a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -10,6 +10,7 @@ DEPENDS += "ethtool \ librepo \ libnet \ libpcap \ + libpcre \ ncurses \ openssl \ zlib \ diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch index 74f8d8ad0b..e215242371 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch @@ -1,4 +1,4 @@ -From 00500909ebb0f51dd3b4e90c665f07158e7fe255 Mon Sep 17 00:00:00 2001 +From 69c409195ede704ed7e9298ed4942cc70a52e099 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 25 Jun 2019 14:25:08 +0800 Subject: [PATCH] do not import target module while cross compile @@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 5f080dd..cdc115e 100644 +index 7d2d855..01dcb56 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -4,6 +4,7 @@ import sys @@ -28,9 +28,9 @@ index 5f080dd..cdc115e 100644 from wafsamba import samba_utils +import importlib.util, os - def PRIVATE_NAME(bld, name, private_extension, private_library): + def PRIVATE_NAME(bld, name): '''possibly rename a library to include a bundled extension''' -@@ -249,17 +250,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): +@@ -241,17 +242,27 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'): # versions minversion = minimum_library_version(conf, libname, minversion) @@ -67,5 +67,5 @@ index 5f080dd..cdc115e 100644 Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) sys.exit(1) -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch index a55d46bf75..988931c490 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From 100d16aaa6fe9a28a5ba77b2de2bde81a3fa3dac Mon Sep 17 00:00:00 2001 +From b4e04e5dd13c9de8b336f7d0c254973a225e3b5f Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 1 Jul 2019 16:14:16 +0800 Subject: [PATCH] ldb: Add configure options for packages @@ -26,7 +26,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 2c856b6..36b696d 100644 +index 4c774d9..63c9967 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -101,7 +101,7 @@ index 2c856b6..36b696d 100644 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): +@@ -110,8 +158,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') @@ -113,7 +113,7 @@ index 2c856b6..36b696d 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') -@@ -418,20 +467,21 @@ def configure(conf): +@@ -434,20 +483,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,10 +150,10 @@ index 2c856b6..36b696d 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index bf6129b..722fdf6 100644 +index 60bb7cf..7f14847 100644 --- a/wscript +++ b/wscript -@@ -39,6 +39,14 @@ def options(opt): +@@ -40,6 +40,14 @@ def options(opt): help='disable new LMDB backend for LDB', action='store_true', dest='without_ldb_lmdb', default=False) @@ -169,5 +169,5 @@ index bf6129b..722fdf6 100644 def configure(conf): conf.RECURSE('lib/tdb') -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch index 382a19ced6..acd521e69f 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From c67c7cee024150fcbdca18764a026aed8724d7ae Mon Sep 17 00:00:00 2001 +From d9f4d5bbd3e58ca7fd7cbc4ab7656fe27bf4c346 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 @@ -42,18 +42,18 @@ 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 b1c8dd0..24faa31 100644 +index a23bd01..af202e0 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'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: - env[x] = conf.environ[x] = dct[x] -- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake + 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.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch index dd1246538c..87909c952a 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch @@ -1,20 +1,21 @@ -From 1f24231095a59debcf25d0e3309dc5d1056a7fad Mon Sep 17 00:00:00 2001 +From cc86b8bdd45ca30bdf65a3b8b0960b27aeb34522 Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 19 Nov 2015 20:45:56 +0100 Subject: [PATCH] avoid openldap unless wanted Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Jens Rehsack <rehsack@gmail.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wscript b/wscript -index 722fdf6..22700d5 100644 +index 7f14847..092da2d 100644 --- a/wscript +++ b/wscript -@@ -153,9 +153,7 @@ def configure(conf): +@@ -154,9 +154,7 @@ def configure(conf): if conf.env.standalone_ldb: conf.CHECK_XSLTPROC_MANPAGES() @@ -26,5 +27,5 @@ index 722fdf6..22700d5 100644 # we don't want any libraries or modules to rely on runtime # resolution of symbols -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-conflict-type-error.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch index 444fa3ff12..8e756d8d3a 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-conflict-type-error.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch @@ -1,7 +1,7 @@ -From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001 +From a37eb0a46669592e32ed4e004abb2698ee4f90c5 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] libldb: fix musl libc conflicting types error +Subject: [PATCH] cmocka: fix musl libc conflicting types error /third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' typedef unsigned int uintptr_t; @@ -16,19 +16,19 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index 4fd82a9..5443a08 100644 +index e6861c8..238201d 100644 --- a/third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h -@@ -110,7 +110,7 @@ typedef uintmax_t LargestIntegralType; +@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; ((LargestIntegralType)(value)) /* Smallest integral type capable of holding a pointer. */ -#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) ++#if !defined(__DEFINED_uintptr_t) # if defined(_WIN32) /* WIN32 is an ILP32 platform */ typedef unsigned int uintptr_t; -@@ -134,9 +134,8 @@ typedef uintmax_t LargestIntegralType; +@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; # endif /* __WORDSIZE */ # endif /* _WIN32 */ @@ -36,10 +36,10 @@ index 4fd82a9..5443a08 100644 -# define _UINTPTR_T_DEFINED -#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ +# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) ++#endif /* !defined(__DEFINED_uintptr_t) */ /* Perform an unsigned cast to uintptr_t. */ #define cast_to_pointer_integral_type(value) \ -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.4.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.6.1.bb index af5f0427d4..7c7701acc3 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.6.1.bb @@ -1,18 +1,21 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://ldb.samba.org" +HOMEPAGE = "https://ldb.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" DEPENDS += "libtdb libtalloc libtevent popt" RDEPENDS:pyldb += "python3" +export PYTHONHASHSEED="1" + SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-do-not-import-target-module-while-cross-compile.patch \ file://0002-ldb-Add-configure-options-for-packages.patch \ - file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ - file://libldb-fix-musl-libc-conflict-type-error.patch \ + file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \ " +SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" + PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ @@ -26,14 +29,14 @@ PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://0003-avoid-openldap-unless-wanted.patch', d)}" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "b01d6913a06901c22c5bc6caedc548ac" -SRC_URI[sha256sum] = "f2e88dcab7b6007d92724b62f8a16e7c6e77275885c60eb4f87097e4aa4082c1" +SRC_URI[md5sum] = "3a5f54f511fb237b83e1f34e2c7e25cd" +SRC_URI[sha256sum] = "467403f77df86782c3965bb175440baa2ed751a9feb9560194bd8c06bf1736c9" inherit pkgconfig waf-samba diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch index 46fef1096b..026a348992 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.2.0.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-talloc-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From 8a82056ba2f70137714f225d82993aa4b11042da Mon Sep 17 00:00:00 2001 +From 888bfe48236b4ce382dc3aa49791cadb70a1fbe4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu <wangmy@cn.fujitsu.com> Date: Fri, 25 Dec 2020 14:14:08 +0900 Subject: [PATCH] talloc: Add configure options for packages @@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 2 files changed, 75 insertions(+), 21 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index a2bc604..2e2e7bf 100644 +index 827d74f..0348715 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -72,7 +72,7 @@ index a2bc604..2e2e7bf 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -34,12 +69,25 @@ def configure(conf): +@@ -35,12 +70,25 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -102,7 +102,7 @@ index a2bc604..2e2e7bf 100644 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): +@@ -110,8 +158,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 +114,7 @@ index a2bc604..2e2e7bf 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') -@@ -418,20 +467,20 @@ def configure(conf): +@@ -431,20 +480,20 @@ def configure(conf): strlcpy_in_bsd = False @@ -150,7 +150,7 @@ index a2bc604..2e2e7bf 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index b955d21..4ac6e1e 100644 +index 3089663..fdf9510 100644 --- a/wscript +++ b/wscript @@ -31,7 +31,12 @@ def options(opt): diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 47ee4bb24e..058ac34f81 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0001-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From b5eaeb7ed4e75012d2715f995e15a13850064f61 Mon Sep 17 00:00:00 2001 +From 6580e8191c219909d50c991662310e668973722d 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 @@ -40,18 +40,18 @@ 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 b1c8dd0..24faa31 100644 +index a23bd01..af202e0 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'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: - env[x] = conf.environ[x] = dct[x] -- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake + 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.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch index 5b7f69ec07..3c85a8a2d4 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch @@ -1,6 +1,17 @@ +From e18370c204056de799064d8ac72a656eb3745f95 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] avoid attr unless wanted + +--- + 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 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -947,8 +947,6 @@ def build(bld): +@@ -967,8 +967,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' @@ -9,13 +20,15 @@ if not bld.CONFIG_SET('HAVE_CLOSEFROM'): REPLACE_SOURCE += ' closefrom.c' -@@ -962,7 +960,7 @@ def build(bld): - # at the moment: +@@ -983,7 +981,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) replace_test_cflags = '' if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'): +-- +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.4.bb index b3f8b2ce25..1c5922205e 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.4.bb @@ -1,17 +1,18 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://talloc.samba.org" +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://options-2.2.0.patch \ - file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://0001-talloc-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ " -SRC_URI[sha256sum] = "6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa" +SRC_URI[sha256sum] = "179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505" inherit waf-samba diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch index c35cab7c2f..93a85e8545 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-tdb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From 71a10c176c34da898c0169371b3c1b032d2f88b1 Mon Sep 17 00:00:00 2001 +From d3b1d23e01e323b9610843ab6bef096512f6c244 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 @@ -19,12 +19,12 @@ Update to 1.4.0 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - lib/replace/wscript | 94 ++++++++++++++++++++++++++++++++++++++++------------- - wscript | 6 ++++ - 2 files changed, 78 insertions(+), 22 deletions(-) + lib/replace/wscript | 92 ++++++++++++++++++++++++++++++++++----------- + wscript | 6 +++ + 2 files changed, 77 insertions(+), 21 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 1d01e1e..2336dc3 100644 +index 827d74f..70cde6f 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -69,7 +69,7 @@ index 1d01e1e..2336dc3 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -34,12 +69,25 @@ def configure(conf): +@@ -35,12 +70,25 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -78,10 +78,9 @@ index 1d01e1e..2336dc3 100644 + 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('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('locale.h ndir.h pwd.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('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') + @@ -114,7 +113,7 @@ index 1d01e1e..2336dc3 100644 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') -@@ -380,20 +429,21 @@ def configure(conf): +@@ -431,20 +480,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -151,7 +150,7 @@ index 1d01e1e..2336dc3 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 5598d02..8d47244 100644 +index 71ada31..10b16a7 100644 --- a/wscript +++ b/wscript @@ -69,6 +69,12 @@ def options(opt): @@ -168,5 +167,5 @@ index 5598d02..8d47244 100644 def configure(conf): conf.env.disable_tdb_mutex_locking = getattr(Options.options, -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 6f221989fa..6bd118b536 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 00bd6680ad38c20c95a35c963d7077269f3a3aa2 Mon Sep 17 00:00:00 2001 +From 10b4546edb194ede7a5e8bb5e4c9f5fdc67984eb 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,18 +25,18 @@ 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 7c45a76..c9a90f7 100644 +index a23bd01..af202e0 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'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: - env[x] = conf.environ[x] = dct[x] -- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake + 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.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.7.bb index 2affcf754e..d4c4f1c371 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.7.bb @@ -1,18 +1,20 @@ SUMMARY = "The tdb library" -HOMEPAGE = "http://tdb.samba.org/" +HOMEPAGE = "https://tdb.samba.org/" SECTION = "libs" LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" +export PYTHONHASHSEED="1" + SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://tdb-Add-configure-options-for-packages.patch \ - file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://0001-tdb-Add-configure-options-for-packages.patch \ + file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ " -SRC_URI[md5sum] = "e638e8890f743624a754304b3f994f4d" -SRC_URI[sha256sum] = "c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b" +SRC_URI[md5sum] = "bc27d5b20c7f013305c40b3bced43b3a" +SRC_URI[sha256sum] = "a4fb168def533f31ff2c07f7d9844bb3131e6799f094ebe77d0380adc987c20e" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ @@ -35,6 +37,7 @@ inherit waf-samba export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ --bundled-libraries=NONE \ --builtin-libraries=replace \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index 42da2468f2..d98559b4ef 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.10.0.patch +++ b/meta-openembedded/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 d9fd1c52d1646254944bfee37be611e04d4daddb 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 @@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index a2bc604..e4642e8 100644 +index 4c774d9..21a746a 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -25,6 +25,41 @@ def options(opt): @@ -72,7 +72,7 @@ index a2bc604..e4642e8 100644 @Utils.run_once def configure(conf): conf.RECURSE('buildtools/wafsamba') -@@ -34,12 +69,25 @@ def configure(conf): +@@ -35,12 +70,25 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -86,7 +86,7 @@ index a2bc604..e4642e8 100644 - 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') + @@ -102,7 +102,7 @@ index a2bc604..e4642e8 100644 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): +@@ -110,8 +158,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 +114,7 @@ index a2bc604..e4642e8 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') -@@ -418,20 +467,18 @@ def configure(conf): +@@ -434,20 +483,18 @@ def configure(conf): strlcpy_in_bsd = False @@ -148,10 +148,10 @@ index a2bc604..e4642e8 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index 93af416..a0898b1 100644 +index 5c6f02c..75eecd4 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-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-libtevent-fix-musl-libc-compile-error.patch deleted file mode 100644 index e3aeda9c33..0000000000 --- a/meta-openembedded/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-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch index 81abac83a4..ba3f4ca7a6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0001-Fix-pyext_PATTERN-for-cross-compilation.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/0002-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 96ddbe6653f87670e4a0bbff229276bbe0aa822a Mon Sep 17 00:00:00 2001 +From da1dc659fd351ff6283f843eeba5e0b3f7b2d584 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,18 +25,18 @@ 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 7c45a76..c9a90f7 100644 +index a23bd01..af202e0 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'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: - env[x] = conf.environ[x] = dct[x] -- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake + 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.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch index b71192b7d2..1e340f3692 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch @@ -1,17 +1,17 @@ -From 6c4a634cdf70147f773bb1806692c78bbb95c6f2 Mon Sep 17 00:00:00 2001 +From 82dc31b72e77f263574645092ba1597a8f1152e7 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 --- 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 21a746a..6be3276 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -945,8 +945,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' @@ -20,10 +20,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: +@@ -984,7 +982,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-openembedded/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch new file mode 100644 index 0000000000..5795ff3bd1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch @@ -0,0 +1,45 @@ +From 1d4dedab5039bb671f44566d8573ee3532ba7176 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 25 Jul 2018 09:55:25 +0800 +Subject: [PATCH] cmocka: fix musl libc conflicting types error + +/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' + typedef unsigned int uintptr_t; + ^~~~~~~~~ +use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined + +Upstream-Status: Pending + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + third_party/cmocka/cmocka.h | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h +index e6861c8..238201d 100644 +--- a/third_party/cmocka/cmocka.h ++++ b/third_party/cmocka/cmocka.h +@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; +@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; + # endif /* __WORDSIZE */ + # endif /* _WIN32 */ + +-# define _UINTPTR_T +-# define _UINTPTR_T_DEFINED +-#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ ++# define __DEFINED_uintptr_t ++#endif /* !defined(__DEFINED_uintptr_t) */ + + /* Perform an unsigned cast to uintptr_t. */ + #define cast_to_pointer_integral_type(value) \ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb index 732880e96c..b3ae63c489 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb @@ -1,20 +1,24 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://tevent.samba.org" +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://options-0.10.0.patch \ - file://0001-libtevent-fix-musl-libc-compile-error.patch \ - file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ -" -LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" + 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] = "105c7a4dbb96f1751eb27dfd05e7fa84" -SRC_URI[sha256sum] = "f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696" +SRC_URI[md5sum] = "9f413f3184f79a4deecd9444242a5dca" +SRC_URI[sha256sum] = "b9437a917fa55344361beb64ec9e0042e99cae8879882a62dd38f6abe2371d0c" inherit pkgconfig waf-samba @@ -38,7 +42,8 @@ S = "${WORKDIR}/tevent-${PV}" export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ + --disable-rpath-install \ + --bundled-libraries=cmocka \ --builtin-libraries=replace \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ --without-gettext \ @@ -48,6 +53,7 @@ PACKAGES += "python3-tevent" RPROVIDES:${PN}-dbg += "python3-tevent-dbg" +FILES:${PN} += "${libdir}/tevent/*" FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.2.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.4.bb index ad7b9a6fab..bc28eb84fe 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.33.4.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ " -SRCREV = "9e2fdefc1ba4c883c5e6aa4f32ab21777980a978" +SRCREV = "eaca70ec362dcf745fc81188f6008528d1b17961" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch new file mode 100644 index 0000000000..4a4fae116a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch @@ -0,0 +1,54 @@ +From dcb5d3e5d47b1e01fdcde575badc51825d4f4681 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Jan 2023 13:36:01 -0800 +Subject: [PATCH] timeSync: Portable way to print 64bit time_t + +This ensures when 64bit time_t is used on 32bit architectures ( +-D_TIME_BITS=64 ) then it can print it correctly as well. + +Fixes +pllLinux.c:43:20: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] +| prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, +| ^~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- + open-vm-tools/services/plugins/timeSync/slewLinux.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/open-vm-tools/services/plugins/timeSync/pllLinux.c b/open-vm-tools/services/plugins/timeSync/pllLinux.c +index e9c8e61de..90ba8c63f 100644 +--- a/open-vm-tools/services/plugins/timeSync/pllLinux.c ++++ b/open-vm-tools/services/plugins/timeSync/pllLinux.c +@@ -38,10 +38,10 @@ + static void + TimeSyncLogPLLState(const char *prefix, struct timex *tx) + { +- g_debug("%s : off %ld freq %ld maxerr %ld esterr %ld status %d " +- "const %ld precision %ld tolerance %ld tick %ld\n", +- prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, +- tx->status, tx->constant, tx->precision, tx->tolerance, tx->tick); ++ g_debug("%s : off %jd freq %jd maxerr %jd esterr %jd status %d " ++ "const %jd precision %jd tolerance %jd tick %jd\n", ++ prefix, (intmax_t)tx->offset, (intmax_t)tx->freq, (intmax_t)tx->maxerror, (intmax_t)tx->esterror, ++ tx->status, (intmax_t)tx->constant, (intmax_t)tx->precision, (intmax_t)tx->tolerance, (intmax_t)tx->tick); + } + + /* +diff --git a/open-vm-tools/services/plugins/timeSync/slewLinux.c b/open-vm-tools/services/plugins/timeSync/slewLinux.c +index 1ab6e3584..0c304b5d7 100644 +--- a/open-vm-tools/services/plugins/timeSync/slewLinux.c ++++ b/open-vm-tools/services/plugins/timeSync/slewLinux.c +@@ -156,6 +156,6 @@ TimeSync_Slew(int64 delta, + g_debug("adjtimex failed: %s\n", strerror(errno)); + return FALSE; + } +- g_debug("time slew start: %ld\n", tx.tick); ++ g_debug("time slew start: %jd\n", (intmax_t)tx.tick); + return TRUE; + } +-- +2.39.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.0.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb index 19e4ee11ed..d389d2450c 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb @@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" LICENSE:modules/solaris = "CDDL-1.0" -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.1.x \ file://tools.conf \ file://vmtoolsd.service \ file://vmtoolsd.init \ @@ -42,6 +42,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=maste file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ + file://0001-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ " UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" @@ -49,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " -SRCREV = "6f5e4b13647b40a45c196dad76b1cb39cc6690b9" +SRCREV = "30339ef6ded308f0147fe80f89b9bca3ace1aef9" S = "${WORKDIR}/git/open-vm-tools" diff --git a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.5.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.6.bb index b0b96bed8f..09752825c2 100644 --- a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.6.bb @@ -5,7 +5,7 @@ SECTION = "net" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "9ca7441add4427a91fe90c34ae4a178ed9a50553" +SRCREV = "999bdd724a1f963ac8bfd0598ffdd2a3d651646e" SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice-gtk_0.4.1.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice-gtk_0.4.1.bb index 58089c0a2d..44b42a3313 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice-gtk_0.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice-gtk_0.4.1.bb @@ -1,7 +1,12 @@ SUMMARY = "A Gtk client and libraries for SPICE remote desktop servers." HOMEPAGE = "https://spice-space.org" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +LICENSE = "LGPL-2.1-only & BSD-3-Clause & GPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://subprojects/spice-common/COPYING;md5=4b54a1fd55a448865a0b32d41598759d \ + file://subprojects/keycodemapdb/LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ + file://subprojects/keycodemapdb/LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ +" SRCREV = "74e673d7c3d9cd281d85c691fbc520107066da01" @@ -33,11 +38,16 @@ DEPENDS = " \ usbutils \ zlib \ " +DEPENDS:append:libc-musl = " libucontext" RDEPENDS:${PN} = "python3-pyparsing python3-six" -inherit meson pkgconfig vala gobject-introspection +inherit meson pkgconfig vala gobject-introspection features_check + +REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OEMESON = "-Dpie=true -Dvapi=enabled -Dintrospection=enabled" +EXTRA_OEMESON:append:libc-musl = " -Dcoroutine=libucontext" + FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.2.bb index 322a826f07..0a541acfea 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.2.bb @@ -26,8 +26,7 @@ SRC_URI = " \ file://run-ptest \ " -SRC_URI[md5sum] = "929a255c71a9933608bd7c31927760f7" -SRC_URI[sha256sum] = "79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe" +SRC_URI[sha256sum] = "f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb index 9cac204998..3892a0e21a 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.1.bb @@ -17,8 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ " -SRC_URI[md5sum] = "84d329d67abc3fb83fc8cb12aeaddaba" -SRC_URI[sha256sum] = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6" +SRC_URI[sha256sum] = "8fc8d5046e855d7588607bb319f5b82e3ba13e91d5d4636863262e6386bbaf76" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" |