Date   

[meta-filesystems][PATCH 4/5] xfstests: Upgrade to v2022.07.10

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
meta-filesystems/recipes-utils/xfstests/xfstests_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb
index 868fa0330f..a6fc89d606 100644
--- a/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb
+++ b/meta-filesystems/recipes-utils/xfstests/xfstests_git.bb
@@ -9,8 +9,8 @@ SRC_URI = "\
git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \
"

-SRCREV_xfstests = "37881397f1aa62df3c63468049c80b301b0e89eb"
-SRCREV_unionmount = "cec4c51a3bf8ba80bb99fc74b302749d4e3d2f1d"
+SRCREV_xfstests = "47ed066309716c73a97fff9b7f557f72d90bffb4"
+SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914"

S = "${WORKDIR}/git"

--
2.37.1


[meta-oe][PATCH V2 3/5] sdbus-c++-libsystemd: Fix build with glibc 2.36

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...lude-linux-fs.h-to-resolve-fsconfig_.patch | 74 +++++++++++++++++++
.../sdbus-c++/sdbus-c++-libsystemd_250.3.bb | 1 +
2 files changed, 75 insertions(+)
create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch

diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch
new file mode 100644
index 0000000000..01afd37a37
--- /dev/null
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch
@@ -0,0 +1,74 @@
+From b0933e76c6f0594c10cf8a9a70b34e15b68066d1 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@...>
+Date: Sat, 23 Jul 2022 10:38:49 +0000
+Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/pull/23992/commits/21c03ad5e9d8d0350e30dae92a5e15da318a1539]
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ meson.build | 13 ++++++++++++-
+ src/basic/fd-util.c | 2 ++
+ src/core/namespace.c | 2 ++
+ src/shared/mount-util.c | 2 ++
+ 4 files changed, 18 insertions(+), 1 deletion(-)
+
+--- a/meson.build
++++ b/meson.build
+@@ -474,7 +474,6 @@ decl_headers = '''
+ #include <uchar.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+-#include <linux/fs.h>
+ '''
+
+ foreach decl : ['char16_t',
+@@ -486,6 +485,17 @@ foreach decl : ['char16_t',
+ # We get -1 if the size cannot be determined
+ have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
+
++ if decl == 'struct mount_attr'
++ if have
++ want_linux_fs_h = false
++ else
++ have = cc.sizeof(decl,
++ prefix : decl_headers + '#include <linux/fs.h>',
++ args : '-D_GNU_SOURCE') > 0
++ want_linux_fs_h = have
++ endif
++ endif
++
+ if decl == 'struct statx'
+ if have
+ want_linux_stat_h = false
+@@ -501,6 +511,7 @@ foreach decl : ['char16_t',
+ endforeach
+
+ conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
+
+ foreach ident : ['secure_getenv', '__secure_getenv']
+ conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
+--- a/src/core/namespace.c
++++ b/src/core/namespace.c
+@@ -6,7 +6,9 @@
+ #include <stdio.h>
+ #include <sys/mount.h>
+ #include <unistd.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+
+ #include "alloc-util.h"
+ #include "base-filesystem.h"
+--- a/src/shared/mount-util.c
++++ b/src/shared/mount-util.c
+@@ -7,7 +7,9 @@
+ #include <sys/statvfs.h>
+ #include <unistd.h>
+ #include <linux/loop.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+
+ #include "alloc-util.h"
+ #include "chase-symlinks.h"
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
index d5c799aac3..853cc20b67 100644
--- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
+++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb
@@ -14,6 +14,7 @@ SRCREV = "73be9643910c3f7f3ff84765d63060846c110016"
SRCBRANCH = "v250-stable"
SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
file://static-libsystemd-pkgconfig.patch \
+ file://0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch \
"

# patches needed by musl
--
2.37.1


[meta-oe][PATCH 2/5] ostree: Upgrade to 2022.5 release

Khem Raj
 

Backport a fix for building with glibc 2.36+ while here

Signed-off-by: Khem Raj <raj.khem@...>
---
...01-Remove-unused-linux-fs.h-includes.patch | 42 +++++++++++++++++++
...bostree-Remove-including-sys-mount.h.patch | 29 +++++++++++++
...-se-luks-gencpio-There-is-no-bashism.patch | 25 +++++++++++
.../{ostree_2022.2.bb => ostree_2022.5.bb} | 5 ++-
4 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch
rename meta-oe/recipes-extended/ostree/{ostree_2022.2.bb => ostree_2022.5.bb} (96%)

diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch
new file mode 100644
index 0000000000..2659e4696d
--- /dev/null
+++ b/meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch
@@ -0,0 +1,42 @@
+From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@...>
+Date: Wed, 3 Aug 2022 10:37:40 -0400
+Subject: [PATCH] Remove unused `linux/fs.h` includes
+
+Prep for fixing conflicts introduced by newer glibc.
+cc https://github.com/ostreedev/ostree/issues/2685
+
+Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76]
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ src/libostree/ostree-repo-commit.c | 1 -
+ src/ostree/ot-main.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
+index afab3fdf..35b16c71 100644
+--- a/src/libostree/ostree-repo-commit.c
++++ b/src/libostree/ostree-repo-commit.c
+@@ -30,7 +30,6 @@
+ #include <sys/xattr.h>
+ #include <glib/gprintf.h>
+ #include <sys/ioctl.h>
+-#include <linux/fs.h>
+ #include <ext2fs/ext2_fs.h>
+
+ #include "otutil.h"
+diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
+index b7b50d67..7a4405a5 100644
+--- a/src/ostree/ot-main.c
++++ b/src/ostree/ot-main.c
+@@ -28,7 +28,6 @@
+ #include <string.h>
+ #include <sys/statvfs.h>
+ #include <sys/mount.h>
+-#include <linux/fs.h>
+
+ #include "ot-main.h"
+ #include "ostree.h"
+--
+2.37.1
+
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch
new file mode 100644
index 0000000000..5c2792cf89
--- /dev/null
+++ b/meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch
@@ -0,0 +1,29 @@
+From 7ff956e4088e0bdc6bfd429f99124a8a9256c181 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Sat, 6 Aug 2022 21:44:11 -0700
+Subject: [PATCH] libostree: Remove including sys/mount.h
+
+This conflicts with linux/mount.h which is included by linux/fs.h
+with glibc 2.36+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ src/libostree/ostree-sysroot-deploy.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
+index 2dc9f58b..61b19e42 100644
+--- a/src/libostree/ostree-sysroot-deploy.c
++++ b/src/libostree/ostree-sysroot-deploy.c
+@@ -23,7 +23,6 @@
+ #include <gio/gunixoutputstream.h>
+ #include <glib-unix.h>
+ #include <stdint.h>
+-#include <sys/mount.h>
+ #include <sys/statvfs.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+--
+2.37.1
+
diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch
new file mode 100644
index 0000000000..5cf5784f14
--- /dev/null
+++ b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch
@@ -0,0 +1,25 @@
+From dd55633e49aa43dede3c8e1770ae8761487f050e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Sat, 6 Aug 2022 21:52:31 -0700
+Subject: [PATCH] s390x-se-luks-gencpio: There is no bashism
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ src/libostree/s390x-se-luks-gencpio | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio
+index e821e2fe..96c1d123 100755
+--- a/src/libostree/s390x-se-luks-gencpio
++++ b/src/libostree/s390x-se-luks-gencpio
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # This script creates new initramdisk with LUKS config within
+ set -euo pipefail
+
+--
+2.37.1
+
diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.2.bb b/meta-oe/recipes-extended/ostree/ostree_2022.5.bb
similarity index 96%
rename from meta-oe/recipes-extended/ostree/ostree_2022.2.bb
rename to meta-oe/recipes-extended/ostree/ostree_2022.5.bb
index 50d0548cc7..b3d9ec56b7 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2022.2.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2022.5.bb
@@ -19,9 +19,12 @@ DEPENDS = " \

SRC_URI = " \
gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \
+ file://0001-Remove-unused-linux-fs.h-includes.patch \
+ file://0001-libostree-Remove-including-sys-mount.h.patch \
+ file://0001-s390x-se-luks-gencpio-There-is-no-bashism.patch \
file://run-ptest \
"
-SRCREV = "fbc6d21c2f71099fbab44cbdd74222b91f61c667"
+SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0"

UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)"

--
2.37.1


[meta-networking][PATCH 1/5] kronosnet: Upgrade to 1.24

Khem Raj
 

Remove upstreamed patches

Signed-off-by: Khem Raj <raj.khem@...>
---
...ests-Correct-include-path-for-poll.h.patch | 29 -------------------
.../{kronosnet_1.22.bb => kronosnet_1.24.bb} | 3 +-
2 files changed, 1 insertion(+), 31 deletions(-)
delete mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch
rename meta-networking/recipes-extended/kronosnet/{kronosnet_1.22.bb => kronosnet_1.24.bb} (92%)

diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch
deleted file mode 100644
index 0d261fd4ef..0000000000
--- a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cae68083fda5d4ca832ff3cc8a533454df2efe23 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Tue, 12 Oct 2021 20:35:53 -0700
-Subject: [PATCH] libknet/tests: Correct include path for poll.h
-
-Fixes
-/usr/include/sys/poll.h:1:2: error: redirec
-ting incorrect #include <sys/poll.h> to <poll.h> [-Werror,-W#warnings]
-| #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
-
-Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/363]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- libknet/tests/test-common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libknet/tests/test-common.c b/libknet/tests/test-common.c
-index 86b76b0..8f8b6ca 100644
---- a/libknet/tests/test-common.c
-+++ b/libknet/tests/test-common.c
-@@ -20,7 +20,7 @@
- #include <pthread.h>
- #include <dirent.h>
- #include <sys/select.h>
--#include <sys/poll.h>
-+#include <poll.h>
-
- #include "libknet.h"
- #include "test-common.h"
diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb
similarity index 92%
rename from meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb
rename to meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb
index 0b0bc29452..cbd5e7a0fd 100644
--- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88
SECTION = "libs"
DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd"

