Date   

[meta-oe][PATCH v2 1/1] fluentbit Upgrade to 1.3.5 -> 1.9.6

Paulo Neves
 

Signed-off-by: Paulo Neves <ptsneves@...>
---
...t-Do-not-use-private-makefile-target.patch | 71 ++++++++++++++++
...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 | 28 +++++++
...md-init-systemd-detection-contingent.patch | 64 +++++++++++++++
.../fluentbit/fluentbit/builtin-nan.patch | 27 ------
.../cross-build-init-system-detection.patch | 38 ---------
.../fluentbit/fluentbit_1.3.5.bb | 69 ----------------
.../fluentbit/fluentbit_1.9.6.bb | 72 ++++++++++++++++
12 files changed, 261 insertions(+), 325 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
create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.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
delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb

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..b4634a244
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
@@ -0,0 +1,71 @@
+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.
+
+Upstream status: Pending [1]
+[1] https://github.com/fluent/fluent-bit/issues/5492
+---
+ 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..a7d7dc889
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
@@ -0,0 +1,28 @@
+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
+
+Upstream status: Innapropriate due to fluent-bit having it's own Release
+flags that also overwrite bitbake ones.
+---
+ 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/0004-build-Make-systemd-init-systemd-detection-contingent.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
new file mode 100644
index 000000000..9d4d950d1
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
@@ -0,0 +1,64 @@
+From 7a792624925d46690c1f07fe4b194b5f4c510db6 Mon Sep 17 00:00:00 2001
+From: Paulo Neves <ptsneves@...>
+Date: Tue, 2 Aug 2022 09:57:05 +0200
+Subject: [PATCH 1/1] build: Make systemd init systemd detection contingent on
+ pkgconfig
+
+Use pkg-config to get systemd.pc variables and systemdunitdir. Those
+variable ensure that .service files are installed in the correct paths
+and only when systemd is detected.
+
+Upstream Status: Pending [1]
+[1] https://github.com/fluent/fluent-bit/pull/5818
+
+---
+ cmake/FindJournald.cmake | 4 ++++
+ src/CMakeLists.txt | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
+index f5a3a832b..9e6657a29 100644
+--- a/cmake/FindJournald.cmake
++++ b/cmake/FindJournald.cmake
+@@ -5,6 +5,8 @@
+ # JOURNALD_INCLUDE_DIR - the Journald include directory
+ # JOURNALD_LIBRARIES - Link these to use Journald
+ # JOURNALD_DEFINITIONS - Compiler switches required for using Journald
++# SYSTEMD_UNITDIR - The systemd units' directory
++#
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ #
+@@ -16,7 +18,9 @@
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ pkg_check_modules(PC_JOURNALD QUIET systemd)
++pkg_get_variable(PC_SYSTEMD_UNITDIR systemd "systemdsystemunitdir")
+
++set(SYSTEMD_UNITDIR ${PC_SYSTEMD_UNITDIR})
+ set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
+ set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 522bbf9bd..30743d8d6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -480,13 +480,13 @@ if(FLB_BINARY)
+ endif()
+
+ # Detect init system, install upstart, systemd or init.d script
+- if(IS_DIRECTORY /lib/systemd/system)
++ if(DEFINED SYSTEMD_UNITDIR)
+ set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
+ configure_file(
+ "${PROJECT_SOURCE_DIR}/init/systemd.in"
+ ${FLB_SYSTEMD_SCRIPT}
+ )
+- install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
++ install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
+ install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
+ elseif(IS_DIRECTORY /usr/share/upstart)
+ set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
+--
+2.25.1
+
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.3.5.bb
deleted file mode 100644
index b231cc287..000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb
+++ /dev/null
@@ -1,69 +0,0 @@
-SUMMARY = "Fast Log processor and Forwarder"
-DESCRIPTION = "Fluent Bit is a data collector, processor and \
-forwarder for Linux. It supports several input sources and \
-backends (destinations) for your data. \
-"
-
-HOMEPAGE = "http://fluentbit.io"
-BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
-
-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 \
- 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 \
- "
-SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747"
-SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789"
-
-S = "${WORKDIR}/fluent-bit-${PV}"
-DEPENDS = "zlib bison-native flex-native"
-DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
-DEPENDS:append:libc-musl = " fts "
-
-INSANE_SKIP:${PN}-dev += "dev-elf"
-
-LTO = ""
-
-# Use CMake 'Unix Makefiles' generator
-OECMAKE_GENERATOR ?= "Unix Makefiles"
-
-# Fluent Bit build options
-# ========================
-
-# Host related setup
-EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -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 "
-
-# 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)}"
-
-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}"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb
new file mode 100644
index 000000000..f98d416b2
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.6.bb
@@ -0,0 +1,72 @@
+SUMMARY = "Fast Log processor and Forwarder"
+DESCRIPTION = "Fluent Bit is a data collector, processor and \
+forwarder for Linux. It supports several input sources and \
+backends (destinations) for your data. \
+"
+
+HOMEPAGE = "http://fluentbit.io"
+BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+SECTION = "net"
+
+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://0004-build-Make-systemd-init-systemd-detection-contingent.patch \
+ "
+SRC_URI[sha256sum] = "5ef7dd97e10936269fe5f4e5d3ebf16559333066f7d6757ba12464a9d6186570"
+
+S = "${WORKDIR}/fluent-bit-${PV}"
+
+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,libyaml"
+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"
+#TODO add more fluentbit options to PACKAGECONFIG[]
+
+DEPENDS:append:libc-musl = " fts "
+
+# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
+do_compile:append() {
+ find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/|g'
+}
+
+FLB_JEMALLOC_OPTIONS_LIST = "--with-jemalloc-prefix=je_ --with-lg-quantum=3"
+
+PACKAGECONFIG ?= "yaml"
+
+LTO = ""
+
+# Use CMake 'Unix Makefiles' generator
+OECMAKE_GENERATOR ?= "Unix Makefiles"
+
+# Fluent Bit build options
+# ========================
+
+# Host related setup
+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"
+
+# Enable systemd iff systemd is in DISTRO_FEATURES
+EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','-DFLB_SYSTEMD=Off',d)}"
+
+EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'"
+EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'"
+
+inherit cmake systemd pkgconfig
+
+SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
+
+EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/"
+TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"
--
2.25.1


[meta-oe][PATCH 2/2] ccid: upgrade 1.4.33 -> 1.5.0

Julian Haller
 

From: Julian Haller <julian.haller@...>