-SRCREV = "0123ecebce0ad6aba3cdb320027192e15fd71e23"
+SRCREV = "f8f80fd7f9b85f2626d2c6452612962ad8efca9e"
SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \
- file://0001-libknet-tests-Correct-include-path-for-poll.h.patch \
file://0001-links.c-Fix-build-with-gcc-12.patch \
"

--
2.37.1


Re: [meta-oe][ 1/1] fluentbit Upgrade to 1.3.5 -> 1.9.6

Khem Raj
 

On 8/1/22 07:28, Paulo Neves wrote:
Thanks for the review. Some more stuff was wrong after all and i am reworking the patch.
I looked at the usrmerge patch and indeed i removed it incorrectly.
I tried to rework it so that it uses systemd.pc's systemdunitdir variable but that variable relies on rootprefix. I cannot find a reason why we are not setting systemd ROOTFSPREFIX in systemd and instead are using meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch. Is there any mismatch where prefix would not match? Would ROOTFSPREFIX only be valid when usrmerge is active?
well rootprefix is set to root_prefix which varies depending upon usrmerge feature being enabled or not.


root_prefix = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}', '${base_prefix}', d)}"

so in theory it should fall in place if we used root_prefix here

Paulo Neves
On 7/29/22 04:44, Khem Raj wrote:
Hi Paulo


On Thu, Jul 28, 2022 at 10:03 AM Paulo Neves <ptsneves@...> wrote:
Signed-off-by: Paulo Neves <ptsneves@...>
---
  ...t-Do-not-use-private-makefile-target.patch | 68 +++++++++++++++
  ...nit-install-location-with-SYSTEM_DIR.patch | 28 -------
  ...caused-by-using-flb_free-instead-of-.patch | 43 ----------
  ...-ppc-Fix-signature-for-co_create-API.patch | 38 ---------
  ...-not-hardcode-compilation-directorie.patch | 26 ++++++
  ...GV-caused-by-using-flb_free-instead-.patch | 82 -------------------
  ...0003-mbedtls-Do-not-overwrite-CFLAGS.patch | 25 ++++++
  .../fluentbit/fluentbit/builtin-nan.patch     | 27 ------
  .../cross-build-init-system-detection.patch   | 38 ---------
  ...{fluentbit_1.3.5.bb => fluentbit_1.9.6.bb} | 44 +++++-----
  10 files changed, 139 insertions(+), 280 deletions(-)
  create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
  delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch
  delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch
  delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-ppc-Fix-signature-for-co_create-API.patch
  create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
  delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch
  create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
  delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch
  delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch
  rename meta-oe/recipes-extended/fluentbit/{fluentbit_1.3.5.bb => fluentbit_1.9.6.bb} (53%)

diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
new file mode 100644
index 000000000..0a80a92ed
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
@@ -0,0 +1,68 @@
+From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001
+From: Paulo Neves <ptsneves@...>
+Date: Thu, 28 Jul 2022 11:28:41 +0200
+Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target
+
+$< is a private detail from the Makefile generated by CMakefile and
+are not under control or to be used at the CMakeLists level. In 3.20
+that private generation changed pre-requisite targets[1] and now logs
+contain the path compiler_depend.ts instead of the actual file.
+---
+ CMakeLists.txt              | 6 +-----
+ lib/chunkio/CMakeLists.txt  | 7 +------
+ lib/cmetrics/CMakeLists.txt | 7 +------
+ 3 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3dba5a8..d94b988 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,11 +46,7 @@ else()
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
+   set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
+diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
+index bbe1f39..809ea93 100644
+--- a/lib/chunkio/CMakeLists.txt
++++ b/lib/chunkio/CMakeLists.txt
+@@ -14,12 +14,7 @@ else()
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ")
+ endif()
+
+-# Set __FILENAME__
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+
+ include(cmake/macros.cmake)
+
+diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
+index 60e8774..e3d6149 100644
+--- a/lib/cmetrics/CMakeLists.txt
++++ b/lib/cmetrics/CMakeLists.txt
+@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR  3)
+ set(CMT_VERSION_PATCH  5)
+ set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
+
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+
+ # Configuration options
+ option(CMT_DEV             "Enable development mode"                   No)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch
deleted file mode 100644
index bf4cda08f..000000000
---
a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5571f949fa2048b79c197b5b10a11ecb1891cbe9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Sat, 23 Apr 2022 08:24:34 -0700
-Subject: [PATCH] Control sytemd unit install location with SYSTEM_DIR
-
-This helps building when usrmerge is on
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@...>
----
- src/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -323,7 +323,11 @@ if(FLB_BINARY)
-       "${PROJECT_SOURCE_DIR}/init/systemd.in"
-       ${FLB_SYSTEMD_SCRIPT}
-       )
--    install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system)
-+    if(SYSTEMD_DIR)
-+        install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION ${SYSTEMD_DIR})
-+    else()
-+        install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system)
-+    endif()
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR})
-   elseif(FLB_UPSTART)
-     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch
deleted file mode 100644
index a6ff5991c..000000000
---
a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3d7390c89c2205d1eed0384be0bb65adb675e60d Mon Sep 17 00:00:00 2001
-From: Ramon Fried <ramon@...>
-Date: Tue, 9 Feb 2021 18:59:59 +0200
-Subject: [PATCH] bin: fix SIGSEGV caused by using flb_free instead of
- mk_mem_free
-
-Upstream-Status: Accepted
-Signed-off-by: Ramon Fried <ramon@...>
----
- src/fluent-bit.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/fluent-bit.c b/src/fluent-bit.c
-index c0c73b4..989cfde 100644
---- a/src/fluent-bit.c
-+++ b/src/fluent-bit.c
-@@ -289,7 +289,7 @@ static int input_set_property(struct flb_input_instance *in, char *kv)
-                 in->p->name, key);
-     }
-
--    flb_free(key);
-+    mk_mem_free(key);
-     return ret;
- }
-
-@@ -314,7 +314,7 @@ static int output_set_property(struct flb_output_instance *out, char *kv)
-     }
-
-     ret = flb_output_set_property(out, key, value);
--    flb_free(key);
-+    mk_mem_free(key);
-     return ret;
- }
-
-@@ -340,7 +340,7 @@ static int filter_set_property(struct flb_filter_instance *filter, char *kv)
-     }
-
-     ret = flb_filter_set_property(filter, key, value);
--    flb_free(key);
-+    mk_mem_free(key);
-     return ret;
- }
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-ppc-Fix-signature-for-co_create-API.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-ppc-Fix-signature-for-co_create-API.patch
deleted file mode 100644
index 1f36c657e..000000000
---
a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-ppc-Fix-signature-for-co_create-API.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From be4032079c931704f52e29f5da5c01cde24ac842 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@...>
-Date: Thu, 16 Jan 2020 10:44:58 -0800
-Subject: [PATCH] ppc: Fix signature for co_create API
-
-Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/1886]
-Signed-off-by: Khem Raj <raj.khem@...>
----
- lib/flb_libco/ppc.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/flb_libco/ppc.c b/lib/flb_libco/ppc.c
-index e6536d56..533256b3 100644
---- a/lib/flb_libco/ppc.c
-+++ b/lib/flb_libco/ppc.c
-@@ -279,7 +279,9 @@ static uint32_t* co_create_(unsigned size, uintptr_t entry) {
-   return t;
- }
-
--cothread_t co_create(unsigned int size, void (*entry_)(void)) {
-+cothread_t co_create(unsigned int size, void (*entry_)(void),
-+                     size_t *out_size) {
-+
-   uintptr_t entry = (uintptr_t)entry_;
-   uint32_t* t = 0;
-
-@@ -325,7 +327,7 @@ cothread_t co_create(unsigned int size, void (*entry_)(void)) {
-     t[10] = (uint32_t)(sp >> shift >> shift);
-     t[11] = (uint32_t)sp;
-   }
--
-+  *out_size = size;
-   return t;
- }
-
---
-2.25.0
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
new file mode 100644
index 000000000..4358b2a51
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
@@ -0,0 +1,26 @@
+From 71dab751a27a2e582b711de22873065dd28f4b65 Mon Sep 17 00:00:00 2001
+From: Paulo Neves <ptsneves@...>
+Date: Thu, 28 Jul 2022 11:42:31 +0200
+Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories
+
+Including the source dir in the header makes the header not
+reproducible and contaminates it with host builder paths. Instead
+make it take CMAKE_DEBUG_SRCDIR that can be set to a known
+reproducible value
+---
+ include/fluent-bit/flb_info.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in
+index a89485c..2579afc 100644
+--- a/include/fluent-bit/flb_info.h.in
++++ b/include/fluent-bit/flb_info.h.in
+@@ -23,7 +23,7 @@
+ #define STR_HELPER(s)      #s
+ #define STR(s)             STR_HELPER(s)
+
+-#define FLB_SOURCE_DIR "@CMAKE_SOURCE_DIR@"
++#define FLB_SOURCE_DIR "@CMAKE_DEBUG_SRCDIR@"
+
+ /* General flags set by CMakeLists.txt */
+ @FLB_BUILD_FLAGS@
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch
deleted file mode 100644
index 91675dfc6..000000000
---
a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7c3b1dfb174312594d3317c24ed71c60398f653f Mon Sep 17 00:00:00 2001
-From: Ramon Fried <ramon@...>
-Date: Wed, 10 Feb 2021 04:23:36 +0200
-Subject: [PATCH] parser: Fix SIGSEGV caused by using flb_free instead of
- mk_mem_free
-
-Upstream-Status: Backport (fix only for 1.3.5)
-Signed-off-by: Ramon Fried <ramon@...>
----
- src/flb_parser.c | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/src/flb_parser.c b/src/flb_parser.c
-index d35c568..7c20e12 100644
---- a/src/flb_parser.c
-+++ b/src/flb_parser.c
-@@ -490,7 +490,7 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
-                                        MK_RCONF_STR);
-         if (str) {
-             time_keep = flb_utils_bool(str);
--            flb_free(str);
-+            mk_mem_free(str);
-         }
-         else {
-             time_keep = FLB_FALSE;
-@@ -522,23 +522,23 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
-
-         flb_debug("[parser] new parser registered: %s", name);
-
--        flb_free(name);
--        flb_free(format);
-+        mk_mem_free(name);
-+        mk_mem_free(format);
-
-         if (regex) {
--            flb_free(regex);
-+            mk_mem_free(regex);
-         }
-         if (time_fmt) {
--            flb_free(time_fmt);
-+            mk_mem_free(time_fmt);
-         }
-         if (time_key) {
--            flb_free(time_key);
-+            mk_mem_free(time_key);
-         }
-         if (time_offset) {
--            flb_free(time_offset);
-+            mk_mem_free(time_offset);
-         }
-         if (types_str) {
--            flb_free(types_str);
-+            mk_mem_free(types_str);
-         }
-
-         decoders = NULL;
-@@ -548,19 +548,19 @@ int flb_parser_conf_file(const char *file, struct flb_config *config)
-     return 0;
-
-  fconf_error:
--    flb_free(name);
--    flb_free(format);
-+    mk_mem_free(name);
-+    mk_mem_free(format);
-     if (regex) {
--        flb_free(regex);
-+        mk_mem_free(regex);
-     }
-     if (time_fmt) {
--        flb_free(time_fmt);
-+        mk_mem_free(time_fmt);
-     }
-     if (time_key) {
--        flb_free(time_key);
-+        mk_mem_free(time_key);
-     }
-     if (types_str) {
--        flb_free(types_str);
-+        mk_mem_free(types_str);
-     }
-     if (decoders) {
-         flb_parser_decoder_list_destroy(decoders);
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
new file mode 100644
index 000000000..0611af9ec
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
@@ -0,0 +1,25 @@
+From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
+From: Paulo Neves <ptsneves@...>
+Date: Thu, 28 Jul 2022 14:37:18 +0200
+Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
+
+bitbake passes CFLAGS that are often in conflict with the ones set
+in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
+FORTIFY_SOURCE=2 except in release mode
+---
+ lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/mbedtls-2.28.0/CMakeLists.txt b/lib/mbedtls-2.28.0/CMakeLists.txt
+index d76bddc..e717846 100644
+--- a/lib/mbedtls-2.28.0/CMakeLists.txt
++++ b/lib/mbedtls-2.28.0/CMakeLists.txt
+@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
+     if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
+     endif()
+-    set(CMAKE_C_FLAGS_RELEASE     "-O2")
+-    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
+     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
+     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
+     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch
deleted file mode 100644
index 8ffc3be3e..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/builtin-nan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-help complier to use intrinsics, clang in few cases e.g. aarch64 can not
-and then requires linking with libm, its the only function needed from libm then
-its good to avoid needing it.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@...>
-
---- a/include/fluent-bit/stream_processor/flb_sp_timeseries.h
-+++ b/include/fluent-bit/stream_processor/flb_sp_timeseries.h
-@@ -207,7 +207,7 @@ void cb_forecast_calc(struct timeseries
-         result = b0 + b1 * (val->f64 + *forecast->latest_x);
-         break;
-     default:
--        result = nan("");
-+        result = __builtin_nan("");
-         break;
-     }
-
-@@ -283,7 +283,7 @@ void cb_forecast_r_calc(struct timeserie
-             result = ((val->i64 - b0) / b1) - *forecast->latest_x;
-             break;
-         default:
--            result = nan("");
-+            result = __builtin_nan("");
-             break;
-         }
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch
deleted file mode 100644
index d3822fc8d..000000000
---
a/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Define CMake variables to indicate init system for target
-incase of cross compile, detecting systemd support based on
-host directory structure is not right thing to do
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.kheem@...>
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -317,7 +317,7 @@ if(FLB_BINARY)
-   install(TARGETS fluent-bit-bin RUNTIME DESTINATION ${FLB_INSTALL_BINDIR})
-
-   # Detect init system, install upstart, systemd or init.d script
--  if(IS_DIRECTORY /lib/systemd/system)
-+  if(FLB_SYSTEMD)
-     set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
-     configure_file(
-       "${PROJECT_SOURCE_DIR}/init/systemd.in"
-@@ -325,7 +325,7 @@ if(FLB_BINARY)
-       )
-     install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system)
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR})
--  elseif(IS_DIRECTORY /usr/share/upstart)
-+  elseif(FLB_UPSTART)
-     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
-     configure_file(
-       "${PROJECT_SOURCE_DIR}/init/upstart.in"
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,6 +70,8 @@ option(FLB_RECORD_ACCESSOR    "Enable re
- option(FLB_SYSTEM_STRPTIME    "Use strptime in system libc"  Yes)
- option(FLB_STATIC_CONF        "Build binary using static configuration")
- option(FLB_STREAM_PROCESSOR   "Enable Stream Processor"      Yes)
-+option(FLB_SYSTEMD            "Enable systemd init system"   No)
-+option(FLB_UPSTART            "Enable upstart init system"   No)
- option(FLB_CORO_STACK_SIZE    "Set coroutine stack size")
-
- # Metrics: Experimental Feature, disabled by default on 0.12 series
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb
similarity index 53%
rename from meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
rename to meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb
index b231cc287..1ff62767d 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb
@@ -11,25 +11,28 @@ LICENSE = "Apache-2.0"
  LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
  SECTION = "net"

-SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \
+PR = "r0"
We don't need to set PR in recipe anymore

+PV = "1.9.6"
We don't need PV either since it's in the recipe name already.

+
+SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV} \
+ file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \
+ file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
+           file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \
             file://jemalloc.patch \
-           file://cross-build-init-system-detection.patch \
-           file://builtin-nan.patch \
-           file://0001-ppc-Fix-signature-for-co_create-API.patch \
- file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \
- file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \
- file://0001-Control-sytemd-unit-install-location-with-SYSTEM_DIR.patch \
does this work without patch with usrmerge distro feature on ?

             "
-SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747"
-SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789"
+SRC_URI[md5sum] = "ad65bb3ca55d203a467a63426e17bfae"
we don't need md5sum anymore.

+SRC_URI[sha256sum] = "5ef7dd97e10936269fe5f4e5d3ebf16559333066f7d6757ba12464a9d6186570"

  S = "${WORKDIR}/fluent-bit-${PV}"
-DEPENDS = "zlib bison-native flex-native"
+DEPENDS = "zlib bison-native flex-native openssl"
  DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
+PACKAGECONFIG[yaml] = "-DFLB_CONFIG_YAML=On,-DFLB_CONFIG_YAML=Off, yaml,"
+PACKAGECONFIG[kafka] = "-DFLB_OUT_KAFKA=On,-DFLB_OUT_KAFKA=Off,librdkafka"
+PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=On,-DFLB_EXAMPLES=Off"
+PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=On,-DFLB_JEMALLOC=Off,jemalloc"
  DEPENDS:append:libc-musl = " fts "

-INSANE_SKIP:${PN}-dev += "dev-elf"
+PACKAGECONFIG ?= "yaml"
There is no recipe providing yaml in core or meta-oe, perhaps you
meant libyaml maybe ?

  LTO = ""

@@ -40,13 +43,13 @@ OECMAKE_GENERATOR ?= "Unix Makefiles"
  # ========================

  # Host related setup
-EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1"
+EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_TD=1"

  # Disable LuaJIT and filter_lua support
  EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "

  # Disable Library and examples
-EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off "
+EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off"

  # Enable systemd iff systemd is in DISTRO_FEATURES
  EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On -DSYSTEMD_DIR=${systemd_system_unitdir}','-DFLB_SYSTEMD=Off',d)}"
@@ -54,16 +57,9 @@ EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEM
  EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'"
  EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'"

-# Kafka Output plugin (disabled by default): note that when
-# enabling Kafka output plugin, the backend library librdkafka
-# requires 'openssl' as a dependency.
-#
-# DEPENDS += "openssl "
-# EXTRA_OECMAKE += "-DFLB_OUT_KAFKA=On "
-
  inherit cmake systemd

-CFLAGS += "-fcommon"
-
  SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
-TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}"
+
+EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/"
+TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"
--
2.25.1