Signed-off-by: Julian Haller <julian.haller@...>
---
.../recipes-support/ccid/{ccid_1.4.33.bb => ccid_1.5.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/ccid/{ccid_1.4.33.bb => ccid_1.5.0.bb} (69%)

diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.33.bb b/meta-oe/recipes-support/ccid/ccid_1.5.0.bb
similarity index 69%
rename from meta-oe/recipes-support/ccid/ccid_1.4.33.bb
rename to meta-oe/recipes-support/ccid/ccid_1.5.0.bb
index 7b260f177b..9775d82fae 100644
--- a/meta-oe/recipes-support/ccid/ccid_1.4.33.bb
+++ b/meta-oe/recipes-support/ccid/ccid_1.5.0.bb
@@ -3,15 +3,15 @@ HOMEPAGE = "https://ccid.apdu.fr/"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"

-DEPENDS = "virtual/libusb0 pcsc-lite"
+DEPENDS = "autoconf-archive-native virtual/libusb0 pcsc-lite"
RDEPENDS:${PN} = "pcsc-lite"

SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \
file://0001-Add-build-rule-for-README.patch \
"

-SRC_URI[md5sum] = "b11907894ce2d345439635e2b967e7e5"
-SRC_URI[sha256sum] = "5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424"
+SRC_URI[md5sum] = "f246d6601856775310c86b841b616de5"
+SRC_URI[sha256sum] = "81549b3422469d503996d03a3aed2ef1375b359167f10d66be9e3844e729322e"

inherit autotools pkgconfig

--
2.25.1


[meta-oe][PATCH 1/2] pcsc-lite: upgrade 1.9.0 -> 1.9.8

Julian Haller
 

From: Julian Haller <julian.haller@...>

The python3 related patch is no longer due to similar changes in the
project. This also requires changing the RDEPENDS to python3-core to
avoid package QA warnings.

Signed-off-by: Julian Haller <julian.haller@...>
---
.../0001-pcsc-spy-use-python3-only.patch | 43 -------------------
...{pcsc-lite_1.9.0.bb => pcsc-lite_1.9.8.bb} | 12 +++---
2 files changed, 5 insertions(+), 50 deletions(-)
delete mode 100644 meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch
rename meta-oe/recipes-support/pcsc-lite/{pcsc-lite_1.9.0.bb => pcsc-lite_1.9.8.bb} (85%)

diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch b/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch
deleted file mode 100644
index 3e7b0adda6..0000000000
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 75dd98876951d86890ceb30be521de57fd31e3c7 Mon Sep 17 00:00:00 2001
-From: Andrey Zhizhikin <andrey.z@...>
-Date: Mon, 27 Jan 2020 13:27:12 +0000
-Subject: [PATCH] pcsc-spy: use python3 only
-
-Python2 has been EOL and most distributions would not provide any
-support for it anymore. Since Python3 is available in all distributions
-now, switch pcsc-spy to use it exclusively.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrey Zhizhikin <andrey.z@...>
----
- src/spy/pcsc-spy | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/src/spy/pcsc-spy b/src/spy/pcsc-spy
-index 85222c6..965138e 100755
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/env python3
-
- """
- # Display PC/SC functions arguments
-@@ -22,12 +22,7 @@ from __future__ import print_function
- import os
- import signal
- import time
--try:
-- # for Python3
-- from queue import Queue
--except ImportError:
-- # for Python2
-- from Queue import Queue
-+from queue import Queue
- from threading import Thread
- from operator import attrgetter
-
---
-2.17.1
-
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.8.bb
similarity index 85%
rename from meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb
rename to meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.8.bb
index 9ae091a09a..64c9c2a9da 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.8.bb
@@ -9,13 +9,11 @@ LICENSE:${PN}-dbg = "BSD-3-Clause & GPL-3.0-or-later"
LICENSE:${PN}-spy = "GPL-3.0-or-later"
LICENSE:${PN}-spy-dev = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6"
+DEPENDS = "autoconf-archive-native"

-SRC_URI = "\
- https://pcsclite.apdu.fr/files/${BP}.tar.bz2 \
- file://0001-pcsc-spy-use-python3-only.patch \
-"
-SRC_URI[md5sum] = "eb595f2d398ff229207a6ec09fbc4e98"
-SRC_URI[sha256sum] = "0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9"
+SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2"
+SRC_URI[md5sum] = "d063c6ca17c17fab39a85132811e155d"
+SRC_URI[sha256sum] = "502d80c557ecbee285eb99fe8703eeb667bcfe067577467b50efe3420d1b2289"

inherit autotools systemd pkgconfig perlnative

@@ -54,6 +52,6 @@ RPROVIDES:${PN} += "${PN}-systemd"
RREPLACES:${PN} += "${PN}-systemd"
RCONFLICTS:${PN} += "${PN}-systemd"
SYSTEMD_SERVICE:${PN} = "pcscd.socket"
-RDEPENDS:${PN}-spy +="python3"
+RDEPENDS:${PN}-spy += "python3-core"

BBCLASSEXTEND = "native"
--
2.25.1


[dunfell][PATCH] python3-lxml: CVE-2022-2309 NULL Pointer Dereference allows attackers to cause a denial of service

Hitendra Prajapati
 

Source: https://github.com/lxml/lxml
MR: 119399
Type: Security Fix
Disposition: Backport from https://github.com/lxml/lxml/commit/86368e9cf70a0ad23cccd5ee32de847149af0c6f
ChangeID: 0b1ef4ce4c901ef6574a83ecbe4c4b1d2ab24777
Description:
CVE-2022-2309 libxml: NULL Pointer Dereference allows attackers to cause a denial of service.

Signed-off-by: Hitendra Prajapati <hprajapati@...>
---
.../recipes-devtools/python/python-lxml.inc | 2 +
.../python/python3-lxml/CVE-2022-2309.patch | 94 +++++++++++++++++++
2 files changed, 96 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch

diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc
index 05b5eae462..0276a3e81a 100644
--- a/meta-python/recipes-devtools/python/python-lxml.inc
+++ b/meta-python/recipes-devtools/python/python-lxml.inc
@@ -18,6 +18,8 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \

DEPENDS += "libxml2 libxslt"

+SRC_URI += "file://CVE-2022-2309.patch"
+
SRC_URI[md5sum] = "f088e452ed45b030b6f84269f1e84d11"
SRC_URI[sha256sum] = "8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60"

diff --git a/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch b/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch
new file mode 100644
index 0000000000..ff3fcee6e2
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-lxml/CVE-2022-2309.patch
@@ -0,0 +1,94 @@
+From ccbda4b0669f418b2f00c4f099733cebe633eb47 Mon Sep 17 00:00:00 2001
+From: Hitendra Prajapati <hprajapati@...>
+Date: Fri, 29 Jul 2022 10:16:59 +0530
+Subject: [PATCH] CVE-2022-2309
+
+Upstream-Status: Backport [https://github.com/lxml/lxml/commit/86368e9cf70a0ad23cccd5ee32de847149af0c6f]
+CVE: CVE-2022-2309
+Signed-off-by: Hitendra Prajapati <hprajapati@...>
+---
+ src/lxml/apihelpers.pxi | 7 ++++---
+ src/lxml/iterparse.pxi | 11 ++++++-----
+ src/lxml/tests/test_etree.py | 20 ++++++++++++++++++++
+ 3 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/src/lxml/apihelpers.pxi b/src/lxml/apihelpers.pxi
+index 5eb3416..88a031d 100644
+--- a/src/lxml/apihelpers.pxi
++++ b/src/lxml/apihelpers.pxi
+@@ -246,9 +246,10 @@ cdef dict _build_nsmap(xmlNode* c_node):
+ while c_node is not NULL and c_node.type == tree.XML_ELEMENT_NODE:
+ c_ns = c_node.nsDef
+ while c_ns is not NULL:
+- prefix = funicodeOrNone(c_ns.prefix)
+- if prefix not in nsmap:
+- nsmap[prefix] = funicodeOrNone(c_ns.href)
++ if c_ns.prefix or c_ns.href:
++ prefix = funicodeOrNone(c_ns.prefix)
++ if prefix not in nsmap:
++ nsmap[prefix] = funicodeOrNone(c_ns.href)
+ c_ns = c_ns.next
+ c_node = c_node.parent
+ return nsmap
+diff --git a/src/lxml/iterparse.pxi b/src/lxml/iterparse.pxi
+index 4c20506..3da7485 100644
+--- a/src/lxml/iterparse.pxi
++++ b/src/lxml/iterparse.pxi
+@@ -419,7 +419,7 @@ cdef int _countNsDefs(xmlNode* c_node):
+ count = 0
+ c_ns = c_node.nsDef
+ while c_ns is not NULL:
+- count += 1
++ count += (c_ns.href is not NULL)
+ c_ns = c_ns.next
+ return count
+
+@@ -430,9 +430,10 @@ cdef int _appendStartNsEvents(xmlNode* c_node, list event_list) except -1:
+ count = 0
+ c_ns = c_node.nsDef
+ while c_ns is not NULL:
+- ns_tuple = (funicode(c_ns.prefix) if c_ns.prefix is not NULL else '',
+- funicode(c_ns.href))
+- event_list.append( (u"start-ns", ns_tuple) )
+- count += 1
++ if c_ns.href:
++ ns_tuple = (funicodeOrEmpty(c_ns.prefix),
++ funicode(c_ns.href))
++ event_list.append( (u"start-ns", ns_tuple) )
++ count += 1
+ c_ns = c_ns.next
+ return count
+diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
+index b997e4d..69e1bf1 100644
+--- a/src/lxml/tests/test_etree.py
++++ b/src/lxml/tests/test_etree.py
+@@ -1448,6 +1448,26 @@ class ETreeOnlyTestCase(HelperTestCase):
+ [1,2,1,4],
+ counts)
+
++ def test_walk_after_parse_failure(self):
++ # This used to be an issue because libxml2 can leak empty namespaces
++ # between failed parser runs. iterwalk() failed to handle such a tree.
++ try:
++ etree.XML('''<anot xmlns="1">''')
++ except etree.XMLSyntaxError:
++ pass
++ else:
++ assert False, "invalid input did not fail to parse"
++
++ et = etree.XML('''<root> </root>''')
++ try:
++ ns = next(etree.iterwalk(et, events=('start-ns',)))
++ except StopIteration:
++ # This would be the expected result, because there was no namespace
++ pass
++ else:
++ # This is a bug in libxml2
++ assert not ns, repr(ns)
++
+ def test_itertext_comment_pi(self):
+ # https://bugs.launchpad.net/lxml/+bug/1844674
+ XML = self.etree.XML
+--
+2.25.1
+
--
2.25.1


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

Paulo Neves
 

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?

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



Re: [meta-networking][PATCH] strongswan: upgrade 5.9.6 -> 5.9.7

Yi Zhao
 

Please ignore this patch as there are some startup failures. I will send v2.


//Yi

On 8/1/22 15:42, Yi Zhao wrote:
ChangeLog:
https://github.com/strongswan/strongswan/releases/tag/5.9.7

Drop backport patch 0001-enum-Fix-compiler-warning.patch.

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../0001-enum-Fix-compiler-warning.patch | 31 -------------------
...trongswan_5.9.6.bb => strongswan_5.9.7.bb} | 3 +-
2 files changed, 1 insertion(+), 33 deletions(-)
delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.6.bb => strongswan_5.9.7.bb} (98%)

diff --git a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
deleted file mode 100644
index e730fe1cd..000000000
--- a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@...>
-Date: Mon, 2 May 2022 09:31:49 +0200
-Subject: [PATCH] enum: Fix compiler warning
-
-Closes strongswan/strongswan#1025
-
-Upstream-Status: Backport
-[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960]
-
-Signed-off-by: Yi Zhao <yi.zhao@...>
----
- src/libstrongswan/utils/enum.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
-index 79da450f0c..1e77489f6f 100644
---- a/src/libstrongswan/utils/enum.c
-+++ b/src/libstrongswan/utils/enum.c
-@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len)
- return buf;
- }
-
-- if (snprintf(buf, len, e->names[0]) >= len)
-+ if (snprintf(buf, len, "%s", e->names[0]) >= len)
- {
- return NULL;
- }
---
-2.25.1
-
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
similarity index 98%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
index 1b82dceac..349538620 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
@@ -9,10 +9,9 @@ DEPENDS = "flex-native flex bison-native"
DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}"
SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
- file://0001-enum-Fix-compiler-warning.patch \
"
-SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7"
+SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf"
UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"


[meta-networking][PATCH] net-snmp: set ac_cv_path_PSPROG

Yu, Mingli
 

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

Fixes:
WARNING: net-snmp-5.9.1-r0 do_package_qa: QA Issue: File /usr/include/net-snmp/net-snmp-config-64.h in package net-snmp-dev contains reference to TMPDIR
File /usr/bin/net-snmp-create-v3-user in package net-snmp-dev contains reference to TMPDIR [buildpaths]
WARNING: net-snmp-5.9.1-r0 do_package_qa: QA Issue: File /usr/lib/net-snmp/ptest/include/net-snmp/net-snmp-config.h in package net-snmp-ptest contains reference to TMPDIR [buildpaths]

Signed-off-by: Mingli Yu <mingli.yu@...>
---
meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
index 5f887b886..30c0ce74c 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb
@@ -72,6 +72,7 @@ CACHED_CONFIGUREVARS = " \
ac_cv_ETC_MNTTAB=/etc/mtab \
lt_cv_shlibpath_overrides_runpath=yes \
ac_cv_path_UNAMEPROG=${base_bindir}/uname \
+ ac_cv_path_PSPROG=${base_bindir}/ps \
ac_cv_file__etc_printcap=no \
NETSNMP_CONFIGURE_OPTIONS= \
"
--
2.25.1


[meta-networking][PATCH] ntpsec: Add UPSTREAM_CHECK_URI

Alex Kiernan
 

Signed-off-by: Alex Kiernan <alex.kiernan@...>
---
meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb
index 3efac7d98383..cd8b396f192c 100644
--- a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb
+++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.1.bb
@@ -20,6 +20,8 @@ SRC_URI = "https://ftp.ntpsec.org/pub/releases/ntpsec-${PV}.tar.gz \

SRC_URI[sha256sum] = "f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a"

+UPSTREAM_CHECK_URI = "ftp://ftp.ntpsec.org/pub/releases/"
+
inherit pkgconfig python3-dir python3targetconfig systemd update-alternatives update-rc.d useradd waf features_check

# RDEPENDS on gnuplot with this restriction
--
2.35.1


[meta-oe][PATCH] postgresql: Fix the buildpaths issue

Yu, Mingli
 

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

Fixes:
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/bin/postgres in package postgresql contains reference to TMPDIR
File /usr/bin/pg_config in package postgresql contains reference to TMPDIR [buildpaths]
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/include/pg_config.h in package libpq-dev contains reference to TMPDIR [buildpaths]
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/include/postgresql/server/pg_config.h in package postgresql-server-dev contains reference to TMPDIR
File /usr/lib/postgresql/pgxs/src/Makefile.global in package postgresql-server-dev contains reference to TMPDIR [buildpaths]
WARNING: postgresql-14.4-r0 do_package_qa: QA Issue: File /usr/lib/libpgcommon.a in package postgresql-staticdev contains reference to TMPDIR
File /usr/lib/libpgcommon_shlib.a in package postgresql-staticdev contains reference to TMPDIR [buildpaths]

Signed-off-by: Mingli Yu <mingli.yu@...>
---
...-config_info.c-not-expose-build-info.patch | 110 ++++++++++++++++++
meta-oe/recipes-dbs/postgresql/postgresql.inc | 8 ++
.../recipes-dbs/postgresql/postgresql_14.4.bb | 1 +
3 files changed, 119 insertions(+)
create mode 100644 meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch

diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch b/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch
new file mode 100644
index 000000000..101a74877
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/files/0001-config_info.c-not-expose-build-info.patch
@@ -0,0 +1,110 @@
+From b92eebe8b0760fee7bd55c6c22318620c2c07579 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@...>
+Date: Mon, 1 Aug 2022 15:44:38 +0800
+Subject: [PATCH] config_info.c: not expose build info
+
+Don't collect the build information to fix the buildpaths issue.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mingli Yu <mingli.yu@...>
+---
+ configure.ac | 2 +-
+ src/common/config_info.c | 68 ----------------------------------------
+ 2 files changed, 1 insertion(+), 69 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0eb595b..508487b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
+ AC_PREFIX_DEFAULT(/usr/local/pgsql)
+-AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
++AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["ac_configure_args"], [Saved arguments from configure])
+
+ [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
+ [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
+diff --git a/src/common/config_info.c b/src/common/config_info.c
+index e72e729..b482c20 100644
+--- a/src/common/config_info.c
++++ b/src/common/config_info.c
+@@ -123,74 +123,6 @@ get_configdata(const char *my_exec_path, size_t *configdata_len)
+ configdata[i].setting = pstrdup(path);
+ i++;
+
+- configdata[i].name = pstrdup("CONFIGURE");
+- configdata[i].setting = pstrdup(CONFIGURE_ARGS);
+- i++;
+-
+- configdata[i].name = pstrdup("CC");
+-#ifdef VAL_CC
+- configdata[i].setting = pstrdup(VAL_CC);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("CPPFLAGS");
+-#ifdef VAL_CPPFLAGS
+- configdata[i].setting = pstrdup(VAL_CPPFLAGS);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("CFLAGS");
+-#ifdef VAL_CFLAGS
+- configdata[i].setting = pstrdup(VAL_CFLAGS);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("CFLAGS_SL");
+-#ifdef VAL_CFLAGS_SL
+- configdata[i].setting = pstrdup(VAL_CFLAGS_SL);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("LDFLAGS");
+-#ifdef VAL_LDFLAGS
+- configdata[i].setting = pstrdup(VAL_LDFLAGS);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("LDFLAGS_EX");
+-#ifdef VAL_LDFLAGS_EX
+- configdata[i].setting = pstrdup(VAL_LDFLAGS_EX);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("LDFLAGS_SL");
+-#ifdef VAL_LDFLAGS_SL
+- configdata[i].setting = pstrdup(VAL_LDFLAGS_SL);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+- configdata[i].name = pstrdup("LIBS");
+-#ifdef VAL_LIBS
+- configdata[i].setting = pstrdup(VAL_LIBS);
+-#else
+- configdata[i].setting = pstrdup(_("not recorded"));
+-#endif
+- i++;
+-
+ configdata[i].name = pstrdup("VERSION");
+ configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
+ i++;
+--
+2.25.1
+
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 00c010746..bef33e6bb 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -215,6 +215,14 @@ do_install:append() {
install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system
sed -i -e 's,@BINDIR@,${bindir},g' \
${D}${systemd_unitdir}/system/postgresql.service
+ # Remove the build path
+ if [ -f ${D}${libdir}/${BPN}/pgxs/src/Makefile.global ]; then
+ sed -i -e 's#${RECIPE_SYSROOT}##g' \
+ -e 's#${RECIPE_SYSROOT_NATIVE}##g' \
+ -e 's#${WORKDIR}##g' \
+ -e 's#${TMPDIR}##g' \
+ ${D}${libdir}/${BPN}/pgxs/src/Makefile.global
+ fi
}

SSTATE_SCAN_FILES += "Makefile.global"
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb b/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb
index 64e83b2cd..1daab22f9 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb
@@ -8,6 +8,7 @@ SRC_URI += "\
file://0001-Improve-reproducibility.patch \
file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \
file://remove_duplicate.patch \
+ file://0001-config_info.c-not-expose-build-info.patch \
"

SRC_URI[sha256sum] = "c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a"
--
2.25.1


[meta-oe][PATCH] ostree: Upgrade 2022.2 -> 2022.5

Alex Kiernan
 

15740d042c9c Release 2022.5
6cb1227177dc docs add debos to readme distribution build tools
e0417957ea15 rust: Add a test case for ed25519
83e6357186be sign/ed25519: Verify signatures are minimum length
7db2fe8cba2a Update doc about adding new function to libostree
60853219d5a7 sysroot: Add a few more assertions about `boot_fd`
75aa7a22f6d6 sysroot: Have `ensure_writable` also always initialize
2c716552052c deploy: Ensure sysroot is initialized for kargs in place
8f24e0826ac3 Add test to verify `ostree admin kargs edit-in-place` working
7b7b6d741bda Fix `ostree admin kargs edit-in-place` fails issue
22946e9d963f Fix link to rust bindings
d3762be9b3c8 deny: Sync with rpm-ostree
d7107e3036ff ostree-repo: bls-append-except-default followup
becc18936ff7 lib: Stop using old `ostree_sysroot_get_repo()` API
a98487123773 lib/prune: speed up pruning by retrieving only commits
e98988ba176e tests/inst: Port to cap-std
52d6f4e79078 tests/staged-deploy.sh: Hack around cosa systemd unit check
14a7c0c74bc0 s390x: rename sd-boot to sdboot
be2075eef006 repo: Metadata return values from `load_file` are not nullable
7814d9339e7a tests/inst/destructive: stop disabling fedora-coreos-pinger
63499747b938 Bump to cap-std 0.25 and io-lifetimes 0.7
b87c8a8e23b7 rust: Bump semver to 0.15
37d0ca41b65b Fix clippy lint in cap-std bits
001839b35f3c ci/rust: Change MSRV to `cargo check`
ed98a7904c95 ci/rust: Enable `cap-std-apis` in default build, add a no-feature build
3bc59a52068e RFE: Add a hidden option to `ostree admin kargs edit-in-place` to update all existing deployments in place
7ee2d1b1376e Drop `.packit.yaml`
ce428c1f60b6 test-basic-c: Don't assert that extended attributes are available
9bdf3861ad08 cli/refs: Port to C99 style
2f1c9a727e59 cli/remote-list: Port to C99 style
a0ae2f915698 cli/gpg-sign: Port to C99 style
43b712951d8f cli/diff: Port to C99 style
f8403f46dc19 cli/config: Port to C99 style
4e356d0e8fde cli/unlock: Port to C99 style
588b07e55421 cli/undeploy: Port to C99 style
46e1db392d59 cli/os-init: Port to C99 style
eee0eea58b0d rust-bindings: Wire up `tests/`
436ff11a008b fsck: Use `load_variant_if_exists`
bd030a96f26e fsck: Move most commit processing into helper function
2fe0ea73955c fsck: De-indent loop
6981633f9c91 fsck: Don't load all object names into memory
a13d81236863 repo: Document non-obvious way to list all commits
93e3784b66f5 rust: Use inline `format!` variables in a few places
76071a2b1184 ci: Bump MSRV
99c122d21900 rust: Switch to 2021 edition
d7802c27ddd6 rust-bindings: Update cargo package list
61dd54f94091 rust-bindings: use correct README.md
dc13645299df rust-bindings: Fix repository reference
2688d7d2611d tests/inst: Bump the version of ostree-ext
145d91d1c967 lib: Fix symbol versioning inheritance
fffb11163399 prune: Also use object set API in `ostree_repo_prune_from_reachable()`
5341a13b33d4 ci: Add a flow that does a git libostree + git rust-bindings
a71915e4367f repo: Further optimize `ostree_repo_list_objects_set()`
4806d84f568f rust: Bump semver, add feature for current release
c2baa6d10b18 repo: Optimize memory use of `ostree_repo_list_objects()`
664c41329982 configure: post-release version bump
5fa364d3997a Release 2022.4
fa3b6c9872b2 rust-bindings: Update to latest git
70c8499a3890 rust-bindings: Use OSTree-1.0.gir from our own builddir
21901c2d36b2 rust-bindings: Delete committed gir files
3e645ad950c3 Drop `OSTREE_BUILT_FEATURES` from introspection
32ee82133bba Rename ostree-cmdprivate to drop out of introspection
e69321176dcc gitignore: Add ci-build/
199ef821c827 ci: Add a codestyle.sh
aea20704b5b7 ci: Drop an unused files
2838f42eec54 ci: Drop libsoup build in jenkins
03d592b11696 Fix annotations on ostree_mutable_tree_lookup()
972f00e48350 s390x: do not unpack existing initrd, just append LUKS keys to its copy
2e564aef074a copr: mark git checkout as safe
b03fa626f1c3 s390x: fail on error during reading of SecureExecution sysfs flag
b024ce5eeb41 Remove dup "--os=OSNAME" line in output of "ostree admin config-diff --help"
606459ad2614 Fix GNU style of two spaces for indent in https://github.com/ostreedev/ostree/pull/2612
d0005698596f s390x: ensure SecureExecution is enabled before sd-boot generation
87afaced37d5 man: Fix ostree-admin-instutil subcommands
0ba3bfe4fd0c Teach --karg-delete option to ostree admin deploy
248b2936ace8 man/ostree.repo-config.xml: add docs for bls-append-except-default key
326d89752a77 ostree-systroot-deploy: parse bls-append-except-default key
7a5c604ca339 s390x: generate sd-boot at its own partition
1c201d6be410 ci: Move codestyle and min build to GH actions
87cf46bbd92f ci: Drop all `runAsUser: 0` in builds
41b9f8ff9716 ci: Drop gcc `-fanalyzer` by default
6a055f802ffb sysroot: Strengthen several `g_return_if_fail` into `g_assert()`
e27fed45fd12 sysroot: Quiet one gcc `-fanalyzer` warning
245666c99fa1 build(deps): bump libglnx from `c71f7ae` to `c59eb27`
9f8d026f8280 ci: use cargo-deny
60404565e541 rust-bindings: Remove some unused CI/test bits
e9141e97c1c7 ci: Move rust-bindings CI to toplevel
ee2c31badd02 tests/inst: Add .gitignore
9db45cad5ae1 ci: Work around GH actions `container:` + git + security bug
558d966420e0 tests/inst: Fix install rules for ostree-rs merger
f79b2cea91fc Add APIs to get xattrs from disk
d72f1684a0ab cfg.mk: Don't even look at rust-bindings/
ffb3b2bc7ad8 docs/ima: Also link the SUSE docs
252060906b65 build-sys: Adjust for merge of ostree-rs
a5ef4cd5cc4c Add a `repo()` accessor to `TransactionGuard`
1541c5eb2efd lib: Run `cargo fmt`
d1fad37d1a78 ostree: release 0.13.7
04c8e3e9f3ad ostree: manually patch generated files
dd0cfc6d4b8e ostree: refresh after gir bump
3fc55a524bf8 ostree/cargo: bump to ostree-sys 0.9.2
61b4629b37c1 ostree-sys: release 0.9.2
cf5462178c73 ostree-sys: refresh after gir bump
1cb07e0ca59c gir-files: bump to v2022.2
887f5b09be09 repo: Add `query_file` API
1199ae9bbca1 Add manual bindings for MutableTree reading
46b4a12b23ce Release 0.13.6
ecbe3ba0f89a Fast-track fix for `ostree_gpg_verify_result_get_all()`
dde1a7b43f0d Release 0.13.5
9250effa8f95 Add `COMMIT_META_CONTAINER_CMD` constant
19224a411af0 repo: Add two more cap-std APIs
6940896c4e4e Add a `cap-std-apis` feature with open/create
4f7eea6aa7de Release 0.13.4
d1731d0ea82a repo: Add an API to read and parse directory metadata
f01c847a682b ci: add jobs for MSRV checks and linting
83b03d2996a9 lib: run rustfmt
810e86d4fbe6 lib: fix new clippy warnings
86295e3bfe79 sys/cargo: refresh manifest
1bd6e2fc0621 Update impl Display, omit to_string, change wording
2ab55beb988e add ObjectDetails-struct and use it in list_objects-function
81ea92566f46 update result type
f6c1e0cb82dc switch from if-else to match
16a4dddd9027 implement list_objects-function an test
51a03e199c21 sysroot: support create and load actions on builder
ec572d786ea8 sysroot: add a builder object
440d872f68dc repo: Add `require_rev` method
faaf0457fdfd (cargo-release) start next development iteration 0.13.4-alpha.0
34147475b50d (cargo-release) version 0.13.3
0432bd48b938 Bump ostree-sys version
99ac68cb317e Update to 2021.5
349933ab16a8 (cargo-release) version 0.13.3-alpha.1
c3141df56df2 (cargo-release) version 0.13.2
f8852ca94569 repo: Add `auto_transaction` and `TransactionGuard`
69950574f715 (cargo-release) start next development iteration 0.13.2-alpha.0
507787161ce0 (cargo-release) version 0.13.1
955f0ddb9db3 repo: Expose dfd_as_file()
e33767cc2a3d Make `SePolicy` have `Send`
7b47de7a1485 lib: Reexport libc::AT_FDCWD
2bfbfe3c6f69 sys: Release 0.9.0
09ef16fdbf6e Release 0.13
b17f3b37f0ea Release 0.12.3
0f7a1d9c0cff Cargo.toml: Bump to glib 0.14.4
f9a91bfabd6b lib: Export ffi too
9a5f14ce683e Release 0.12.2
9b57bda60773 Use glib-sys via re-exported `glib::ffi` (and similar for gio)
709b35bf1159 Fix build with --features=v2021_3, use in CI by default
abec2a9e34b6 Add more documentation for --features=v2021_3
83c829eaad8a Add new GLib 0.14 variant types for metadata types
48e0d334b86d Deny unused results, warn on missing docs (except auto/)
f3df1175f8fa cargo: bump ostree-sys to 0.8.1
b2c6dd61a196 ostree: release 0.12.1
fdfaea186402 cargo: point to docs.rs and clean up
20a025a0ebf9 lib: fix 'dox' feature
712570b9b7ae cargo: fix version in features chain
deedffde068c Re-export glib, gio
6303229c4eff Add 2021.3 feature
04a42dff1e33 Bump versions
8a5ac02822d9 Update to glib 0.14
f276c040bd21 ci: Fix buildroot to use new official image
ae189bec804d Mark src/auto/* as generated
78ca01c4e353 repo_transaction_stats: move to a manual implementation
bd843b2eae25 Bump sys version requirement
42110ce01ba4 Bump versions
7d15179670f3 Update to 2021.2
9bb0dd3c4d0c ci: Add GH action to build
b5496f70f640 repo: Add concurrency=send
0718f433a27d Update rustdoc-stripper
6043e5ffc1ea Bump all versions
674ad14ccec9 Regenerate
a96be52f1d42 Switch to patched ostree gir
0e9a16f4c10e Regenerate
c55459463f1a Update OSTree-1.0.gir to 2021.1
be8dbd701b66 Fix ostree gir file update
0c33d6331da1 Update common gir files
b526f511653e Bump versions
900973b61f9c Remove outdated sentence in readme
2caf0264c713 src: fix tests
e18919e0efad src: manually implement SysrootDeployTreeOpts
7576363329a9 ci: fix rawhide stages?
d345ea0110a4 Switch to patched ostree gir
75848b26ef02 Regenerate based on new gir
4cbbbf2daa9e gir: update OSTree gir
e686a0bed6a2 gir: update misc gir files
fe03ad1feeee Update gir file to 2020.6
1ab87e6b9792 conf: anchor function name patterns to avoid unexpected exclusions
8ef294b62763 Bump versions
5ae1a4005ce3 conf: ignore some more special-cased functions
86897a520c68 src: add Checksum::from_bytes
6f05869713d9 conf: annotate ignores better
19076fe6d8b3 src: reimplement checksum hex and base64 en/decoding
f3b0bbe64ceb src: add support for write_deployments_with_options
f45bfa2c5a3f Makefile: only depend on gir bin in gir-report
4e7abb3101a4 conf: remove some unfixable TODOs
5b1bc5041890 src: add CommitSizesEntry
3d8d5ce53e08 Disable some irrelevant functions
e49ee07373b7 Update to OSTree 2020.5
26f4170b0173 conf: disable internal Sign subtypes
a39328a4ebb0 sign: add sanity check for sign API
cefbccaee788 gir: fix another out parameter
24b514837492 gir: fix out parameters not being marked correctly
d900c5814867 gir: add missing version tag
be67b37336d7 gir: start fixing OSTree.Sign
977b51ed3961 gir: switch to gir based on patched upstream source
d8838109f55f Switch ostree source to git
e76a6b48ffbf PATCH: versions on ostree_sign_* functions
65122a5a97a9 PATCH: version on OSTREE_SIGN_NAME_ED25519
7c72d297efce PATCH: version on ostree_repo_commit_modifier_set_sepolicy_from_commit
2504c97a8d75 ci: try different Fedora image?
1010581c48f9 Update docs
cd36d8b7e4e4 Add feature levels to Cargo.toml
aee92d14a82e Update to OSTree 2020.4
d7156df1da31 Add script to get OSTree-1.0.gir from libostree source build
d7848fe8bf3d Fix indentation in readme
cc1b862ae55f Bump versions
0b267b2dc079 Add Vagrantfile
b082362df405 Also remove OSTree-1.0.gir when cleaning gir files
7ef8668f0ab7 Add command to grab latest OSTree-1.0.gir from Fedora Rawhide
409527e23231 ci: update readme (and pipeline)
28c8a3e77ac8 ci: refactor pipeline
253f46e8466f Update rustdoc-stripper
dc69966a9fe9 ci: change docs build command
2c3c976828eb Switch back to upstream gir
be60eb7e6695 ci: test building for non-x86 target
66a16b13b9d3 ci: use --workspace instead of --all
296768c2b077 ci: update sccache
66f928df83d3 src: use libc::c_char to improve non-x86 compatibility
de0cee4ecd70 tests: use RepoMode::Archive (seems to be less finicky)
990bbe290a67 Use forked gir with updated shell-words and cleaned-up build.rs
d7b785c4d318 sys: remove pkg-config dependency
c36ee94f9b9b conf: disable RepoFinder methods that don't autogenerate correctly
05e86a6b42d8 gir: patch ostree_repo_finder_avahi_new
c38d832dfcb1 Bump dependency versions
37f9e3599afd Switch from lazy_static to once_cell
130f0c283988 Update gir version and regenerate
c040aa4736b7 Regenerate with new gir files
ec2476b518cc Start adding more update instructions to README
3be9cb518fc3 gir: update bundled gir files
fddff04204bd Change branch name references
9af7577b0f04 Add LICENSE to ostree-sys
7c2410382c48 Ignore ci-cached directories so they don't interfere with the publish
a9d7623a4c2e Bump version
ddb781f39943 repo_checkout_at_options: fix version flags
935cbf416243 ci: simplify pipeline a bit maybe
175649141ed1 ci: install fewer things
6a077fff858b ci: build every feature level separately
6ab1e997eefb ci: ignore gir differences in version files
24379017c615 gir-files: update to 2020.3
8530365ccf47 Bump ostree version
5a852bd0487e Bump versions
7c56e3c49e7b Regenerate for OSTree 2020.2
8636b7173dff gir: update to OSTree 2020.2 gir
f0d617228f0b ci: disable clippy warnings for the moment
1d262ca279c4 Remove repo hash from versions.txt
a4cee3c94d27 Revert "ci: ignore changes in versions.txt lines"
8576adff1d66 ci: ignore changes in versions.txt lines
31c80cb22bff Bump versions
3290d5c2d196 Rewrite handwritten futures functions
3e70feb75f55 Start taking out futures feature
241806b75783 Update glib + gir and regenerate
28407036b155 Bump versions
3f438a9c3ff2 Add 2019.6 feature
5bfc5d12d0c4 Regenerate files
5ecc8a0e4fc1 gir: update OSTree-1.0.gir
59f9b69989d9 Bump versions
f0ef98a71af1 Add some ignored types
bf27ba5dc0e8 Fix lint in tests
d2e384a39fbe Update gir file
f5c255b4b493 Update bundled glib gir files
366e9b729f4e Add feature alias for the latest OSTree version
14b511d32b87 ci: fix setup, again
53f9c1a3aa6a ci: install sccache during docs build
2014336b03b6 ci: install make
ad6e0569be49 ci: don't reformat -sys
486c60489ad8 Set up cargo workspace
75ab3f50cda2 Fix clippy issue
4bdb7b876058 ci: switch to Fedora Rawhide
bdf749b0e683 ci: update sccache
febbd00c2795 ci: run crates.io publish on release tags
376dc2896c15 ci: fix build
d801cacb5d90 Bump crate versions
f640444986d2 checksum: implement more traits and functions
2fdf020645f4 checksum: implement conversion from string and to base64
ad26abaa7e05 Implement ostree::checksum_file_at
815b8563d54f Implement ostree::checksum_file_async
14f2ff43df7b Implement ostree::checksum_file_from_input
7f3bd56d0dba Implement ostree::checksum_file
4cd981d01b04 Use pointer coercion instead of messing with -sys
d55d1b1d4393 Fix file mode
6bc1a1d99552 Add SePolicy::fscreatecon_cleanup
e424800f05a2 Implement Repo::write_metadata_async
8002e06e2575 Implement Repo::write_content_async
bb4e0c597850 Implement Repo::write_metadata
78a14d15a3eb Implement Repo::write_content
17a9d7c85541 Implement Checksum type for binary checksums
6ef9ab2558fc kernel_args: fix feature flags
3bfb805288b3 kernel_args: enable and fix argv methods
12d976d45d43 Make kernel_args compile
32173d5b81a5 Add generated KernelArgs (not working yet)
8f223aca1a10 ci: bump used version
e6a1fddc8c9b Regenerate main crate
377b7ae20270 Clean up docs.rs sections in Cargo.tomls
5980af7b420b Ignore BUILT_FEATURES from main crate
d2525da221b4 Regenerate -sys
0e3b567b194e Disable build features constant
d51861e80cbd Update OSTree-1.0.gir
3951ac14b800 Update gir files
f7d769c0c490 ci: fix feature flags
b94af875895e Revert "Enable some functions that seem to work now"
13556fde44dc Enable some functions that seem to work now
160bdaeb5c40 Add features for docs.rs build
75ce6dfcac81 Update gir version
7f61aeb779af ci: use libostree from unstable
dee049082968 ci: fix
14577daf7f82 ci: I guess we did need CMake
110b09e1cd5f ci: fix features for -sys
35fde6031815 ci: still need before_script for docs
e4c82f6e8ec9 ci: clean up image
39532d4160c1 ci: remove separate futures build
3597c3c38b21 ci: include `futures` in docs
d7ea8af665ff Fix tests on nightly (by avoiding UB, even)
27ac97df879c ci: fix futures job maybe
48de8595821e conf: remove a problematic function that was fixed in gir
43c779189022 ci: add job for futures feature
8d9aa7a85734 Enable futures feature
2c0730209771 Update to new glib-rs versions
5b6991af9ce8 Bump gir version
b1a41e90bd33 Add notes about releases and tags
1a301faa59be Bump version
6a86340e9fc6 conf: add some more loose types
7f8f32e4d03d conf: clean up comments a bit
9e8192fec87c lib: add some glib types to generate more functions
b44202fa9021 ci: add Makefile target to run gir -m not_bound
b51b81dfddf4 lib: generate some additional classes
01ae586f9598 lib: brush up some docs
87b34be855b0 lib: catch unwinds in RepoCheckoutFilter
315cd5394e67 lib: fix clippy
d74c0fc04f98 lib: add docs and safety notes to RepoCheckoutFilter
e39f8d7461c6 lib: add repo_checkout_filter function for better ergonomics
903bd86e5268 lib: clean up types for RepoCheckoutFilter
94b524b21f5e lib: split out RepoCheckoutFilter
6776c819f101 tests: reorganise repo tests so they have fewer feature flags
eb602d8546e1 tests: fix imports with default features
19fdf706d5ca lib: implement CheckoutOptions::filter (hackishly)
a521c838f519 ci: run clippy with default features as well
54be07c6b90a tests: fix checkout_at tests
4bab406a1a7a lib: satisfy clippy
aef78f3985b9 lib: handle ino cache and sepolicy options
eec4a2287d0b lib: RepoCheckoutAtOptions
16718eb1552d Revert "Simplify docs build"
1c7df84de182 Simplify docs build
a7079e543fde Consolidate some pipeline stages
b5fba187ffc9 Fix clippy issues
dfcaf3eede62 Ignore clippy issues in generated code
4cfda21ff951 Disallow clippy warnings
feca7ddae6cf Oh wait, check doesn't actually do anything useful for us...
8982c1914ee9 Force clippy to run even after check
0c076163424c ci: use sccache
87bf13574f3c Update version in README and add some notes on version bumps
d12b506f8666 Bump version
82ccc6065b1d Remove extraneous generated files
06489f492696 Check that we haven't included extraneous generated files
3483927f4052 Add copies of the various LGPL versions and notes about their relevance
faef3562b8c2 collection_ref: add accessors for collection_id and ref_name
91dc91661507 Document ObjectName
2892430fa733 Ignore deprecated (and reportedly unsafe) method
7ac82e5d1b90 Clean up some comments
1e744239cbe6 Document Repo::new_for_path
8fc327296e27 Improve doc blurb a bit
1f2072166453 We don't need to patch the hand-written Repo symbols any more
0fe1b0d951bd Add ignored test for empty FileInfo crash
80de2aa2eaa3 Add test for checkout_tree
1068d4f619fc Adjust CI check flags
fa1bf6cbb8e8 Add more checks to the pipeline
66cf9b288fcf Move extra Repo methods to plain impl as well
493ba2e2f5e6 Update gir and regenerate
0b85551588d1 Change gir targets
40a7eecbf6e3 Fix docs publish
ebbf285f28d1 Build docs more smartly
15c8e6376d97 Add html_root_url
b24197c2517a Don't fmt and check for now
a3bcc237f538 Fix gitlab-ci
2c7761047a76 Add fmt check, check, clippy
f1a7507ee4e3 Also cache docs
b218a5b6c502 Try caching
0d33525815ea Suppress unused import warnings in generated code
c7f158ad94c2 Disable CollectionRef tests on too-old features
f5375f36b68b Don't separately build ostree-sys with nightly
f5b4d7edcda3 Add other interesting pipeline stages
0e23ed73e6a9 Don't allow nightly runs to fail
c89270969ce1 Refactor tests and add test for traverse_commit
ff3e268a3b88 Add some more unsorted types
ab3e2c908e1c Switch ObjectName to GString
475cd53c43de Add docs for methods that were moved to RepoExtManual
f7963d86ad6b Fix
2452dee27986 Clarify reasons for async exclude
3decba546e8e Switch to generated CollectionRef
60960612a316 Reorganise test code
bf488d226665 Build with older libostree version for now
61e205b5c3d3 Regenerate and update to new gir and glib-rs version
df2d708f3068 Add missing version features
bc0a8a04d361 sys: regenerate with new gir
0f0ccb898d35 Update gir version
c41cc620bbd8 Add version features
8d19e94d6ae0 sys: regenerate with external version file
82b61d0bae00 Add more types
31eccf004ee4 Pin rustdoc-stripper version
7b9bdf143cf8 Add some explanatory comments to gir config
0bf8f3f52e82 Fix some issues with RepoFile
26b5729c536e Add some tests for Repo
cfcc97d5f77d Fix a few more missing methods
04bd81be0fc4 Sanity test for ObjectName
c3f120e8b6ce Add some sanity tests for CollectionRef
8561eaaa8c2e Fix return type for CollectionRef::new
8bfefa2b146e Build CollectionRef manually
13c61a9329ea Fix features in Repo
8afba7f5ab8a Add explanatory comments to ostree-sys.toml
7871c600e0ea Test sys with v2018_9 until I can get 2019.2 for CI
3fa9378a5e48 Update OSTree gir and regenerate
91df5067a5e6 Update base gir files
c6b0ebaf6e73 Add note about crate rename
999d239c5907 Rename libostree to ostree
77697b10f741 Rename libostree to ostree
f4cf9d337721 Rename libostree-sys to ostree-sys
e62ca73e825e Remove unnecessary gir/* aliases
57645e91cb13 Remove version constants to fix build with different libostree versions
16709027e1f9 Pin gir version
5028561b18fb Repo rename
e817635e8b70 sys: regenerate
6b082eb2c409 Test with all features
7d9c44ec4a57 Remove some methods that are not generated correctly
20dca2630cee Move libostree-sys/ to sys/
7c29936b840d Reorganise gitlab-ci.yml a bit
98fbf253a701 Get rid of pre-package workaround
59247025954e Update gitlab-ci.yml
382aa27f440f Exclude unnecessary files correctly
260c273286a6 Move installed tools into target/tools
ced47cbb26df Move main crate into repo root
a16ea65e0f1f Add features
a5f2ae9a59a8 Add CMake to build gir
bc2d9621e2ea Update readme
30517deaead2 Remove lgpl-docs feature
2b76bf8330a9 Add back API docs merge to Makefile
587c6d4778ed --allow-dirty to deal with the extra files we copy in
a404058eaf90 Fix -sys pre-package
3c93c8499123 Add badge-with-link to docs
84b8a35791b0 Update readme a lot
67c318164b7f Add LICENSE to packages
128a31f601f9 Bump versions
233776a39dd8 Add Gitlab badge
b69a39fab849 Update docs back to self-hosted
d8ce189e9124 Move readme to repo root and copy it to the code prior to packaging
3bc590d151b4 Add a symlink to the package readme in the repo root
797728f88d57 Keep only one license file in the repo root
b6813b0d919e Fix docs build hopefully
cc95bfafda07 Always build docs
8bf24cf34b1c Build API docs with LGPL parts
82cbd02fea54 Remove docs targets
6d756149a3e2 libostree: include API docs at build time using a feature flag
39c820a54997 libostree-sys: remove license file
9cca19eeb2d8 Add libostree release task
87db0d1a6ae0 Bump -sys version
19592ec6874d Strip the libostree docs
ee897f09c5e0 Disable libostree docs
dfab03486bec libostree: add metadata, readme, and license file
eee83b38b492 libostree-sys: switch to docs.rs and add license file
423caf33d2e2 Try setting up docs.rs capable build
250a2e8a4f7b Bump -sys version
25ac189bf377 Remove release builds
38c477b5ec10 Only publish for master & set docs urls
0cc98e700b5d Always build docs
93d3a55a1c68 Add docs build
1d571d79104a Fix Gitlab URL & remove readme
9d51535f1af0 Fix libostree-sys publish step
58c4842d109d Add libostree-sys publish step
4c6d1dce4dc4 Add some metadata to libostree-sys
269b63d8a0b1 Remove package stage for now
fea0a7d807a7 Do release build and simply job names
527e1b4b4dd8 Install libostree for everything, actually
3259d4ad7741 Also install libostree-dev for libostree builds
db7431b28bcf Use libostree from backports
79419df6e387 Install libostree in CI
c1d58f180619 Add CI config
e9ec6462bcd0 Add workspace Cargo.toml
8c5094d6fb9d Un-bump versions
361bf102dc1b Exclude generated code from clippy
80fd5823b00f Explicitly implement PartialEq for ObjectName to satisfy clippy
88b4a12c32cf Run cargo fmt on the custom code
fdac646f7e44 Add include to make libostree-sys tests work
58532178bf8f Regenerate libostree-sys
38a886ffc6fa Ignore internal structs in libostree-sys
42423b96e5c5 Generate docs for RepoExtManual
a32f2092856f Copy autodocs to hand-implemented methods in RepoExtManual
f8c4c83c9cca Add docs to generated files
4dda00c7418a repo: newlines
f77fc78ecf3f Regenerate libostree
868973325a41 Regenerate libostree-sys
9394222cc136 Add Makefile
6d25a0374a7c Remove sample
7a08fe0940af Add simple repo roundtrip test
dff1cf631b3a repo: implement list_refs and list_refs_ext
ae9413343d5d Add RepoListRefsExtFlags
fa2b155f7d4a object_name: extend ObjectName
436459844975 repo: remove now-incorrect comment
f26e0013a57d repo: change custom new method to std::path::Path-alike
fa615fb1bbad Add ObjectName wrapper to solve hashing issues
ad1111956357 sample: try to extract a file from the repo
1cfca1582f77 Ignore Cargo.lock in libs
116f0dea8686 Try implementing traverse_commit by hand
5e8753b369a6 Generate functions and constants
306046f5721b Integrate docs into source
19fef7159215 Add as much of Repo as easily possible
62f8310dea58 Add additional 'new' method to Repo
449899b16f8c Add a test/sample program
1ea604a53149 Add a prelude module for star imports
4c51e595f07c Add some basic types and regenerate
45eab127a6c2 Generate
8950188bce0c Add build files for libostree
0c45c2ec822a Start describing libostree
5c2d700d519c Add manual definition for stat
c47eb7700119 Update names and dependencies
7e2c82b1b1e3 Add external libraries and regenerate
03abeebb89ed Add initial gir output
804b1107b59f Add config file and gir files
83956daeeeff ci/github: add a job for --without-libsystemd
4b7fc4f1e90b lib/ostree-sysroot-deploy: add a missing include for stdint.h
3583143cf01e configure: post-release version bump
0554beb4c2b1 Release 2022.3
71304e854cdb repo: Correctly initialize refcount of temporary transaction
540e60c3e3ac repo: Factor out _ostree_repo_auto_transaction_new()
d3d3e4ea1394 Add an `ostree-boot-complete.service` to propagate staging failures
b070e0f54a52 Update docs/ima.md
614d30acf335 docs: Add new IMA document
b92dbc49f073 ci: Mask zincati for synthetic update
4fd0d6b4c156 fetcher/curl: Consistently check return value `curl_easy_setopt`
7e83726faab0 tests: move fixture to fix installed tests
9b6a8171c5a6 docs: Publish man pages
8032e89d33f7 man: Create an HTML index
d5061dcf82f6 man: Use custom XSL stylesheet for HTML output
61deb167daa1 man: Allow building HTML man pages
f396873d3687 man: Remove unnecessary nbsp's from ostree man page
2346d5f4d581 libarchive: Handle `archive_entry_symlink()` returning NULL
c58a4fe661d9 deploy: Be a bit more verbose about SELinux bits
edb4f3893474 deploy: Try to rebuild policy in new deployment if needed
1898019face4 tests/test-cli-extensions: Fix with single-binary coreutils
afdc84b97bb6 Update to sh-inline 0.2
e6f92f76fad0 ci: Update docs workflow to use fcos-buildroot
089b82109894 ci: Disable Ubuntu LTS
aca9e8e6a73c glib: bump glib requirement to 2.66 and port to GUri
75ae283f23e7 Update to rand 0.8
fba7efb6da60 Update to ostree-ext 0.6
34d1bcc68ab9 Update to nix 0.23
b6d1119f9120 tests: Stop using inventory crate
0d020a7145da tmpfiles: Create `/run/ostree`
039d86c63be7 README.md: update ostree-rs language binding link
faa8ed547b09 Add Fedora Kinoite link to index.md also.
8cc8e687683f ostree-repo-pull: Take correct out path on error
92ca2c7794af test-prune: Read to the end of cut(1) output
a9a0110f440d s390x-se-luks-gencpio: Use interoperable path for bash
084f8913f023 s390x-se-luks-gencpio: Fix shebang syntax
ca0bb7595445 apidoc: add missing page includes
4c0f9e094902 configure: post-release version bump

Signed-off-by: Alex Kiernan <alex.kiernan@...>
---
...0x-Avoid-bringing-in-bash-dependency.patch | 27 +++++++++++++++++++
.../{ostree_2022.2.bb => ostree_2022.5.bb} | 17 ++++++------
2 files changed, 36 insertions(+), 8 deletions(-)
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-s390x-Avoid-bringing-in-bash-dependency.patch
rename meta-oe/recipes-extended/ostree/{ostree_2022.2.bb => ostree_2022.5.bb} (92%)

diff --git a/meta-oe/recipes-extended/ostree/ostree/0001-s390x-Avoid-bringing-in-bash-dependency.patch b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-Avoid-bringing-in-bash-dependency.patch
new file mode 100644
index 000000000000..23fd236ea803
--- /dev/null
+++ b/meta-oe/recipes-extended/ostree/ostree/0001-s390x-Avoid-bringing-in-bash-dependency.patch
@@ -0,0 +1,27 @@
+From a632eee5a2196a335be70f5880f1ed5916e86777 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan <alex.kiernan@...>
+Date: Sun, 31 Jul 2022 12:08:51 +0100
+Subject: [PATCH] s390x: Avoid bringing in bash dependency
+
+bash is GPLv3 licensed and there's nothing in this script which really
+needs it.
+
+Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/2682]
+Signed-off-by: Alex Kiernan <alex.kiernan@...>
+---
+ src/libostree/s390x-se-luks-gencpio | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio
+index e821e2fecd69..d55574be16e2 100755
+--- a/src/libostree/s390x-se-luks-gencpio
++++ b/src/libostree/s390x-se-luks-gencpio
+@@ -1,6 +1,6 @@
+-#!/bin/bash
++#!/bin/sh
+ # This script creates new initramdisk with LUKS config within
+-set -euo pipefail
++set -eu
+
+ old_initrd=$1
+ new_initrd=$2
diff --git a/meta-oe/recipes-extended/ostree/ostree_2022.2.bb b/meta-oe/recipes-extended/ostree/ostree_2022.5.bb
similarity index 92%
rename from meta-oe/recipes-extended/ostree/ostree_2022.2.bb
rename to meta-oe/recipes-extended/ostree/ostree_2022.5.bb
index 50d0548cc73e..fb0eb746f9c5 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2022.2.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2022.5.bb
@@ -17,11 +17,11 @@ DEPENDS = " \
bison-native \
"

-SRC_URI = " \
- gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \
- file://run-ptest \
-"
-SRCREV = "fbc6d21c2f71099fbab44cbdd74222b91f61c667"
+SRC_URI = "gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \
+ file://run-ptest \
+ file://0001-s390x-Avoid-bringing-in-bash-dependency.patch \
+ "
+SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0"

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

@@ -67,16 +67,17 @@ PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi"
PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig"
PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl"
PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut"
-PACKAGECONFIG[glib] = "--with-crypto=glib"
+PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium"
PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs"
-PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls"
+PACKAGECONFIG[glib] = "--with-crypto=glib, , , , , gnutls openssl"
+PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls, , , glib openssl"
PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme"
PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive"
PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux"
PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native"
PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio"
PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2"
-PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl"
+PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl, , , glib gnutls"
PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse"
PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux"
PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack"
--
2.35.1


[meta-networking][PATCH] strongswan: upgrade 5.9.6 -> 5.9.7

Yi Zhao
 

ChangeLog:
https://github.com/strongswan/strongswan/releases/tag/5.9.7

Drop backport patch 0001-enum-Fix-compiler-warning.patch.

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../0001-enum-Fix-compiler-warning.patch | 31 -------------------
...trongswan_5.9.6.bb => strongswan_5.9.7.bb} | 3 +-
2 files changed, 1 insertion(+), 33 deletions(-)
delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
rename meta-networking/recipes-support/strongswan/{strongswan_5.9.6.bb => strongswan_5.9.7.bb} (98%)

diff --git a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
deleted file mode 100644
index e730fe1cd..000000000
--- a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@...>
-Date: Mon, 2 May 2022 09:31:49 +0200
-Subject: [PATCH] enum: Fix compiler warning
-
-Closes strongswan/strongswan#1025
-
-Upstream-Status: Backport
-[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960]
-
-Signed-off-by: Yi Zhao <yi.zhao@...>
----
- src/libstrongswan/utils/enum.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
-index 79da450f0c..1e77489f6f 100644
---- a/src/libstrongswan/utils/enum.c
-+++ b/src/libstrongswan/utils/enum.c
-@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len)
- return buf;
- }
-
-- if (snprintf(buf, len, e->names[0]) >= len)
-+ if (snprintf(buf, len, "%s", e->names[0]) >= len)
- {
- return NULL;
- }
---
-2.25.1
-
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
similarity index 98%
rename from meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
rename to meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
index 1b82dceac..349538620 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.7.bb
@@ -9,10 +9,9 @@ DEPENDS = "flex-native flex bison-native"
DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}"

SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
- file://0001-enum-Fix-compiler-warning.patch \
"

-SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7"
+SRC_URI[sha256sum] = "9e64a2ba62efeac81abff1d962522404ebc6ed6c0d352a23ab7c0b2c639e3fcf"

UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"

--
2.25.1


Re: [meta-multimedia][PATCH] vlc: add virtual/vlc alias

Khem Raj
 



On Sun, Jul 31, 2022 at 3:18 PM Ross Burton <ross.burton@...> wrote:

> On 30 Jul 2022, at 22:24, Vincent Davis Jr via lists.openembedded.org <vince=underview.tech@...> wrote:
>
> Hey again Ross sorry I know I already sent this meant to hit reply all.
>
> Meant to say for layers that contain recipes that clone different implementations of VLC and want to allow the ability to select an implementation. Would be nice to have PROVIDES = "virtual/vlc" here versus multiple different layers providing bbappend files that add the PROVIDES variable.
>
> Working in PR were we want to allow either upstream implementation of VLC or raspberry pi distro implementation.
>
> https://github.com/agherzan/meta-raspberrypi/pull/985

I still don’t see the need: meta-raspberrypi’s vlc-rpi can PROVIDE vlc and set PREFERRED_PROVIDER.

Right I think calling recipe something like Vic-raspberrypi.bb and using PREFERRED_PROVIDER is a good idea. This will let distros make the choice as they see fit 


Ross





Re: [meta-multimedia][PATCH] vlc: add virtual/vlc alias

Ross Burton
 

On 30 Jul 2022, at 22:24, Vincent Davis Jr via lists.openembedded.org <vince=underview.tech@...> wrote:

Hey again Ross sorry I know I already sent this meant to hit reply all.

Meant to say for layers that contain recipes that clone different implementations of VLC and want to allow the ability to select an implementation. Would be nice to have PROVIDES = "virtual/vlc" here versus multiple different layers providing bbappend files that add the PROVIDES variable.

Working in PR were we want to allow either upstream implementation of VLC or raspberry pi distro implementation.

https://github.com/agherzan/meta-raspberrypi/pull/985
I still don’t see the need: meta-raspberrypi’s vlc-rpi can PROVIDE vlc and set PREFERRED_PROVIDER.

Ross


kirkstone merge request: July 31st

Armin Kuster
 

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


[PATCH v2] python: add Pydantic data validation package

Clément Péron
 

Signed-off-by: Clément Péron <peron.clem@...>
---
.../recipes-devtools/python/python3-pydantic_1.9.1.bb | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 meta-python/recipes-devtools/python/python3-pydantic_1.9.1.bb

diff --git a/meta-python/recipes-devtools/python/python3-pydantic_1.9.1.bb b/meta-python/recipes-devtools/python/python3-pydantic_1.9.1.bb
new file mode 100644
index 0000000000..1d113c9c50
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pydantic_1.9.1.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Data validation and settings management using Python type hinting"
+HOMEPAGE = "https://github.com/samuelcolvin/pydantic"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2c02ea30650b91528657db64baea1757"
+RDEPENDS:${PN} += "\
+ python3-typing-extensions \
+"
+
+inherit pypi setuptools3
+
+SRC_URI[sha256sum] = "1ed987c3ff29fff7fd8c3ea3a3ea877ad310aae2ef9889a119e22d3f2db0691a"
--
2.34.1


Re: [meta-gnome][PATCH] ibus.inc: fix after branch renaming

Markus Volk
 

Am Sa, 30. Jul 2022 um 17:31:59 -0300 schrieb Fabio Estevam <festevam@...>:
Does the change below fix it?

'bitbake -c cleanall' didn't solve the issue, 'branch=main did'. Is there a reason why this should be preferred over 'nobranch=1' ? The latter seems to be less maintenance.


Re: [meta-multimedia][PATCH] vlc: add virtual/vlc alias

Vincent Davis Jr
 

Hey again Ross sorry I know I already sent this meant to hit reply all.

Meant to say for layers that contain recipes that clone different implementations of VLC and want to allow the ability to select an implementation. Would be nice to have PROVIDES = "virtual/vlc" here versus multiple different layers providing bbappend files that add the PROVIDES variable.

Working in PR were we want to allow either upstream implementation of VLC or raspberry pi distro implementation.


On Sat, Jul 30, 2022, 14:32 Ross Burton <Ross.Burton@...> wrote:
> On 30 Jul 2022, at 03:28, Vincent Davis Jr via lists.openembedded.org <vince=underview.tech@...> wrote:
>
> For layers that want to provide the ability to
> select a version of VLC.

There’s no need for this.

If there’s just different versions, then have vlc_1.2.3.bb alongside vlc_1.0.0.bb and use PREFERRED_VERSION.

If you’ve got a fork, then just name it vlc-foo_1.2.3.bb and use PREFERRED_PROVIDER.

There’s no need to use virtual/ with PREFERRED_PROVIDER.  virtual/* should only be used when you want an abstract thing and there are many implementation, such as virtual/libc, which can be glibc, newlib, musl, etc.

Ross


Re: [meta-gnome][PATCH] ibus.inc: fix after branch renaming

Fabio Estevam
 

On Sat, Jul 30, 2022 at 4:57 PM Markus Volk <f_l_k@...> wrote:

I'll test this tomorrow. But on the ibus github page there is no master branch anymore, so i doubt -c cleanall will help

https://github.com/ibus/ibus
Does the change below fix it?

--- 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"


Re: [meta-gnome][PATCH] ibus.inc: fix after branch renaming

Markus Volk
 

On Sat, Jul 30 2022 at 01:25:23 PM -0400, Khem Raj <raj.khem@...> wrote:
even when you do bitbake -ccleanall <recipe> && bitbake <recipe> ?

I'll test this tomorrow. But on the ibus github page there is no master branch anymore, so i doubt -c cleanall will help


Re: [meta-multimedia][PATCH] vlc: add virtual/vlc alias

Ross Burton
 

On 30 Jul 2022, at 03:28, Vincent Davis Jr via lists.openembedded.org <vince=underview.tech@...> wrote:

For layers that want to provide the ability to
select a version of VLC.
There’s no need for this.

If there’s just different versions, then have vlc_1.2.3.bb alongside vlc_1.0.0.bb and use PREFERRED_VERSION.

If you’ve got a fork, then just name it vlc-foo_1.2.3.bb and use PREFERRED_PROVIDER.

There’s no need to use virtual/ with PREFERRED_PROVIDER. virtual/* should only be used when you want an abstract thing and there are many implementation, such as virtual/libc, which can be glibc, newlib, musl, etc.

Ross

1761 - 1780 of 99837