[meta-gnome][PATCH V2] ibus: Swith to use main branch instead of master

Khem Raj
 

Upstream has switched to using main for tip of trunk, therefore follow
it here in SRC_URI as well.

Signed-off-by: Khem Raj <raj.khem@...>
Suggested-by: Fabio Estevam <festevam@...>
Reported-by: Markus Volk <f_l_k@...>
---
meta-gnome/recipes-support/ibus/ibus.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
index 37a490abe0..bb662f2ec9 100644
--- a/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -10,7 +10,7 @@ PV = "1.5.26"
DEPENDS = "unicode-ucd"

SRC_URI = " \
- git://github.com/ibus/ibus.git;branch=master;protocol=https \
+ git://github.com/ibus/ibus.git;branch=main;protocol=https \
file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
"
SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3"
--
2.37.1


Re: [meta-networking][PATCH v3] sshpass: add recipe

Khem Raj
 

On 7/29/22 12:41, Peter Kjellerstedt wrote:
-----Original Message-----
From: openembedded-devel@... <openembedded-devel@...> On Behalf Of Mike Petersen
Sent: den 29 juli 2022 19:32
To: openembedded-devel@...
Cc: Mike Petersen <mike.petersen@...>
Subject: [oe] [meta-networking][PATCH v3] sshpass: add recipe

Needed for automating ssh logins, used in auto-tests.

Co-authored-by: Ioan-Adrian Ratiu <adrian.ratiu@...>
Signed-off-by: Mike Petersen <mike.petersen@...>
---
.../recipes-connectivity/sshpass/sshpass_1.09.bb | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb

diff --git a/meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb b/meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb
new file mode 100644
index 000000000..0bfed694b
--- /dev/null
+++ b/meta-networking/recipes-connectivity/sshpass/sshpass_1.09.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Non-interactive ssh password auth"
+HOMEPAGE = "http://sshpass.sourceforge.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sshpass/sshpass-${PV}.tar.gz"
That can be written as:
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"

right I have incorportated this change in version staged in master-next


+
+SRC_URI[sha256sum] = "71746e5e057ffe9b00b44ac40453bf47091930cba96bbea8dc48717dedc49fb7"
+
+inherit autotools
--
2.37.1


Re: kirkstone merge request: July 31st

Khem Raj
 

merged thanks.

On 7/31/22 06:53, akuster808 wrote:
The following changes since commit a47ef046619d639dfbd3be2a13ef6d5b40fd40a1:
  openflow: ignore unrelated CVEs (2022-07-18 07:02:41 -0700)
are available in the Git repository at:
  https://git.openembedded.org/meta-openembedded kirkstone-next
for you to fetch changes up to 8f2dc1023482863e2630d1b94052c41ce748b38f:
  tracker: upgrade 3.3.1 -> 3.3.2 (2022-07-26 07:27:26 -0700)
----------------------------------------------------------------
Armin Kuster (1):
      bigbuckbunny-1080p: update SRC_URI
Aryaman Gupta (1):
      rsyslog: update 8.2202->8.2206
Chen Qi (1):
      catfish: fix buildpaths issue
Davide Gardenal (6):
      libplist: ignore patched CVEs
      meta-oe: ignore patched CVEs
      mongodb: ignore unrelated CVEs
      php: ignore patched CVEs
      postgresql: ignore unrelated CVE
      openjpeg: ignore CVE-2015-1239
Wang Mingyu (3):
      php: upgrade 8.1.7 -> 8.1.8
      ndisc6: upgrade 1.0.5 -> 1.0.6
      tracker: upgrade 3.3.0 -> 3.3.1
Yue Tao (1):
      python3-lxml: Security fix CVE-2022-2309
wangmy (4):
      stunnel: upgrade 5.63 -> 5.64
      stunnel: upgrade 5.64 -> 5.65
      redis: upgrade 7.0.2 -> 7.0.4
      tracker: upgrade 3.3.1 -> 3.3.2
 .../tracker/{tracker_3.3.0.bb => tracker_3.3.2.bb}       |  2 +-
 .../sample-content/bigbuckbunny-1080p.bb                 |  2 +-
 .../ndisc6/{ndisc6_git.bb => ndisc6_1.0.6.bb}            |  3 +-
 .../stunnel/stunnel/fix-openssl-no-des.patch             | 24 ++++--
 .../stunnel/{stunnel_5.63.bb => stunnel_5.65.bb}         |  2 +-
 .../meta-python/recipes-dbs/mongodb/mongodb_git.bb       |  6 ++
 .../recipes-connectivity/libtorrent/libtorrent_git.bb    |  4 +
 meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb        |  4 +
 .../recipes-devtools/php/{php_8.1.7.bb => php_8.1.8.bb}  |  8 +-
 meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb        |  4 +
 .../recipes-extended/libimobiledevice/libplist_2.2.0.bb  |  6 ++
 .../redis/{redis_7.0.2.bb => redis_7.0.4.bb}             |  2 +-
 .../rsyslog/{rsyslog_8.2202.0.bb => rsyslog_8.2206.0.bb} |  2 +-
 meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb        |  4 +
 meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb  |  4 +
 meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb     |  4 +
 meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb         |  4 +
 meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb      |  4 +
 meta-oe/recipes-support/atop/atop_2.4.0.bb               |  4 +
 meta-oe/recipes-support/emacs/emacs_27.2.bb              |  4 +
 meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb          |  5 ++
 .../python/python3-lxml/CVE-2022-2309.patch              | 99 +++++++++++++++++++++++++
 .../recipes-devtools/python/python3-lxml_4.8.0.bb        |  3 +-
 meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb         |  9 +++
 24 files changed, 197 insertions(+), 16 deletions(-)
 rename meta-gnome/recipes-gnome/tracker/{tracker_3.3.0.bb => tracker_3.3.2.bb} (93%)
 rename meta-networking/recipes-support/ndisc6/{ndisc6_git.bb => ndisc6_1.0.6.bb} (97%)
 rename meta-networking/recipes-support/stunnel/{stunnel_5.63.bb => stunnel_5.65.bb} (93%)
 rename meta-oe/recipes-devtools/php/{php_8.1.7.bb => php_8.1.8.bb} (98%)
 rename meta-oe/recipes-extended/redis/{redis_7.0.2.bb => redis_7.0.4.bb} (96%)
 rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.2202.0.bb => rsyslog_8.2206.0.bb} (98%)
 create mode 100644 meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch


[meta-networking][PATCH] networkmanager: fix iptables and nft paths

Jim Broadus
 

The NetworkManager meson.build is searching for iptables and nft by
passing absolute paths to meson's find_program. The result is that it
locates tools on the host machine when they exist at those locations. If
they don't, it uses default locations. This often works out, but in some
cases, such as when the host uses a merged usr scheme and the build
target does not, the paths will be incorrect and the tools won't be
found at runtime.

These could be PACKAGECONFIG options, but since they have fallback
values, completely disabling the use of either iptables or nft would
require patching the meson.build or setting a bogus location.

Note that this meson.build file follows the same pattern elsewhere, but
most cases are already covered by PACKAGECONFIG options.

Signed-off-by: Jim Broadus <jim@...>
---
.../networkmanager/networkmanager_1.38.0.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb
index c8fea5dbb..ebd25a8f8 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb
@@ -55,6 +55,8 @@ EXTRA_OEMESON = "\
-Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \
-Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \
-Ddhcpcanon=false \
+ -Diptables=${sbindir}/iptables \
+ -Dnft=${sbindir}/nft \
"

# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template
--
2.25.1


Re: [meta-oe][PATCH v2 1/2] image_types_sparse: Pad source image to block size

Sean Anderson <sean.anderson@...>
 

On 5/16/22 12:52 PM, Sean Anderson wrote:
If the source image's size is not aligned to the sparse image's block
size, then conversion will fail with

img2simg: libsparse/sparse.cpp:133: int write_all_blocks(sparse_file*, output_file*): Assertion `pad >= 0' failed.

This is a bug in img2simg, but an easy way to work around it is to pad
the source image ourselves. The default block size of 4096 matches
img2simg's default block size.

Signed-off-by: Sean Anderson <sean.anderson@...>
---

Changes in v2:
- New

meta-oe/classes/image_types_sparse.bbclass | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/meta-oe/classes/image_types_sparse.bbclass b/meta-oe/classes/image_types_sparse.bbclass
index 4263593a8d..58221888ed 100644
--- a/meta-oe/classes/image_types_sparse.bbclass
+++ b/meta-oe/classes/image_types_sparse.bbclass
@@ -1,8 +1,17 @@
inherit image_types

+# This sets the granularity of the sparse image conversion. Chunk sizes will be
+# specified in units of this value. Setting this value smaller than the
+# underlying image's block size will not result in any further space saving.
+# However, there is no loss in correctness if this value is larger or smaller
+# than optimal. This value should be a power of two.
+SPARSE_BLOCK_SIZE ??= "4096"
+
+convert_sparse() {
+ truncate --no-create --size=%${SPARSE_BLOCK_SIZE} "$1"
+ img2simg "$1" "$1.sparse" ${SPARSE_BLOCK_SIZE}
+}
+
CONVERSIONTYPES += "sparse"
-CONVERSION_CMD:sparse = " \
- img2simg "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" \
- "${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sparse" \
-"
+CONVERSION_CMD:sparse = "convert_sparse '${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}'"
CONVERSION_DEPENDS_sparse = "android-tools-native"
ping?


Re: [meta-oe][kirkstone][PATCH] glmark2: fix compatibility with python-3.11

Martin Jansa
 

ping


On Tue, Jul 5, 2022 at 9:31 AM Martin Jansa via lists.openembedded.org <Martin.Jansa=gmail.com@...> wrote:
Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
 ...b-fix-compatibility-with-python-3.11.patch | 76 +++++++++++++++++++
 .../recipes-benchmark/glmark2/glmark2_git.bb  |  3 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-waflib-fix-compatibility-with-python-3.11.patch

diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-waflib-fix-compatibility-with-python-3.11.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-waflib-fix-compatibility-with-python-3.11.patch
new file mode 100644
index 0000000000..c56fa64e58
--- /dev/null
+++ b/meta-oe/recipes-benchmark/glmark2/files/0001-waflib-fix-compatibility-with-python-3.11.patch
@@ -0,0 +1,76 @@
+From b85ba8c3ff3fb9ae708576ccef03434d2ef73054 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@...>
+Date: Tue, 14 Jun 2022 09:54:18 +0000
+Subject: [PATCH] waflib: fix compatibility with python-3.11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+  open(), io.open(), codecs.open() and fileinput.FileInput no longer
+  accept 'U' (“universal newline”) in the file mode. This flag was
+  deprecated since Python 3.3. In Python 3, the “universal newline” is
+  used by default when a file is open in text mode. The newline parameter
+  of open() controls how universal newlines works. (Contributed by Victor
+  Stinner in bpo-37330.)
+
+* fixes:
+Waf: The wscript in '/OE/build/luneos-langdale/webos-ports/tmp-glibc/work/core2-64-webos-linux/glmark2/2021.12-r0/git' is unreadable
+Traceback (most recent call last):
+  File "/OE/build/luneos-langdale/webos-ports/tmp-glibc/work/core2-64-webos-linux/glmark2/2021.12-r0/git/waflib/Scripting.py", line 104, in waf_entry_point
+    set_main_module(os.path.normpath(os.path.join(Context.run_dir,Context.WSCRIPT_FILE)))
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/OE/build/luneos-langdale/webos-ports/tmp-glibc/work/core2-64-webos-linux/glmark2/2021.12-r0/git/waflib/Scripting.py", line 135, in set_main_module
+    Context.g_module=Context.load_module(file_path)
+                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/OE/build/luneos-langdale/webos-ports/tmp-glibc/work/core2-64-webos-linux/glmark2/2021.12-r0/git/waflib/Context.py", line 343, in load_module
+    code=Utils.readf(path,m='rU',encoding=encoding)
+         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/OE/build/luneos-langdale/webos-ports/tmp-glibc/work/core2-64-webos-linux/glmark2/2021.12-r0/git/waflib/Utils.py", line 117, in readf
+    f=open(fname,m)
+      ^^^^^^^^^^^^^
+ValueError: invalid mode: 'rUb'
+
+Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/178]
+Signed-off-by: Martin Jansa <Martin.Jansa@...>
+---
+ waflib/ConfigSet.py | 2 +-
+ waflib/Context.py   | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
+index 16142a2..87de4ad 100644
+--- a/waflib/ConfigSet.py
++++ b/waflib/ConfigSet.py
+@@ -140,7 +140,7 @@ class ConfigSet(object):
+               Utils.writef(filename,''.join(buf))
+       def load(self,filename):
+               tbl=self.table
+-              code=Utils.readf(filename,m='rU')
++              code=Utils.readf(filename,m='r')
+               for m in re_imp.finditer(code):
+                       g=m.group
+                       tbl[g(2)]=eval(g(3))
+diff --git a/waflib/Context.py b/waflib/Context.py
+index 8f2cbfb..f3e35ae 100644
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -109,7 +109,7 @@ class Context(ctx):
+                               cache[node]=True
+                               self.pre_recurse(node)
+                               try:
+-                                      function_code=node.read('rU',encoding)
++                                      function_code=node.read('r',encoding)
+                                       exec(compile(function_code,node.abspath(),'exec'),self.exec_dict)
+                               finally:
+                                       self.post_recurse(node)
+@@ -340,7 +340,7 @@ def load_module(path,encoding=None):
+               pass
+       module=imp.new_module(WSCRIPT_FILE)
+       try:
+-              code=Utils.readf(path,m='rU',encoding=encoding)
++              code=Utils.readf(path,encoding=encoding)
+       except EnvironmentError:
+               raise Errors.WafError('Could not read the file %r'%path)
+       module_dir=os.path.dirname(path)
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 1406f68b05..188d4e5bdf 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -18,7 +18,8 @@ SRC_URI = " \
     file://0001-fix-dispmanx-build.patch \
     file://0002-run-dispmanx-fullscreen.patch \
     file://0001-libmatrix-Include-missing-utility-header.patch \
-    "
+    file://0001-waflib-fix-compatibility-with-python-3.11.patch \
+"
 SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70"

 S = "${WORKDIR}/git"
--
2.35.1





[meta-networking][PATCH] frr: fix buildpaths issue

Yu, Mingli
 

From: Mingli Yu <mingli.yu@...>

Fixes:
WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/lib/libfrr.a in package frr-staticdev contains reference to TMPDIR [buildpaths]
WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/src/debug/frr/8.2.2-r0/git/lib/version.h in package frr-src contains reference to TMPDIR [buildpaths]
WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/include/frr/version.h in package frr-dev contains reference to TMPDIR [buildpaths]
WARNING: frr-8.2.2-r0 do_package_qa: QA Issue: File /usr/bin/vtysh in package frr contains reference to TMPDIR
File /usr/lib/libfrr.so.0.0.0 in package frr contains reference to TMPDIR [buildpaths]

Signed-off-by: Mingli Yu <mingli.yu@...>
---
meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
index 05195a3f6..f0d0dbf7c 100644
--- a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
+++ b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
@@ -73,6 +73,11 @@ SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE:${PN} = "frr.service"
SYSTEMD_AUTO_ENABLE = "disable"

+do_compile:prepend () {
+ sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \
+ -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h
+}
+
do_compile:class-native () {
oe_runmake clippy-only
}
--
2.25.1


[PATCH][meta-oe] vboxguestdrivers: fix build against 5.19 kernel / libc-headers

Bruce Ashfield
 

From: Bruce Ashfield <bruce.ashfield@...>

We've bounced back and forth with the mixed libc/kernel module structure of
these drivers. In particular the location and content of stdarg.h has caused
compile problems, or can't be located.

In particular kernel versions have issues with stdarg.h and compatibility
with the sysroot and libc-headers/uapi. If we include the file directly from
the kernel source (STAGING_KERNEL_DIR) we get conflicting types on many
structures, due to kernel .h files being found before libc .h files. if we
grab just this one file from the source, and put it into our file structure,
everything holds together.

Plus, we get to drop a patch we are carrying to change the include of
stdarg.h

Signed-off-by: Bruce Ashfield <bruce.ashfield@...>
---

Hi all,

I ran into this same problem with working through the 5.19 kernel
integration.

The build of the vbox guest drivers is sufficiently mixed (versus
say lttng-modules) that I just can't see a really clean way to
pick up stdarg.h from the kernel source tree .. while picking up
none of the other headers (chaos and madness ensues with redefined
types, etc).

I also can't justify picking stdarg.h out of the kernel source and
putting it in the build artifacts, since that breaks our separation
of source and outputs, and this is the only package that requires it.

This is a middle ground approach that worked both against 5.19 and
older kernels for me.

Cheers,

Bruce

...ld-against-5.15-libc-headers-headers.patch | 62 -------------------
.../vboxguestdrivers_6.1.36.bb | 9 ++-
2 files changed, 8 insertions(+), 63 deletions(-)
delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch

diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch
deleted file mode 100644
index 203eec6ee..000000000
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-utils-fix-build-against-5.15-libc-headers-headers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 7213a5bfa3bd9f360d6be01e6dbd59d91095a0fd Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@...>
-Date: Thu, 4 Nov 2021 14:53:46 -0400
-Subject: [PATCH] utils: fix build against 5.15 libc-headers headers
-
-In kernel v5.15+ stdarg.h is part of the kernel source, and the
-upstream project has a change to prefer that stdarg.h to the
-c-library variant and hence includes it as <linux/stdarg.h>, which
-leads to the following build error:
-
- | In file included from ../vboxsf/include/iprt/types.h:34,
- | from ../vboxsf/include/iprt/string.h:33,
- | from mount.vboxsf.c:53:
- | ../vboxsf/include/iprt/stdarg.h:49:13: fatal error: linux/stdarg.h: No such file or directory
- | 49 | # include <linux/stdarg.h>
- | | ^~~~~~~~~~~~~~~~
-
-If we modify our build of the vboxdrivers to have the kernel source
-directory on the include path (to find linux/stdarg.h, that leads
-to the following errors:
-
- In file included from build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot/usr/include/stdlib.h:394,
- | from mount.vboxsf.c:36:
- | build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot/usr/include/sys/types.h:192:20: note: previous declaration of 'blkcnt_t' with type 'blkcnt_t' {aka 'long int'}
- | 192 | typedef __blkcnt_t blkcnt_t; /* Type to count number of disk blocks. */
- | | ^~~~~~~~
- | In file included from build/tmp/work-shared/qemux86-64/kernel-source/include/linux/time.h:5,
- | from poky/build/tmp/work-shared/qemux86-64/kernel-source/include/linux/stat.h:19,
- | from build/tmp/work/qemux86_64-poky-linux/vboxguestdrivers/6.1.28-r0/recipe-sysroot/usr/include/bits/statx.h:31,
-
-Our libc-headers are safe and don't lead to the potential conflicing
-information that the upstream commit is guarding against. The easiest
-solution is to revert the upstream change and trust our headers.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@...>
----
- vboxsf/include/iprt/stdarg.h | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/include/iprt/stdarg.h b/include/iprt/stdarg.h
-index c73093c..7bffde5 100644
---- a/include/iprt/stdarg.h
-+++ b/include/iprt/stdarg.h
-@@ -44,12 +44,7 @@
- # define __builtin_stdarg_start __builtin_va_start
- # endif
- # elif defined(RT_OS_LINUX) && defined(IN_RING0)
--# include "linux/version.h"
--# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1)
--# include <linux/stdarg.h>
--# else
--# include <stdarg.h>
--# endif
-+# include <stdarg.h>
- # else
- # include <stdarg.h>
- # endif
---
-2.19.1
-
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
index 37dd0224d..06dc8a4c8 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.36.bb
@@ -13,7 +13,6 @@ VBOX_NAME = "VirtualBox-${PV}"

SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
- file://0001-utils-fix-build-against-5.15-libc-headers-headers.patch \
"

SRC_URI[sha256sum] = "e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047"
@@ -42,6 +41,14 @@ do_export_sources() {
install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils
install ${S}/../Makefile.utils ${S}/utils/Makefile

+ # some kernel versions have issues with stdarg.h and compatibility with
+ # the sysroot and libc-headers/uapi. If we include the file directly from
+ # the kernel source (STAGING_KERNEL_DIR) we get conflicting types on many
+ # structures, due to kernel .h files being found before libc .h files.
+ # if we grab just this one file from the source, and put it into our
+ # file structure, everything holds together
+ mkdir -p ${S}/vboxsf/include/linux
+ install ${STAGING_KERNEL_DIR}/include/linux/stdarg.h ${S}/vboxsf/include/linux
}

do_configure:prepend() {
--
2.25.1


[meta-oe][PATCH] spdlog: update to v1.10.0

Markus Volk
 

Bump fmt to version 8.1.1.
Added file event handlers #2165, #2169 Thanks @seker.
You can get callbacks from spdlog before/after log file has been opened o=
r closed.
This is useful for cleanup procedures or for adding something to the star=
t/end of the log files. Example:
void file_events_example()
{
// pass the spdlog::file_event_handlers to file sinks for open/close =
log file notifications
spdlog::file_event_handlers handlers;
handlers.before_open =3D [](spdlog::filename_t filename) { spdlog::in=
fo("Before opening {}", filename); };
handlers.after_open =3D [](spdlog::filename_t filename, std::FILE *fs=
tream) { fputs("After opening\n", fstream); };
handlers.before_close =3D [](spdlog::filename_t filename, std::FILE *=
fstream) { fputs("Before closing\n", fstream); };
handlers.after_close =3D [](spdlog::filename_t filename) { spdlog::in=
fo("After closing {}", filename); };
auto my_logger =3D spdlog::basic_logger_st("some_logger", "logs/event=
s-sample.txt", true, handlers);
}
Fixed rotating file sink: when disk is full log rotation resulted zero si=
ze log files. #2261. (thanks @kishorekrd for reporting).
Added new udp_sink #2090. Thanks @CJLove
(Experimental) Option to depend on std::format instead of fmtlib (set SPD=
LOG_USE_STD_FORMAT and use C++20). #2170 Thanks @sylveon .
Improved file name for hourly file sink #2047. Thanks @seker .
Added code location information for error handler #2048. Thanks @D-r-P-3-=
p-p-3-r .
Fixed qt_sinks ctor #2056. Thanks @mguludag .
List Debian instructions in the README #2057. Thanks @mr-c ,
Updated to latest Travis CI Build Status #2094. Thanks @jspraul .
Fixed unhandled errors in udp sink. #2096. Thanks @mmarkeloff .
CMake improvement regarding cmake_minimum_required and policy. #2098. Tha=
nks @reddwarf69 .
Fixed mongo_sink compile in older gcc versions #2102 . Thanks @yzz-ihep .
Remove mutable keyword from mutex_ member in of sinks. #2140 . Thanks @su=
nlong169 .
Fix typos #2171. Thanks @rex4539 .
Fixed udp sink build on FreeBSD #2172. Thanks @keith-dev .
Avoid c-style casting in stdout sinks. #2179. Thanks @ibmibmibm .
Fixed tweakme.h compile error under msvcs when SPDLOG_FUNCTION is defined=
#2182. Thanks @Light3039 .
Fixed compiling errors on AIX #2181. Thanks @lisr .
Fixed runtime when build with -fsanitize=3Dcfi #1972. Thanks @bansan85 .
Remove extraneous semicolon #2190. Thanks @sylveon.
Added example how to replace default logger. #2194. Thanks @rioki .
Fixed usage of ranges and to_hex in the same compile unit #2195. Thanks @=
patrickroocks .
Reduce warnings with pedantic compiler -Wuseless-cast #2216. Thanks @vnep=
ogodin .
Support using std::span in to_hex #2228. Thanks @timblechmann .
Reset current size if rotated files on open #2234. Thanks @SpriteOvO .
Allow forward-declaration of level_enum #2245. Thanks @daverigby .
Call localtime() only if pattern_formatter really needs it #2246. Thanks =
@doug1234 .
Removed unneeded spaces from code. #2249. Thanks @PixelParas .
Added a few missing files/directories to the gitignore #2255. Thanks @Leo=
nBrands .
Fixed issue #2201 (Pattern width is not applied for missing source inform=
ation). #2269. Thanks @kyuheon-kr .
Limit max number of rotating files to 200000. (Fixed #1905). Thanks @surf=
ycui (#2273)
pattern_formatter: fix reorder-ctor warning #2278. Thanks @adriweb .
Fixed spdlogConfig.cmake when built with SPDLOG_FMT_EXTERNAL_HO #2300. Th=
anks @adamcalhoon .
Fixed fopen_s(..) error handling when PREVENT_CHILD_FD is defined #2305. =
Thanks @nUl1.
Fixed compiler error when building on Windows with #define UNICODE #2317.=
Thanks @risa2000 .
Added option to enable formatting of systemd sink #2324, #2320. Thanks @D=
elgan .
Added optional "ident" argument to systemd sink constructor #2328. Thanks=
@Delgan .
Special thanks to @tt4g for his support in answering community questions =
and issues.

Signed-off-by: Markus Volk <f_l_k@...>
---
...1-Enable-use-of-external-fmt-library.patch | 68 -------------------
.../{spdlog_1.9.2.bb =3D> spdlog_1.10.0.bb} | 5 +-
2 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100644 meta-oe/recipes-support/spdlog/files/0001-Enable-use-=
of-external-fmt-library.patch
rename meta-oe/recipes-support/spdlog/{spdlog_1.9.2.bb =3D> spdlog_1.10.=
0.bb} (82%)

diff --git a/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-exte=
rnal-fmt-library.patch b/meta-oe/recipes-support/spdlog/files/0001-Enable=
-use-of-external-fmt-library.patch
deleted file mode 100644
index 98c342fec..000000000
--- a/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fm=
t-library.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Author: Nilesh Patra <npatra974@...>
-Description: Use external libfmt by default
-Last-Changed: Sun, May, 14 2020
-Forwarded: not-needed
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,7 +87,7 @@ option(SPDLOG_BUILD_WARNINGS "Enable com
-=20
- # install options
- option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PRO=
JECT})
--option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled=
" OFF)
-+option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled=
" ON)
- option(SPDLOG_FMT_EXTERNAL_HO "Use external fmt header-only library ins=
tead of bundled" OFF)
- option(SPDLOG_NO_EXCEPTIONS "Compile with -fno-exceptions. Call abort()=
on any spdlog exceptions" OFF)
-=20
---- a/include/spdlog/tweakme.h
-+++ b/include/spdlog/tweakme.h
-@@ -71,7 +71,7 @@
- // In this case spdlog will try to include <fmt/format.h> so set your -=
I flag
- // accordingly.
- //
--// #define SPDLOG_FMT_EXTERNAL
-+#define SPDLOG_FMT_EXTERNAL 1
- ///////////////////////////////////////////////////////////////////////=
////////
-=20
- ///////////////////////////////////////////////////////////////////////=
////////
---- a/include/spdlog/fmt/bin_to_hex.h
-+++ b/include/spdlog/fmt/bin_to_hex.h
-@@ -5,6 +5,7 @@
-=20
- #pragma once
-=20
-+#include <spdlog/tweakme.h>
- #include <cctype>
- #include <spdlog/common.h>
-=20
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
-@@ -4,7 +4,7 @@
- //
-=20
- #pragma once
--
-+#include <spdlog/tweakme.h>
- //
- // Include a bundled header-only copy of fmtlib or an external one.
- // By default spdlog include its own copy.
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
-@@ -7,7 +7,7 @@
- //
- // include bundled or external copy of fmtlib's ostream support
- //
--
-+#include <spdlog/tweakme.h>
- #if !defined(SPDLOG_FMT_EXTERNAL)
- # ifdef SPDLOG_HEADER_ONLY
- # ifndef FMT_HEADER_ONLY
---- a/src/fmt.cpp
-+++ b/src/fmt.cpp
-@@ -6,6 +6,7 @@
- # error Please define SPDLOG_COMPILED_LIB to compile this file.
- #endif
-=20
-+#include <spdlog/tweakme.h>
- #if !defined(SPDLOG_FMT_EXTERNAL)
- # include <spdlog/fmt/bundled/format-inl.h>
-=20
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb b/meta-oe/rec=
ipes-support/spdlog/spdlog_1.10.0.bb
similarity index 82%
rename from meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb
rename to meta-oe/recipes-support/spdlog/spdlog_1.10.0.bb
index d377241ad..d36cfcb84 100644
--- a/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb
+++ b/meta-oe/recipes-support/spdlog/spdlog_1.10.0.bb
@@ -3,9 +3,8 @@ HOMEPAGE =3D "https://github.com/gabime/spdlog/wiki"
LICENSE =3D "MIT"
LIC_FILES_CHKSUM =3D "file://${COREBASE}/meta/files/common-licenses/MIT;=
md5=3D0835ade698e0bcf8506ecda2f7b4f302"
=20
-SRCREV =3D "eb3220622e73a4889eee355ffa37972b3cac3df5"
-SRC_URI =3D "git://github.com/gabime/spdlog.git;protocol=3Dhttps;branch=3D=
v1.x; \
- file://0001-Enable-use-of-external-fmt-library.patch"
+SRCREV =3D "76fb40d95455f249bd70824ecfcae7a8f0930fa3"
+SRC_URI =3D "git://github.com/gabime/spdlog.git;protocol=3Dhttps;branch=3D=
v1.x"
=20
DEPENDS +=3D "fmt"
=20
--=20
2.34.1


[meta-python] [PATCH] python3-werkzeug: upgrade 2.2.0 -> 2.2.1

xuhuan.fnst@fujitsu.com
 

From: Xu Huan <xuhuan.fnst@...>

Changelog:
=========
-Fix router so that /path/ will match a rule /path if strict slashes mode is
disabled for the rule. #2467
-Fix router so that partial part matches are not allowed i.e. /2df does not
match /<int>. #2470
-Fix router static part weighting, so that simpler routes are matched before
more complex ones. #2471
-Restore ValidationError to be importable from werkzeug.routing. #2465

Signed-off-by: Xu Huan <xuhuan.fnst@...>
---
.../{python3-werkzeug_2.2.0.bb => python3-werkzeug_2.2.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-werkzeug_2.2.0.bb => python3-werkzeug_2.2.1.bb} (93%)

diff --git a/meta-python/recipes-devtools/python/python3-werkzeug_2.2.0.bb b/meta-python/recipes-devtools/python/python3-werkzeug_2.2.1.bb
similarity index 93%
rename from meta-python/recipes-devtools/python/python3-werkzeug_2.2.0.bb
rename to meta-python/recipes-devtools/python/python3-werkzeug_2.2.1.bb
index c9e3b0de40..d73235d253 100644
--- a/meta-python/recipes-devtools/python/python3-werkzeug_2.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-werkzeug_2.2.1.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462"

PYPI_PACKAGE = "Werkzeug"

-SRC_URI[sha256sum] = "fe8bcdcef40275ed915fc734c2527a39d705b57a716d4f09e790296abbd16a7f"
+SRC_URI[sha256sum] = "4d7013ef96fd197d1cdeb03e066c6c5a491ccb44758a5b2b91137319383e5a5a"

inherit pypi setuptools3

--
2.25.1


[meta-oe] [PATCH] xrdp: upgrade 0.9.18 -> 0.9.19

wangmy
 

Changelog:
==========
New features
---------------
-Both inbound and outbound clipboards can now be restricted for text, files or images

Bug fixes
-----------
-CVE-2022-23613: Privilege escalation on xrdp-sesman (This fix is also in the out-of-band v0.9.18.1 release)
-The versions of imlib2 used on RHEL 7 and 8 are now detected correctly (#2118)
-Some situations where zombie processes could exist have been resolved (#2146, #2151, #2168)
-Some null-pointer exceptions which can happen in the logging module have been addressed (#2149)
-Some minor logging errors have been corrected (#2152)
-The signal handling in sesman has been reworked to prevent race conditions
when a child exits. This has also made it possible to reliably reload the sesman configuration with SIGHUP (#1729, #2168)

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-oe/recipes-support/xrdp/{xrdp_0.9.18.bb => xrdp_0.9.19.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/xrdp/{xrdp_0.9.18.bb => xrdp_0.9.19.bb} (97%)

diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
similarity index 97%
rename from meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb
rename to meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
index 7ec6ae15f6..207315efe7 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.9.18.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
@@ -17,7 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \
"

-SRC_URI[sha256sum] = "c5eea0af055fac90c632e44fb667f1a25c55de2e34b37127e4cb0aabaef90a0f"
+SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0"

CFLAGS += " -Wno-deprecated-declarations"

--
2.25.1


[meta-oe][PATCH] yasm: fix buildpaths warning

Anuj Mittal
 

ax_create_stdint_h.m4 includes $CC as a comment in the generated header
which leads to buildpaths warning:

| WARNING: yasm-1.3.0+gitAUTOINC+ba463d3c26-r0 do_package_qa: QA Issue: File /usr/include/libyasm-stdint.h in package yasm-dev contains reference to TMPDIR [buildpaths]

Signed-off-by: Anuj Mittal <anuj.mittal@...>
---
meta-oe/recipes-devtools/yasm/yasm_git.bb | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-oe/recipes-devtools/yasm/yasm_git.bb
index b5cd35ab3..044fcbea7 100644
--- a/meta-oe/recipes-devtools/yasm/yasm_git.bb
+++ b/meta-oe/recipes-devtools/yasm/yasm_git.bb
@@ -22,3 +22,8 @@ CACHED_CONFIGUREVARS = "CCLD_FOR_BUILD='${CC_FOR_BUILD}'"
BBCLASSEXTEND = "native"

PARALLEL_MAKE = ""
+
+do_configure:prepend() {
+ # Don't include $CC (which includes path to sysroot) in generated header.
+ sed -i -e "s/^echo \"\/\* generated \$ac_cv_stdint_message \*\/\" >>\$ac_stdint$"// ${S}/m4/ax_create_stdint_h.m4
+}
--
2.37.1


[meta-python] [PATCH] python3-regex: upgrade 2022.7.24 -> 2022.7.25

xuhuan.fnst@fujitsu.com
 

From: Xu Huan <xuhuan.fnst@...>

Signed-off-by: Xu Huan <xuhuan.fnst@...>
---
.../{python3-regex_2022.7.24.bb => python3-regex_2022.7.25.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-regex_2022.7.24.bb => python3-regex_2022.7.25.bb} (79%)

diff --git a/meta-python/recipes-devtools/python/python3-regex_2022.7.24.bb b/meta-python/recipes-devtools/python/python3-regex_2022.7.25.bb
similarity index 79%
rename from meta-python/recipes-devtools/python/python3-regex_2022.7.24.bb
rename to meta-python/recipes-devtools/python/python3-regex_2022.7.25.bb
index 897aa76c35..437563b1c0 100644
--- a/meta-python/recipes-devtools/python/python3-regex_2022.7.24.bb
+++ b/meta-python/recipes-devtools/python/python3-regex_2022.7.25.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069"

inherit pypi setuptools3

-SRC_URI[sha256sum] = "fa8a4bc81b15f49c57ede3fd636786c6619179661acf2430fcc387d75bf28d33"
+SRC_URI[sha256sum] = "bd0883e86964cd61360ffc36dbebbc49b928e92a306f886eab02c11dfde5b7aa"

RDEPENDS:${PN} += " \
python3-stringold \
--
2.25.1


[meta-python] [PATCH] python3-pythonping: upgrade 1.1.1 -> 1.1.2

xuhuan.fnst@fujitsu.com
 

From: Xu Huan <xuhuan.fnst@...>

Signed-off-by: Xu Huan <xuhuan.fnst@...>
---
...{python3-pythonping_1.1.1.bb => python3-pythonping_1.1.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-pythonping_1.1.1.bb => python3-pythonping_1.1.2.bb} (77%)

diff --git a/meta-python/recipes-devtools/python/python3-pythonping_1.1.1.bb b/meta-python/recipes-devtools/python/python3-pythonping_1.1.2.bb
similarity index 77%
rename from meta-python/recipes-devtools/python/python3-pythonping_1.1.1.bb
rename to meta-python/recipes-devtools/python/python3-pythonping_1.1.2.bb
index 75cef501f3..3fce07b43d 100644
--- a/meta-python/recipes-devtools/python/python3-pythonping_1.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pythonping_1.1.2.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://setup.py;beginline=12;endline=12;md5=2d33c00f47720c7e35e1fdb4b9fab027"

-SRC_URI[sha256sum] = "0022f6cbe52762e9d596316e3bccb8a3b794355a49c0d788f7228d90f9461cfc"
+SRC_URI[sha256sum] = "7f783688268334fbfdec31b3a3b105a347844bd621de48d63f38e6ecfaf14af2"

inherit pypi setuptools3

--
2.25.1


[meta-python] [PATCH] python3-pyflakes: upgrade 2.4.0 -> 2.5.0

xuhuan.fnst@fujitsu.com
 

From: Xu Huan <xuhuan.fnst@...>

Changelog:
===========
Drop support for EOL python 2.7 / 3.4 / 3.5
Ignore __all__ when not directly assigned
Handle TypeAlias annotations as aliases (PEP 613)
Assignment expressions (:=) target outer scope in comprehensions
Add support for new python 3.11 syntax
Unify output so it is always filename:lineno:col: message
Properly report SyntaxError from stdin in python < 3.9
Fix offsets of "SyntaxError"s in pypy

Signed-off-by: Xu Huan <xuhuan.fnst@...>
---
.../{python3-pyflakes_2.4.0.bb => python3-pyflakes_2.5.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-pyflakes_2.4.0.bb => python3-pyflakes_2.5.0.bb} (73%)

diff --git a/meta-python/recipes-devtools/python/python3-pyflakes_2.4.0.bb b/meta-python/recipes-devtools/python/python3-pyflakes_2.5.0.bb
similarity index 73%
rename from meta-python/recipes-devtools/python/python3-pyflakes_2.4.0.bb
rename to meta-python/recipes-devtools/python/python3-pyflakes_2.5.0.bb
index 827ff0b292..5c75ea48aa 100644
--- a/meta-python/recipes-devtools/python/python3-pyflakes_2.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyflakes_2.5.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/PyCQA/pyflakes"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=690c2d09203dc9e07c4083fc45ea981f"

-SRC_URI[sha256sum] = "05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"
+SRC_URI[sha256sum] = "491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"

inherit pypi setuptools3

--
2.25.1

1721 - 1740 of 99863