diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
100 files changed, 1640 insertions, 1084 deletions
diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 0c5f6beaae..77dace08a0 100644 --- a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -26,7 +26,6 @@ PTESTS_FAST_META_OE = "\ libxmlb \ libyang \ lmdb \ - mcelog \ minicoredumper \ neon \ nodejs \ @@ -38,6 +37,9 @@ PTESTS_FAST_META_OE = "\ xmlsec1 \ zeromq \ " +PTESTS_FAST_META_OE:append:x86 = " mcelog" +PTESTS_FAST_META_OE:append:x86-64 = " mcelog" + PTESTS_FAST_META_OE:remove:libc-musl = "minicoredumper" PTESTS_FAST_META_OE:remove:riscv64 = "nodejs" PTESTS_FAST_META_OE:remove:riscv32 = "nodejs" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.3.bb index 7c3197778f..0987522ac8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.3.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "06fdb1000cb3f25ff78a2441c0e0f9e5bb2abec3eff907d57f58c1709c110217" +SRC_URI[sha256sum] = "4d27661113c54e3b0998328f15ca7fd9e4837d1975c7c213595cb940f4b11484" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.6.bb index e1f21c3bab..64d6232883 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.6.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "3441effed58297b63779e706c74884234acb874b07872f8b55e0da28729fda32" +SRC_URI[sha256sum] = "f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch new file mode 100644 index 0000000000..dfd1f98759 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/files/CVE-2023-35789.patch @@ -0,0 +1,131 @@ +CVE: CVE-2023-35789 +Upstream-Status: Backport [ https://github.com/alanxz/rabbitmq-c/commit/463054383fbeef889b409a7f843df5365288e2a0 ] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + +From 463054383fbeef889b409a7f843df5365288e2a0 Mon Sep 17 00:00:00 2001 +From: Christian Kastner <ckk@kvr.at> +Date: Tue, 13 Jun 2023 14:21:52 +0200 +Subject: [PATCH] Add option to read username/password from file (#781) + +* Add option to read username/password from file +--- + tools/common.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + +diff --git a/tools/common.c b/tools/common.c +index 73b47e25..7efe557b 100644 +--- a/tools/common.c ++++ b/tools/common.c +@@ -18,6 +18,11 @@ + #include "compat.h" + #endif + ++/* For when reading auth data from a file */ ++#define MAXAUTHTOKENLEN 128 ++#define USERNAMEPREFIX "username:" ++#define PASSWORDPREFIX "password:" ++ + void die(const char *fmt, ...) { + va_list ap; + va_start(ap, fmt); +@@ -125,6 +130,7 @@ static char *amqp_vhost; + static char *amqp_username; + static char *amqp_password; + static int amqp_heartbeat = 0; ++static char *amqp_authfile; + #ifdef WITH_SSL + static int amqp_ssl = 0; + static char *amqp_cacert = "/etc/ssl/certs/cacert.pem"; +@@ -147,6 +153,8 @@ struct poptOption connect_options[] = { + "the password to login with", "password"}, + {"heartbeat", 0, POPT_ARG_INT, &amqp_heartbeat, 0, + "heartbeat interval, set to 0 to disable", "heartbeat"}, ++ {"authfile", 0, POPT_ARG_STRING, &amqp_authfile, 0, ++ "path to file containing username/password for authentication", "file"}, + #ifdef WITH_SSL + {"ssl", 0, POPT_ARG_NONE, &amqp_ssl, 0, "connect over SSL/TLS", NULL}, + {"cacert", 0, POPT_ARG_STRING, &amqp_cacert, 0, +@@ -158,6 +166,50 @@ struct poptOption connect_options[] = { + #endif /* WITH_SSL */ + {NULL, '\0', 0, NULL, 0, NULL, NULL}}; + ++void read_authfile(const char *path) { ++ size_t n; ++ FILE *fp = NULL; ++ char token[MAXAUTHTOKENLEN]; ++ ++ if ((amqp_username = malloc(MAXAUTHTOKENLEN)) == NULL || ++ (amqp_password = malloc(MAXAUTHTOKENLEN)) == NULL) { ++ die("Out of memory"); ++ } else if ((fp = fopen(path, "r")) == NULL) { ++ die("Could not read auth data file %s", path); ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, USERNAMEPREFIX, strlen(USERNAMEPREFIX))) { ++ die("Malformed auth file (missing username)"); ++ } ++ strncpy(amqp_username, &token[strlen(USERNAMEPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_username); ++ if (amqp_username[n - 1] != '\n') { ++ die("Username too long"); ++ } else { ++ amqp_username[n - 1] = '\0'; ++ } ++ ++ if (fgets(token, MAXAUTHTOKENLEN, fp) == NULL || ++ strncmp(token, PASSWORDPREFIX, strlen(PASSWORDPREFIX))) { ++ die("Malformed auth file (missing password)"); ++ } ++ strncpy(amqp_password, &token[strlen(PASSWORDPREFIX)], MAXAUTHTOKENLEN); ++ /* Missing newline means token was cut off */ ++ n = strlen(amqp_password); ++ if (amqp_password[n - 1] != '\n') { ++ die("Password too long"); ++ } else { ++ amqp_password[n - 1] = '\0'; ++ } ++ ++ (void)fgetc(fp); ++ if (!feof(fp)) { ++ die("Malformed auth file (trailing data)"); ++ } ++} ++ + static void init_connection_info(struct amqp_connection_info *ci) { + ci->user = NULL; + ci->password = NULL; +@@ -237,6 +289,8 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_username) { + if (amqp_url) { + die("--username and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--username and --authfile options cannot be used at the same time"); + } + + ci->user = amqp_username; +@@ -245,11 +299,23 @@ static void init_connection_info(struct amqp_connection_info *ci) { + if (amqp_password) { + if (amqp_url) { + die("--password and --url options cannot be used at the same time"); ++ } else if (amqp_authfile) { ++ die("--password and --authfile options cannot be used at the same time"); + } + + ci->password = amqp_password; + } + ++ if (amqp_authfile) { ++ if (amqp_url) { ++ die("--authfile and --url options cannot be used at the same time"); ++ } ++ ++ read_authfile(amqp_authfile); ++ ci->user = amqp_username; ++ ci->password = amqp_password; ++ } ++ + if (amqp_vhost) { + if (amqp_url) { + die("--vhost and --url options cannot be used at the same time"); diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb index f9c2b2c8a9..ea80ec3344 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.13.0.bb @@ -3,7 +3,9 @@ HOMEPAGE = "https://github.com/alanxz/rabbitmq-c" LIC_FILES_CHKSUM = "file://LICENSE;md5=7e12f6e40e662e039e2f02b4893011ec" LICENSE = "MIT" -SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https" +SRC_URI = "git://github.com/alanxz/rabbitmq-c.git;branch=master;protocol=https \ + file://CVE-2023-35789.patch \ +" # v0.13.0-master SRCREV = "974d71adceae6d742ae20a4c880d99c131f1460a" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb index 1dbdc3e46a..948d312bde 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_4.10.0.bb @@ -4,8 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "d67b6352b87a238775cd17e4376b980d07fa7939" -PV = "4.9.0" +SRCREV = "c94c20743ed7d4aa37835a5c46567ab0790d4acc" SRC_URI = "git://github.com/zeromq/cppzmq.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc index 208b39acd4..0972aff32c 100644 --- a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" -SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71" +SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.8.bb index f4d983a6e0..ad7a3a7ed4 100644 --- a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.8.bb @@ -11,8 +11,8 @@ SECTION = "lib" inherit pkgconfig cmake features_check PV .= "+git${SRCPV}" -SRCREV = "781fbbadb0bccc749058177b1385c82da9ace880" -SRC_URI = "git://github.com/glfw/glfw.git;branch=master;protocol=https" +SRCREV = "7482de6071d21db77a7236155da44c172a7f6c9e" +SRC_URI = "git://github.com/glfw/glfw.git;branch=3.3-stable;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 469e202175..0a88f37acf 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -569,7 +569,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ xclock \ xfontsel \ xkbprint \ - xsetmode \ xlsatoms \ xlsclients \ xlsfonts \ @@ -595,9 +594,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ font-cursor-misc \ font-misc-misc \ xorg-fonts-100dpi \ - liblbxutil \ libxaw6 \ - libxkbui \ libxpresent \ xcb-util-cursor \ xserver-common \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_15.00.0000.bb index 57ade6162b..be79caef0b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_15.00.0000.bb @@ -26,7 +26,7 @@ SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "b39b7e5c41fd6475c551112fa724bf57c4a446175ec4188a90e2844cc1612585" +SRC_URI[sha256sum] = "ca57d6349532ea7fb4fae17bbfc107abe5a155ca2f43446315f9e23764b3f8ec" DEPENDS += "postgresql unixodbc" diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch deleted file mode 100644 index e572022684..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5c63eb5d56abd4e5232add4727247965a863d851 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 15 Dec 2019 14:02:45 -0800 -Subject: [PATCH] Do not add stack pointer to clobber list - -It was being ignored until now when gcc 9.0 became capable -of flagging these silent ignore via [1]. - -We weren't actually clobbering the stack pointers here -so it should not cause change in behavior. - -[1] https://gcc.gnu.org/PR52813 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - linux_syscall_support.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/linux_syscall_support.h b/linux_syscall_support.h -index 9276f56..6e73309 100644 ---- a/linux_syscall_support.h -+++ b/linux_syscall_support.h -@@ -1955,7 +1955,7 @@ struct kernel_statfs { - LSS_ENTRYPOINT \ - "pop %%ebx" \ - args \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res) - #undef _syscall0 - #define _syscall0(type,name) \ -@@ -2012,7 +2012,7 @@ struct kernel_statfs { - : "i" (__NR_##name), "ri" ((long)(arg1)), \ - "c" ((long)(arg2)), "d" ((long)(arg3)), \ - "S" ((long)(arg4)), "D" ((long)(arg5)) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - #undef _syscall6 -@@ -2034,7 +2034,7 @@ struct kernel_statfs { - : "i" (__NR_##name), "0" ((long)(&__s)), \ - "c" ((long)(arg2)), "d" ((long)(arg3)), \ - "S" ((long)(arg4)), "D" ((long)(arg5)) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, -@@ -2120,7 +2120,7 @@ struct kernel_statfs { - : "0"(-EINVAL), "i"(__NR_clone), - "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), - "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) -- : "esp", "memory", "ecx", "edx", "esi", "edi"); -+ : "memory", "ecx", "edx", "esi", "edi"); - LSS_RETURN(int, __res); - } - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch index d7a5c06753..df41b4d6c0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch @@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Makefile.am | 12 ------------ 1 file changed, 12 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index ee7454e4..69700192 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -187,10 +187,6 @@ src_client_linux_libbreakpad_client_a_SOURCES = \ +@@ -529,10 +529,6 @@ src_client_linux_libbreakpad_client_a_SO src/common/linux/linux_libc_support.cc \ src/common/linux/memory_mapped_file.cc \ src/common/linux/safe_readlink.cc @@ -24,10 +22,10 @@ index ee7454e4..69700192 100644 -src_client_linux_libbreakpad_client_a_SOURCES += \ - src/common/linux/breakpad_getcontext.S -endif - endif LINUX_HOST - if !DISABLE_PROCESSOR -@@ -508,10 +504,6 @@ src_client_linux_linux_client_unittest_shlib_SOURCES = \ + # Client tests + src_client_linux_linux_dumper_unittest_helper_SOURCES = \ +@@ -580,10 +576,6 @@ src_client_linux_linux_client_unittest_s src/processor/minidump.cc \ src/processor/pathname_stripper.cc \ src/processor/proc_maps_linux.cc @@ -38,7 +36,7 @@ index ee7454e4..69700192 100644 src_client_linux_linux_client_unittest_shlib_CPPFLAGS = \ $(AM_CPPFLAGS) $(TEST_CFLAGS) -@@ -541,10 +533,6 @@ src_client_linux_linux_client_unittest_shlib_LDADD = \ +@@ -613,10 +605,6 @@ src_client_linux_linux_client_unittest_s src/common/string_conversion.o \ $(TEST_LIBS) \ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) @@ -49,6 +47,3 @@ index ee7454e4..69700192 100644 if ANDROID_HOST src_client_linux_linux_client_unittest_shlib_LDFLAGS += \ -llog -lm --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch deleted file mode 100644 index afe8a61b29..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 66a2b6e4ba8e2b49115043127ce4aa0fcd71ad1e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 May 2021 11:12:35 -0700 -Subject: [PATCH] exception_handler.cc: Match the types for SIGSTKSZ - -In glibc 2.34, SIGSTKSZ is a syscall which returns a long int, therefore -current check fails - -| ../git/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' -| 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -| | ~~~~~~~~^~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/client/linux/handler/exception_handler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index ca353c40..dc0fc4a9 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = std::max(16384u, (unsigned)SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. --- -2.31.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch index f2d1fe681d..80e5a8a764 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch @@ -12,7 +12,7 @@ Upstream-Status: Pending --- a/linux_syscall_support.h +++ b/linux_syscall_support.h -@@ -816,6 +816,9 @@ struct kernel_statfs { +@@ -1006,6 +1006,9 @@ struct kernel_statx { #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) #endif @@ -22,17 +22,17 @@ Upstream-Status: Pending #if defined(__x86_64__) #ifndef ARCH_SET_GS -@@ -947,6 +950,7 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 324 +@@ -1140,6 +1143,7 @@ struct kernel_statx { + #ifndef __NR_getrandom + #define __NR_getrandom 355 #endif + /* End of i386 definitions */ #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) #ifndef __NR_setresuid -@@ -1239,6 +1243,12 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 +@@ -1448,6 +1452,12 @@ struct kernel_statx { + #ifndef __NR_getrandom + #define __NR_getrandom 318 #endif +#ifndef __NR_pread +#define __NR_pread __NR_pread64 @@ -43,9 +43,9 @@ Upstream-Status: Pending /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 -@@ -1418,6 +1428,12 @@ struct kernel_statfs { - #ifndef __NR_ioprio_get - #define __NR_ioprio_get (__NR_Linux + 274) +@@ -1633,6 +1643,12 @@ struct kernel_statx { + #ifndef __NR_getrandom + #define __NR_getrandom (__NR_Linux + 313) #endif + +#undef __NR_pread diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch deleted file mode 100644 index d6d326dd03..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001 -From: mingtaoxt xt <mingtaoxt@gmail.com> -Date: Wed, 19 Oct 2022 19:36:13 +0800 -Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include <string>" - -Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3 -Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166 -Reviewed-by: Mike Frysinger <vapier@chromium.org> - -Upstream-Status: Backport [https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166] -Signed-of-by: Khem Raj <raj.khem@gmail.com> ---- - src/client/linux/handler/minidump_descriptor.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h -index 4349b88f..d822c9d9 100644 ---- a/src/client/linux/handler/minidump_descriptor.h -+++ b/src/client/linux/handler/minidump_descriptor.h -@@ -32,6 +32,7 @@ - #include <assert.h> - #include <sys/types.h> - -+#include <cstdint> - #include <string> - - #include "client/linux/handler/microdump_extra_info.h" --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch index cd5546d761..81844d0d66 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch @@ -14,7 +14,7 @@ Upstream-Status: Pending --- a/src/common/stabs_reader.cc +++ b/src/common/stabs_reader.cc -@@ -34,7 +34,9 @@ +@@ -38,7 +38,9 @@ #include "common/stabs_reader.h" #include <assert.h> @@ -26,7 +26,7 @@ Upstream-Status: Pending #include <string> --- a/src/common/stabs_reader.h +++ b/src/common/stabs_reader.h -@@ -58,6 +58,30 @@ +@@ -54,6 +54,30 @@ #elif defined(HAVE_A_OUT_H) #include <a.out.h> #endif @@ -59,7 +59,7 @@ Upstream-Status: Pending #include <vector> --- a/src/common/stabs_reader_unittest.cc +++ b/src/common/stabs_reader_unittest.cc -@@ -33,7 +33,9 @@ +@@ -36,7 +36,9 @@ #include <assert.h> #include <errno.h> @@ -71,8 +71,8 @@ Upstream-Status: Pending #include <string.h> --- a/configure.ac +++ b/configure.ac -@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, - AC_HEADER_STDC +@@ -61,7 +61,7 @@ fi + AC_SYS_LARGEFILE AX_PTHREAD -AC_CHECK_HEADERS([a.out.h sys/mman.h sys/random.h]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch index aa89959e9f..9b16dc3b2a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch @@ -11,19 +11,17 @@ Upstream-Status: Pending src/client/linux/crash_generation/crash_generation_server.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc -index 26c50a5c..2596afde 100644 --- a/src/client/linux/crash_generation/crash_generation_server.cc +++ b/src/client/linux/crash_generation/crash_generation_server.cc -@@ -28,7 +28,6 @@ - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +@@ -31,7 +31,6 @@ + #endif #include <assert.h> -#include <dirent.h> #include <fcntl.h> #include <limits.h> #include <poll.h> -@@ -49,6 +48,8 @@ +@@ -52,6 +51,8 @@ #include "common/linux/guid_creator.h" #include "common/linux/safe_readlink.h" @@ -32,6 +30,3 @@ index 26c50a5c..2596afde 100644 static const char kCommandQuit = 'x'; namespace google_breakpad { --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch index b4bccb44cb..ff331977b6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch @@ -13,8 +13,8 @@ Upstream-Status: Pending --- a/src/common/dwarf/elf_reader.cc +++ b/src/common/dwarf/elf_reader.cc -@@ -30,12 +30,16 @@ - #define _GNU_SOURCE // needed for pread() +@@ -34,12 +34,16 @@ + #include <config.h> // Must come first #endif +#include <config.h> @@ -32,8 +32,8 @@ Upstream-Status: Pending #include <algorithm> --- a/configure.ac +++ b/configure.ac -@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, - AC_HEADER_STDC +@@ -61,7 +61,7 @@ fi + AC_SYS_LARGEFILE AX_PTHREAD -AC_CHECK_HEADERS([a.out.h stab.h sys/mman.h sys/random.h]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch index 3449973629..cb323fbdcb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch @@ -3,16 +3,14 @@ map the mcontext_t structure for musl Upstream-Status: Inappropriate [need to consider Android] Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc -=================================================================== ---- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc -+++ git/src/client/linux/minidump_writer/linux_core_dumper.cc -@@ -196,7 +196,7 @@ bool LinuxCoreDumper::EnumerateThreads() +--- a/src/client/linux/minidump_writer/linux_core_dumper.cc ++++ b/src/client/linux/minidump_writer/linux_core_dumper.cc +@@ -214,7 +214,7 @@ bool LinuxCoreDumper::EnumerateThreads() info.tgid = status->pr_pgrp; info.ppid = status->pr_ppid; #if defined(__mips__) --#if defined(__ANDROID__) -+#if defined(__ANDROID__) || !defined(__GLIBC__) +-# if defined(__ANDROID__) ++# if defined(__ANDROID__) || !defined(__GLIBC__) for (int i = EF_R0; i <= EF_R31; i++) info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; - #else // __ANDROID__ + # else // __ANDROID__ diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index d1d338c6a8..3462b846d3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -6,11 +6,12 @@ SUMMARY = "An open-source multi-platform crash reporting system" DESCRIPTION = "Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided debugging information removed, record crashes in compact \"minidump\" files, send them back to your server, and produce C and C++ stack traces from these minidumps. " HOMEPAGE = "https://code.google.com/p/google-breakpad/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8bb274ebd1901085fd71a8d8afe8831b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07aeb530115539d62cacf9942fa60cac" SECTION = "libs" inherit autotools +DEPENDS += "zlib" DEPENDS:append:libc-musl = " libucontext" BBCLASSEXTEND = "native" @@ -21,11 +22,11 @@ PV = "1.0" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" -SRCREV_breakpad = "8b22babdf894e5aa98b2dbbe103f7e3856a71944" +SRCREV_breakpad = "7a1a190f4f68e8a3e06788498f50a4d5520a69f3" #v1.10.0 -SRCREV_gtest = "4fe018038f87675c083d0cfb6a6b57c274fb1753" +SRCREV_gtest = "e2239ee6043f73722e7aa812a459f54a28552929" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" -SRCREV_lss = "fd00dbbd0c06a309c657d89e9430143b179ff6db" +SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ @@ -40,11 +41,8 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ file://mcontext.patch \ file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ - file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \ - file://0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ - file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230611.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230611.0.bb index 0fd3f8c4fb..1b8d367fa7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230611.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230611.0.bb @@ -32,3 +32,5 @@ PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" PACKAGECONFIG[manpages] = ",,python3-docutils-native" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb index 6420c7e325..f5eda17f48 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64|riscv64).*-linux" PV .= "+git${SRCPV}" -SRCREV = "42fef565731411a784101de614a54bff79d1858e" +SRCREV = "b4e067307906ec6f277cce5c8a882f5edd03cbbc" SRC_URI = " \ git://github.com/lyonel/lshw.git;protocol=https;branch=master \ file://0001-disable-docbook2man.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb index 06631f27db..3adb51549e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.16.0.bb @@ -79,9 +79,9 @@ PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # and we need to use the right flags during host compile, # too. EXTRA_OEMAKE = "\ - CC.host='${CC}' \ + CC.host='${CC} -pie -fPIE' \ CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX}' \ + CXX.host='${CXX} -pie -fPIE' \ CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ LDFLAGS.host='${LDFLAGS}' \ AR.host='${AR}' \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.7.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.7.bb index b5da7b3444..4dc0399b59 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.7.bb @@ -42,7 +42,7 @@ CVE_CHECK_IGNORE += "\ CVE-2007-4596 \ " -inherit autotools pkgconfig python3native gettext +inherit autotools pkgconfig python3native gettext multilib_header multilib_script # phpize is not scanned for absolute paths by default (but php-config is). # @@ -210,6 +210,14 @@ do_install:append:class-target() { fi } +MULTILIB_SCRIPTS += "${PN}:${bindir}/php-config \ + ${PN}:${bindir}/phpize \ +" + +do_install:append () { + oe_multilib_header php/main/build-defs.h php/main/php_config.h +} + SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" php_sysroot_preprocess () { diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb index fcf80fc854..163d732a86 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb @@ -28,11 +28,13 @@ DEPENDS = " \ json-glib \ libarchive \ libcap \ + libxml2 \ libxslt-native \ ostree \ polkit \ python3-pyparsing-native \ xmlto-native \ + zstd \ " RDEPENDS:${PN} = " \ @@ -40,17 +42,20 @@ RDEPENDS:${PN} = " \ ca-certificates \ dconf \ flatpak-xdg-utils \ + xdg-dbus-proxy \ " +EXTRA_OEMESON += "-Dsystem_dbus_proxy=${bindir}/xdg-dbus-proxy -Dsystem_bubblewrap=${bindir}/bwrap" + GIR_MESON_OPTION = "" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'security', 'seccomp', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ " FILES:${PN} += "${libdir} ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.1.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb index 7e8cd5f390..487b7da130 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=79179bb373cd55cbd834463a514fb714" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v2.9/downloads/${BP}.tar.bz2" -SRC_URI[sha256sum] = "7cc4931a20fef457e0933af3f375be6eafa7703fde21e137bfb9685b1409599e" +SRC_URI[sha256sum] = "0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v2.9/" inherit autotools bash-completion pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb index b1438c3b2b..bddf30bf6a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ S = "${WORKDIR}/git" # Main dependencies -inherit cmake pkgconfig lib_package ptest +inherit cmake pkgconfig lib_package ptest multilib_header DEPENDS = "libpcre2" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" @@ -30,6 +30,10 @@ do_compile:prepend () { fi } +do_install:append () { + oe_multilib_header libyang/config.h +} + do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -f ${B}/tests/utest_* ${D}${PTEST_PATH}/tests/ diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.10.0.bb index 7fb58de3c1..e8aa7fdc07 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.10.0.bb @@ -21,7 +21,7 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[sha256sum] = "c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937" +SRC_URI[sha256sum] = "cd2a7ac9f1fb5bfa6218272d9929955dc7237515bba6e14b5ad0e1d1e2212b43" # Patch for CVE-2017-12858 is applied in version 1.2.0. CVE_CHECK_IGNORE += "CVE-2017-12858" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch new file mode 100644 index 0000000000..acb96f40d5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch @@ -0,0 +1,63 @@ +From 787d5052a6034cc722b073c652cc610ae037f933 Mon Sep 17 00:00:00 2001 +From: Levi Tamasi <ltamasi@fb.com> +Date: Fri, 22 Nov 2019 18:12:35 -0800 +Subject: [PATCH 1/2] Fix the constness issues around + autovector::iterator_impl's dereference operators (#6057) + +Summary: +As described in detail in issue https://github.com/facebook/rocksdb/issues/6048, iterators' dereference operators +(`*`, `->`, and `[]`) should return `pointer`s/`reference`s (as opposed to +`const_pointer`s/`const_reference`s) even if the iterator itself is `const` +to be in sync with the standard's iterator concept. +Pull Request resolved: https://github.com/facebook/rocksdb/pull/6057 + +Test Plan: make check + +Differential Revision: D18623235 + +Pulled By: ltamasi + +fbshipit-source-id: 04e82d73bc0c67fb0ded018383af8dfc332050cc +--- + thirdparty/rocksdb/util/autovector.h | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/thirdparty/rocksdb/util/autovector.h b/thirdparty/rocksdb/util/autovector.h +index b5c84712..6d337908 100644 +--- a/thirdparty/rocksdb/util/autovector.h ++++ b/thirdparty/rocksdb/util/autovector.h +@@ -120,27 +120,20 @@ class autovector { + } + + // -- Reference +- reference operator*() { ++ reference operator*() const { + assert(vect_->size() >= index_); + return (*vect_)[index_]; + } + +- const_reference operator*() const { +- assert(vect_->size() >= index_); +- return (*vect_)[index_]; +- } +- +- pointer operator->() { ++ pointer operator->() const { + assert(vect_->size() >= index_); + return &(*vect_)[index_]; + } + +- const_pointer operator->() const { +- assert(vect_->size() >= index_); +- return &(*vect_)[index_]; ++ reference operator[](difference_type len) const { ++ return *(*this + len); + } + +- + // -- Logical Operators + bool operator==(const self_type& other) const { + assert(vect_ == other.vect_); +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-build-with-clang-17.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-build-with-clang-17.patch new file mode 100644 index 0000000000..7581efc763 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-build-with-clang-17.patch @@ -0,0 +1,37 @@ +From a784973e500753747992a51dc0fb1caabbbb03be Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Jul 2023 17:52:38 -0700 +Subject: [PATCH 2/2] Fix build with clang 17 + +Part of https://github.com/jarro2783/cxxopts/commit/513afbc6dcfe2952cb2ffab0dae2415b11bba2d0 + +Upstream-Status: Backport [https://github.com/jarro2783/cxxopts/commit/513afbc6dcfe2952cb2ffab0dae2415b11bba2d0] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + thirdparty/cxxopts/include/cxxopts.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/thirdparty/cxxopts/include/cxxopts.hpp b/thirdparty/cxxopts/include/cxxopts.hpp +index e87416f1..bd2d81cf 100644 +--- a/thirdparty/cxxopts/include/cxxopts.hpp ++++ b/thirdparty/cxxopts/include/cxxopts.hpp +@@ -468,14 +468,14 @@ namespace cxxopts + { + if (negative) + { +- if (u > static_cast<U>(-std::numeric_limits<T>::min())) ++ if (u > static_cast<U>((std::numeric_limits<T>::min)())) + { + throw argument_incorrect_type(text); + } + } + else + { +- if (u > static_cast<U>(std::numeric_limits<T>::max())) ++ if (u > static_cast<U>((std::numeric_limits<T>::max)())) + { + throw argument_incorrect_type(text); + } +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 9ae72d2e99..0986fdec07 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -33,6 +33,8 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht file://0001-civetweb-Disable-lto.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch \ + file://0001-Fix-the-constness-issues-around-autovector-iterator_.patch \ + file://0002-Fix-build-with-clang-17.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch deleted file mode 100644 index a64d9de5ef..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-lib-deploy-Use-off_t-not-__off_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6d690ebf64ce640afce3085f01da8694a04853a9 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Tue, 20 Jun 2023 19:24:04 +0100 -Subject: [PATCH] lib/deploy: Use off_t not __off_t - -Not clear why this was __off_t which is the sole appearance in the code -base, but it breaks musl builds. - -Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/2896] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - src/libostree/ostree-sysroot-deploy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index 8fcd5e802758..2454a5877d94 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -2536,7 +2536,7 @@ get_kernel_layout_size (OstreeSysroot *self, OstreeDeployment *deployment, guint - /* This is a roundabout but more trustworthy way of doing a space check than - * relying on statvfs's f_bfree when you know the size of the objects. */ - static gboolean --dfd_fallocate_check (int dfd, __off_t len, gboolean *out_passed, GError **error) -+dfd_fallocate_check (int dfd, off_t len, gboolean *out_passed, GError **error) - { - /* If the requested size is 0 then return early. Passing a 0 len to - * fallocate results in EINVAL */ diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.4.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.5.bb index d2a7b04562..3028c4c92a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.5.bb @@ -21,9 +21,8 @@ DEPENDS = " \ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ file://run-ptest \ - file://0001-lib-deploy-Use-off_t-not-__off_t.patch \ " -SRC_URI[sha256sum] = "7cee8ace6aae3c778527927a85abefbfbd491c021f52ae229c51ca3077f9c5d1" +SRC_URI[sha256sum] = "bc593afb31fe1ac3d50419f917fafe321a0a3561d7bb2ba498a83740fe3adb14" S = "${WORKDIR}/libostree-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch deleted file mode 100644 index c498c55692..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-function-declararions.patch +++ /dev/null @@ -1,80 +0,0 @@ -From f97c26f5effd4372f7e03f9e4178d42a9ad8d4b3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Sep 2022 13:33:16 -0700 -Subject: [PATCH] Fix function declararions - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - TEST/v2test_ec.c | 2 ++ - TEST/v2test_ein.c | 1 + - backend/cimxml/cimXmlParser.c | 6 +++++- - backend/cimxml/grammar.c | 2 ++ - 4 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c -index ad34dcc..d3e566d 100644 ---- a/TEST/v2test_ec.c -+++ b/TEST/v2test_ec.c -@@ -6,6 +6,8 @@ - #include "cmcimacs.h" - - extern char *value2Chars(CMPIType type, CMPIValue * value); -+extern void showClass( CMPIConstClass * in_class ); -+ - /* - * comment out this define to use v2 http XML interface - */ -diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c -index c1b4692..5d5ef5d 100644 ---- a/TEST/v2test_ein.c -+++ b/TEST/v2test_ein.c -@@ -6,6 +6,7 @@ - #include "cmcimacs.h" - - extern char *value2Chars(CMPIType type, CMPIValue * value); -+extern void showObjectPath( CMPIObjectPath * objectpath ); - void showProperty( CMPIData , char * ); - void showInstance( CMPIInstance * ); - static char * CMPIState_str(CMPIValueState); -diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c -index d1ab86e..9f5d1ca 100644 ---- a/backend/cimxml/cimXmlParser.c -+++ b/backend/cimxml/cimXmlParser.c -@@ -34,6 +34,8 @@ - - #include <pthread.h> - -+void startParsing(ParserControl *parm); -+ - static int attrsOk(XmlBuffer * xb, const XmlElement * e, XmlAttr * r, - const char *tag, int etag); - static char *getValue(XmlBuffer * xb, const char *v); -@@ -1350,7 +1352,9 @@ ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop) - - control.heap = parser_heap_init(); - -- control.respHdr.rc = startParsing(&control); -+ control.respHdr.rc = 0; -+ -+ startParsing(&control); - - parser_heap_term(control.heap); - -diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c -index 6a0a969..a3dcdea 100644 ---- a/backend/cimxml/grammar.c -+++ b/backend/cimxml/grammar.c -@@ -23,6 +23,8 @@ - #include "sfcUtil/utilft.h" - #include "parserUtil.h" - -+CMPIType guessType(char *val); -+void setClassMethods(CMPIConstClass *cls, XtokMethods *ms); - - static int ct = 0; - static int dontLex = 0; --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch new file mode 100644 index 0000000000..08cd15ab0c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-implicit-function-declarations.patch @@ -0,0 +1,80 @@ +From 1e1ed4d58909360997648ca9524ab16441f5474b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 6 Jul 2023 10:15:41 -0700 +Subject: [PATCH] Fix implicit function declarations + +Clang 17+ has been finding these errors since its enforcing C99 +more than other compilers + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + TEST/v2test_ec.c | 1 + + TEST/v2test_ein.c | 1 + + backend/cimxml/cimXmlParser.c | 2 +- + backend/cimxml/grammar.c | 2 ++ + backend/cimxml/grammar.h | 1 + + 5 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c +index ad34dcc..940ca57 100644 +--- a/TEST/v2test_ec.c ++++ b/TEST/v2test_ec.c +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include "cmcimacs.h" ++#include "show.h" + + extern char *value2Chars(CMPIType type, CMPIValue * value); + /* +diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c +index c1b4692..ede95c1 100644 +--- a/TEST/v2test_ein.c ++++ b/TEST/v2test_ein.c +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include "cmcimacs.h" ++#include "show.h" + + extern char *value2Chars(CMPIType type, CMPIValue * value); + void showProperty( CMPIData , char * ); +diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c +index d1ab86e..14f5f5c 100644 +--- a/backend/cimxml/cimXmlParser.c ++++ b/backend/cimxml/cimXmlParser.c +@@ -1350,7 +1350,7 @@ ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop) + + control.heap = parser_heap_init(); + +- control.respHdr.rc = startParsing(&control); ++ startParsing(&control); + + parser_heap_term(control.heap); + +diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c +index 6a0a969..522ca9e 100644 +--- a/backend/cimxml/grammar.c ++++ b/backend/cimxml/grammar.c +@@ -23,6 +23,8 @@ + #include "sfcUtil/utilft.h" + #include "parserUtil.h" + ++extern CMPIType guessType(char *val); ++extern void setClassMethods(CMPIConstClass *cls, XtokMethods *ms); + + static int ct = 0; + static int dontLex = 0; +diff --git a/backend/cimxml/grammar.h b/backend/cimxml/grammar.h +index 00d364f..bafdd42 100644 +--- a/backend/cimxml/grammar.h ++++ b/backend/cimxml/grammar.h +@@ -79,3 +79,4 @@ static void valueRefArray(ParserControl *parm, parseUnion *stateUnion); + static void valueReference(ParserControl *parm, parseUnion *stateUnion); + static void valueReferenceData(ParserControl *parm, parseUnion *stateUnion); + ++void startParsing(ParserControl *parm); +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index 20bd2b6fc1..c9d3ddd6b2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sblim.org" SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ - file://0001-Fix-function-declararions.patch \ + file://0001-Fix-implicit-function-declarations.patch \ " SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb deleted file mode 100644 index 3d65399cd2..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Framebuffer image and doc viewer tools" -DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ - with the main focus being photos." -HOMEPAGE = "http://linux.bytesex.org/fbida/" -AUTHOR = "Gerd Hoffmann" -SECTION = "utils" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" - -DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman poppler libepoxy cairo" - -SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ - file://0001-Avoid-using-host-path.patch \ - file://fix-preprocessor.patch \ - file://support-jpeg-turbo.patch \ - file://cairo-weak-detect.patch \ - file://fbida-gcc10.patch \ - " -SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" - -inherit pkgconfig features_check - -# Depends on libepoxy -REQUIRED_DISTRO_FEATURES = "opengl" - -EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" - -PACKAGECONFIG ??= "gif png curl" -PACKAGECONFIG[curl] = ",,curl" -PACKAGECONFIG[gif] = ",,giflib" -PACKAGECONFIG[png] = ",,libpng" -PACKAGECONFIG[tiff] = ",,tiff" -PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" -PACKAGECONFIG[webp] = ",,libwebp" -PACKAGECONFIG[lirc] = ",,lirc" -# This can only be enabled when cairo has egl enabled in its packageconfig support too -PACKAGECONFIG[egl] = ",," - -EXTRA_OEMAKE += ""${@bb.utils.contains('PACKAGECONFIG', 'egl', 'HAVE_CAIRO_GL=yes', 'HAVE_CAIRO_GL=no', d)}"" - -CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" - -do_compile() { - sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile - sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk - sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile - - # Be sure to respect preferences (force to "no") - # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'curl', d)}" ]; then - sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'gif', d)}" ]; then - sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'png', d)}" ]; then - sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'tiff', d)}" ]; then - sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'motif', d)}" ]; then - sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'webp', d)}" ]; then - sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then - sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS:${PN} = "ttf-dejavu-sans-mono" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb new file mode 100644 index 0000000000..ebf88cd0e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb @@ -0,0 +1,42 @@ +SUMMARY = "Framebuffer image and doc viewer tools" +DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ + with the main focus being photos." +HOMEPAGE = "https://www.kraxel.org/blog/linux/fbida/" +AUTHOR = "Gerd Hoffmann" +SECTION = "utils" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" + +DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo" + +PV = "2.14+git${SRCPV}" +SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \ + file://fix-preprocessor.patch \ + file://support-jpeg-turbo.patch \ + file://fbida-gcc10.patch \ + file://0001-meson.build-install-fbgs-shell-script.patch \ + file://0002-meson.build-add-features-options-for-png-gif-tiff-we.patch \ + file://0003-meson.build-do-not-require-xkbcommon.patch \ + file://0001-meson.build-make-fbpdf-build-optional.patch \ + file://0001-fbida-Include-missing-sys-types.h.patch \ +" +SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +# Depends on libepoxy +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG ??= "gif png pdf" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[motif] = "-Dmotif=enabled,-Dmotif=disabled,libx11 libxext libxpm libxt openmotif" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler libepoxy" + +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +RDEPENDS:${PN} = "ttf-dejavu-sans-mono" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch deleted file mode 100644 index cdf2c25d37..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8d8fa9f22d9f6a95523bac63ac3af724faf5ff92 Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Fri, 7 Apr 2017 23:26:09 +0200 -Subject: [PATCH] Avoid using host-path - -Remove the explicit reference to /usr/local/* , this is completely -bogus and causes trouble during cross-compilation. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Inappropriate [upstream requires this] ---- - mk/Variables.mk | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/mk/Variables.mk b/mk/Variables.mk -index 99f787c..3ffd87a 100644 ---- a/mk/Variables.mk -+++ b/mk/Variables.mk -@@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -Wpointer-arith -Wunused - CXXFLAGS += -Wall -Wpointer-arith -Wunused - --# add /usr/local to the search path if something is in there ... --ifneq ($(wildcard /usr/local/include/*.h),) -- CFLAGS += -I/usr/local/include -- LDFLAGS += -L/usr/local/$(LIB) --endif -- - # fixup include path for $(srcdir) != "." - ifneq ($(srcdir),.) - CFLAGS += -I. -I$(srcdir) --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch new file mode 100644 index 0000000000..0fb58f80e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch @@ -0,0 +1,31 @@ +From 17490e264e627ead81bf5840c8797de968485943 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 Jul 2023 11:25:26 -0700 +Subject: [PATCH] fbida: Include missing <sys/types.h> + +Fixes build on musl +../git/gfx.h:43:5: error: unknown type name 'dev_t'; did you mean 'div_t'? + dev_t devnum; + ^~~~~ + div_t +TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/fbida/2.14+gitAUTOINC+eb769e3d7f-r0/recipe-sysroot/usr/include/stdlib.h:64:35: note: 'div_t' declared here +typedef struct { int quot, rem; } div_t; + ^ +1 error generated + +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/3] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gfx.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/gfx.h ++++ b/gfx.h +@@ -1,5 +1,6 @@ + #include <stdbool.h> + #include <inttypes.h> ++#include <sys/types.h> + + #include <pixman.h> + #include <cairo.h> diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch new file mode 100644 index 0000000000..d686def3d2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch @@ -0,0 +1,28 @@ +From f9c455e81ad4d870c8ae20b9af8598139231ad26 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 9 Sep 2022 09:32:22 +0200 +Subject: [PATCH] meson.build: install fbgs shell script + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index cbed982..2129896 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,6 +126,9 @@ executable('fbpdf', + sources : fbpdf_srcs, + dependencies : fbpdf_deps, + install : true) ++install_data('fbgs', ++ install_dir : get_option('bindir'), ++ install_mode : 'rwxr--r--') + + # build fbcon + fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] +-- +2.37.3 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch new file mode 100644 index 0000000000..304c6600ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch @@ -0,0 +1,66 @@ +From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 18:45:58 +0200 +Subject: [PATCH] meson.build: make fbpdf build optional + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 22 ++++++++++++---------- + meson_options.txt | 1 + + 2 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index 6b3daf3..289d1ec 100644 +--- a/meson.build ++++ b/meson.build +@@ -15,11 +15,11 @@ x11resdir = x11resrun.stdout().strip() + + # pkg-config deps + pixman_dep = dependency('pixman-1') +-poppler_dep = dependency('poppler-glib') ++poppler_dep = dependency('poppler-glib', required: get_option('pdf')) + cairo_dep = dependency('cairo') + drm_dep = dependency('libdrm') +-gbm_dep = dependency('gbm') +-epoxy_dep = dependency('epoxy') ++gbm_dep = dependency('gbm', required: get_option('pdf')) ++epoxy_dep = dependency('epoxy', required: get_option('pdf')) + exif_dep = dependency('libexif') + png_dep = dependency('libpng', required: get_option('png')) + tiff_dep = dependency('libtiff-4', required: get_option('tiff')) +@@ -132,13 +132,15 @@ fbpdf_deps = [ drm_dep, gbm_dep, epoxy_dep, + pixman_dep, poppler_dep, cairo_dep, + udev_dep, input_dep ] + +-executable('fbpdf', +- sources : fbpdf_srcs, +- dependencies : fbpdf_deps, +- install : true) +-install_data('fbgs', +- install_dir : get_option('bindir'), +- install_mode : 'rwxr--r--') ++if get_option('pdf').enabled() ++ executable('fbpdf', ++ sources : fbpdf_srcs, ++ dependencies : fbpdf_deps, ++ install : true) ++ install_data('fbgs', ++ install_dir : get_option('bindir'), ++ install_mode : 'rwxr--r--') ++endif + + # build fbcon + fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] +diff --git a/meson_options.txt b/meson_options.txt +index ce37188..74699ab 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,3 +3,4 @@ option('png', type: 'feature', value : 'enabled') + option('tiff', type: 'feature', value : 'enabled') + option('webp', type: 'feature', value : 'disabled') + option('motif', type: 'feature', value : 'disabled') ++option('pdf', type: 'feature', value : 'enabled') +-- +2.37.3 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch new file mode 100644 index 0000000000..fe36fcb7cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch @@ -0,0 +1,124 @@ +From cdcde5c1fd106a69118dff98118600911392762f Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 16:25:38 +0200 +Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 41 +++++++++++++++++++++++++++-------------- + meson_options.txt | 5 +++++ + selections.c | 4 ++++ + 3 files changed, 36 insertions(+), 14 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index cd9cc49..b5e3ffc 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,9 +23,9 @@ drm_dep = dependency('libdrm') + gbm_dep = dependency('gbm') + epoxy_dep = dependency('epoxy') + exif_dep = dependency('libexif') +-png_dep = dependency('libpng') +-tiff_dep = dependency('libtiff-4') +-webp_dep = dependency('libwebp', required : false) ++png_dep = dependency('libpng', required: get_option('png')) ++tiff_dep = dependency('libtiff-4', required: get_option('tiff')) ++webp_dep = dependency('libwebp', required : get_option('webp')) + udev_dep = dependency('libudev') + input_dep = dependency('libinput') + xkb_dep = dependency('xkbcommon') +@@ -36,20 +36,20 @@ jpeg_dep = cc.find_library('jpeg') + util_dep = cc.find_library('util') + math_dep = cc.find_library('m', required : false) + pcd_dep = cc.find_library('pcd', required : false) +-gif_dep = cc.find_library('gif', required : false) ++gif_dep = cc.find_library('gif', required: get_option('gif')) + + # motif + x11 libs +-motif_dep = cc.find_library('Xm', required : false) +-xpm_dep = cc.find_library('Xpm', required : false) +-xt_dep = cc.find_library('Xt', required : false) +-xext_dep = cc.find_library('Xext', required : false) +-x11_dep = cc.find_library('X11', required : false) ++motif_dep = cc.find_library('Xm', required : get_option('motif')) ++xpm_dep = cc.find_library('Xpm', required : get_option('motif')) ++xt_dep = cc.find_library('Xt', required : get_option('motif')) ++xext_dep = cc.find_library('Xext', required : get_option('motif')) ++x11_dep = cc.find_library('X11', required : get_option('motif')) + + # image formats + read_srcs = [ 'readers.c', 'rd/read-ppm.c', 'rd/read-bmp.c', +- 'rd/read-jpeg.c', 'rd/read-png.c', 'rd/read-tiff.c' ] ++ 'rd/read-jpeg.c' ] + write_srcs = [ 'writers.c', 'wr/write-ppm.c', 'wr/write-ps.c', +- 'wr/write-jpeg.c', 'wr/write-png.c', 'wr/write-tiff.c' ] ++ 'wr/write-jpeg.c' ] + image_deps = [ jpeg_dep, png_dep, tiff_dep, + pcd_dep, gif_dep, webp_dep ] + +@@ -57,11 +57,21 @@ if pcd_dep.found() + read_srcs += 'rd/read-pcd.c' + config.set('HAVE_LIBPCD', true) + endif +-if gif_dep.found() ++if get_option('png').enabled() ++ read_srcs += 'rd/read-png.c' ++ write_srcs += 'wr/write-png.c' ++ config.set('HAVE_LIBPNG', true) ++endif ++if get_option('tiff').enabled() ++ read_srcs += 'rd/read-tiff.c' ++ write_srcs += 'wr/write-tiff.c' ++ config.set('HAVE_LIBTIFF', true) ++endif ++if get_option('gif').enabled() + read_srcs += 'rd/read-gif.c' + config.set('HAVE_LIBGIF', true) + endif +-if webp_dep.found() ++if get_option('webp').enabled() + read_srcs += 'rd/read-webp.c' + config.set('HAVE_LIBWEBP', true) + endif +@@ -168,7 +181,7 @@ ida_srcs = [ 'ida.c', 'man.c', 'hex.c', 'x11.c', 'viewer.c', + ida_deps = [ pixman_dep, exif_dep, image_deps, math_dep, + motif_dep, xpm_dep, xt_dep, xext_dep, x11_dep ] + +-if motif_dep.found() ++if get_option('motif').enabled() + executable('ida', + sources : ida_srcs, + dependencies : ida_deps, +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..ce37188 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('gif', type: 'feature', value : 'enabled') ++option('png', type: 'feature', value : 'enabled') ++option('tiff', type: 'feature', value : 'enabled') ++option('webp', type: 'feature', value : 'disabled') ++option('motif', type: 'feature', value : 'disabled') +diff --git a/selections.c b/selections.c +index 7b16264..ccdc686 100644 +--- a/selections.c ++++ b/selections.c +@@ -609,8 +609,12 @@ void ipc_init() + #ifdef HAVE_LIBGIF + targets[ntargets++] = MIME_IMAGE_GIF; + #endif ++#ifdef HAVE_LIBPNG + targets[ntargets++] = MIME_IMAGE_PNG; ++#endif ++#ifdef HAVE_LIBTIFF + targets[ntargets++] = MIME_IMAGE_TIFF; ++#endif + targets[ntargets++] = XA_PIXMAP; + targets[ntargets++] = XA_STRING; + +-- +2.37.3 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch new file mode 100644 index 0000000000..e769014131 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch @@ -0,0 +1,27 @@ +From ec82a194f3454ac203a134c9a99bac6d63095d25 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 18:29:03 +0200 +Subject: [PATCH] meson.build: do not require xkbcommon + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 341939c..b5dab14 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,7 @@ tiff_dep = dependency('libtiff-4', required: get_option('tiff')) + webp_dep = dependency('libwebp', required : get_option('webp')) + udev_dep = dependency('libudev') + input_dep = dependency('libinput') +-xkb_dep = dependency('xkbcommon') ++xkb_dep = dependency('xkbcommon', required : false) + tsm_dep = dependency('libtsm', required : false) + + # other library deps +-- +2.37.3 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch deleted file mode 100644 index c7c579cc41..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch +++ /dev/null @@ -1,17 +0,0 @@ -OE configures cairo to disable EGL support, however fbida expects cairo with egl support -this patch therefore makes it possible to set HAVE_CAIRO_GL via recipe - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -67,7 +67,7 @@ define make-config - LIB := $(LIB) - RESDIR := $(call ac_resdir) - HAVE_LINUX_FB_H := $(call ac_header,linux/fb.h) --HAVE_CAIRO_GL := $(call ac_pkg_config,cairo-gl) -+HAVE_CAIRO_GL ?= $(call ac_pkg_config,cairo-gl) - HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) - HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) - HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch index 6d1d441c57..99b53e2e12 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac -@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl, +@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl, [], [enable_tcl=yes]) if test "x$enable_tcl" != "xyes"; then @@ -22,12 +22,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> if test "x$use_tcl" = "x"; then --- a/Makefile.am +++ b/Makefile.am -@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra - man_MANS = graphviz.7 +@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra + dist_man_MANS = graphviz.7 # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS --SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests -+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests +-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests ++SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests .PHONY: doxygen doxygen: diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index b63017576a..7ab15c9718 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -27,8 +27,7 @@ SRC_URI:append:class-target = "\ SRC_URI:append:class-nativesdk = "\ file://graphviz-setup.sh \ " - -SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8" +SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" CVE_CHECK_IGNORE += "\ CVE-2014-9157 \ @@ -37,7 +36,7 @@ CVE_CHECK_IGNORE += "\ PACKAGECONFIG ??= "librsvg" PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" -EXTRA_OECONF:append = " PS2PDF=/bin/echo" +EXTRA_OECONF:append = " PS2PDF=/bin/echo --disable-man-pdfs" EXTRA_OECONF:class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc new file mode 100644 index 0000000000..dcf1ad14ba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc @@ -0,0 +1,46 @@ +PACKAGECONFIG[drm] = ",,libdrm" +PACKAGECONFIG[fbdev] = ",," +PACKAGECONFIG[sdl] = ",,virtual/libsdl2" +PACKAGECONFIG[wayland] = ",,libxkbcommon wayland" + +LVGL_CONFIG_USE_DRM = "${@bb.utils.contains('PACKAGECONFIG', 'drm', '1', '0', d)}" +LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" + +LVGL_CONFIG_USE_EVDEV = "${@bb.utils.contains_any('PACKAGECONFIG', 'drm fbdev', '1', '0', d)}" +LVGL_CONFIG_EVDEV_INPUT ?= "/dev/input/touchscreen" + +LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" + +LVGL_CONFIG_USE_SDL = "${@bb.utils.contains('PACKAGECONFIG', 'sdl', '1', '0', d)}" + +LVGL_CONFIG_USE_WAYLAND = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', '1', '0', d)}" +LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" +LVGL_CONFIG_WAYLAND_VER_RES ?= "320" + +EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" + +do_configure:append() { + # If there is a configuration template, start from that + [ -r "${S}/lv_drv_conf_template.h" ] && cp -Lv "${S}/lv_drv_conf_template.h" "${S}/lv_drv_conf.h" + + # Configure the software using sed + sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ + \ + -e "s|\(^# define USE_DRM \).*|# define USE_DRM ${LVGL_CONFIG_USE_DRM}|g" \ + -e "s|\(^# define DRM_CARD \).*|# define DRM_CARD \"${LVGL_CONFIG_DRM_CARD}\"|g" \ + \ + -e "s|\(^# define USE_EVDEV \).*|# define USE_EVDEV ${LVGL_CONFIG_USE_EVDEV}|g" \ + -e "s|\(^# define EVDEV_NAME \).*|# define EVDEV_NAME \"${LVGL_CONFIG_EVDEV_INPUT}\"|g" \ + \ + -e "s|\(^# define USE_FBDEV \).*|# define USE_FBDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ + \ + -e "s|\(^# define USE_SDL \).*|# define USE_SDL ${LVGL_CONFIG_USE_SDL}|g" \ + -e "s|\(^# define USE_SDL_GPU \).*|# define USE_SDL_GPU 1|g" \ + -e "s|\(^# define SDL_DOUBLE_BUFFERED \).*|# define SDL_DOUBLE_BUFFERED 1|g" \ + \ + -e "s|\(^# define USE_WAYLAND \).*|# define USE_WAYLAND ${LVGL_CONFIG_USE_WAYLAND}|g" \ + -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ + -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ + \ + -i "${S}/lv_drv_conf.h" +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb index a0a2ee0aa9..e2c5a342a1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_8.3.0.bb @@ -14,39 +14,15 @@ SRCREV = "71830257710f430b6d8d1c324f89f2eab52488f1" DEPENDS = "lvgl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland fbdev', d)}" -PACKAGECONFIG[fbdev] = ",," -PACKAGECONFIG[wayland] = ",,libxkbcommon wayland" -LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" -LVGL_CONFIG_USE_WAYLAND = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', '1', '0', d)}" +require lv-drivers.inc inherit cmake S = "${WORKDIR}/git" -LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" -LVGL_CONFIG_WAYLAND_VER_RES ?= "320" - -EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" - TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" -# Upstream does not support a default configuration -# but propose a default "disabled" template, which is used as reference -# More configuration can be done using external configuration variables -do_configure:append() { - [ -r "${S}/lv_drv_conf.h" ] \ - || sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ - \ - -e "s|\(^# define USE_FBDEV \).*|# define USE_FBDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ - -e "s|\(^# define USE_EVDEV \).*|# define USE_EVDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ - \ - -e "s|\(^# define USE_WAYLAND \).*|# define USE_WAYLAND ${LVGL_CONFIG_USE_WAYLAND}|g" \ - -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ - -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ - < "${S}/lv_drv_conf_template.h" > "${S}/lv_drv_conf.h" -} - FILES:${PN}-dev += "\ ${includedir}/lvgl/lv_drivers/ \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb index 33e7c94e68..32f833a026 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_8.3.0.bb @@ -11,30 +11,15 @@ SRCREV = "adf2c4490e17a1b9ec1902cc412a24b3b8235c8e" EXTRA_OEMAKE = "DESTDIR=${D}" PACKAGECONFIG ??= "drm" -PACKAGECONFIG[drm] = ",,libdrm" -PACKAGECONFIG[fbdev] = ",," -PACKAGECONFIG[sdl] = ",,virtual/libsdl2" -LVGL_CONFIG_USE_DRM = "${@bb.utils.contains('PACKAGECONFIG', 'drm', '1', '0', d)}" -LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" -LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" -LVGL_CONFIG_USE_SDL = "${@bb.utils.contains('PACKAGECONFIG', 'sdl', '1', '0', d)}" +require lv-drivers.inc inherit cmake S = "${WORKDIR}/git" -EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" TARGET_CFLAGS += "-I${STAGING_INCDIR}/libdrm" do_configure:prepend() { - sed -i -e "s|\(^# define USE_FBDEV \).*|# define USE_FBDEV ${LVGL_CONFIG_USE_FBDEV}|g" \ - -e "s|\(^# define USE_DRM \).*|# define USE_DRM ${LVGL_CONFIG_USE_DRM}|g" \ - -e "s|\(^# define DRM_CARD \).*|# define DRM_CARD \"${LVGL_CONFIG_DRM_CARD}\"|g" \ - -e "s|\(^# define USE_SDL \).*|# define USE_SDL ${LVGL_CONFIG_USE_SDL}|g" \ - -e "s|\(^# define USE_SDL_GPU \).*|# define USE_SDL_GPU 1|g" \ - -e "s|\(^# define SDL_DOUBLE_BUFFERED \).*|# define SDL_DOUBLE_BUFFERED 1|g" \ - "${S}/lv_drv_conf.h" - if [ "${LVGL_CONFIG_USE_DRM}" -eq 1 ] ; then # Add libdrm build dependency sed -i '/^target_link_libraries/ s@lvgl::drivers@& drm@' "${S}/CMakeLists.txt" diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb index ceff54f46a..c89b2d1c99 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb @@ -2,9 +2,9 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d" -SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" +SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" SRC_URI = " \ git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb deleted file mode 100644 index b757329d94..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "X.Org X11 X client utilities" -HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xsetmode/" -DESCRIPTION = "xsetmode sets the mode of an XInput device to either absolute \ -or relative." -SECTION = "x11/app" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9b37e00e7793b667cbc64f9df7b6d733" - -DEPENDS += "libxi" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "d074e79d380b031d2f60e4cd56538c93" -SRC_URI[sha256sum] = "988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_382.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_383.bb index 3bae13658c..cac0003e46 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_382.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_383.bb @@ -8,7 +8,7 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[sha256sum] = "0cd0bcf3d0aa746a840ea3f1366ea29a74263694d535b5c777f27eb65d7fceed" +SRC_URI[sha256sum] = "a06613bcda508c2a1bff6d4230895da74a798799a2e39a23bac82089d7b9a998" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch deleted file mode 100644 index 32a24b4be1..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 95ed4b743f197e20f1884a326d5a7128187a7ba6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Aug 2020 17:56:30 -0700 -Subject: [PATCH] lbx_zlib: Mark declration with extern - -Fixes build with gcc10/-fno-common - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/lbx_zlib/lbx_zlib.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h -index 8ae8956..bec3b96 100644 ---- a/src/lbx_zlib/lbx_zlib.h -+++ b/src/lbx_zlib/lbx_zlib.h -@@ -136,9 +136,9 @@ extern void Xfree(pointer /*ptr*/); - #endif - - /* lbx_zlib.c */ --unsigned long stream_out_compressed; --unsigned long stream_out_uncompressed; --unsigned long stream_out_plain; --unsigned long stream_in_compressed; --unsigned long stream_in_uncompressed; --unsigned long stream_in_plain; -+extern unsigned long stream_out_compressed; -+extern unsigned long stream_out_uncompressed; -+extern unsigned long stream_out_plain; -+extern unsigned long stream_in_compressed; -+extern unsigned long stream_in_uncompressed; -+extern unsigned long stream_in_plain; --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch deleted file mode 100644 index af7d208282..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Pending - -diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac ---- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100 -+++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100 -@@ -50,4 +50,5 @@ - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) -diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am ---- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) -diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am ---- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100 -+++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100 -@@ -3,10 +3,7 @@ - AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS) - INCLUDES = -I$(top_srcdir)/include - --noinst_PROGRAMS = mkg3states -- --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+SUBDIRS = image - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -38,9 +35,8 @@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -- -rm -f g3states.h -- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+g3states.h: image/mkg3states -+ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb deleted file mode 100644 index ce064903b9..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907" - -SUMMARY = "XFIXES Extension" -DEPENDS += " xorgproto zlib" -PE = "1" -PR = "r11" - -XORG_EXT = "tar.bz2" - -SRC_URI += "file://mkg3states-1.1.patch \ - file://0001-lbx_zlib-Mark-declration-with-extern.patch \ - " -SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1" -SRC_URI[sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae" - -export CC_FOR_BUILD = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb deleted file mode 100644 index e7c9b64e83..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc -SUMMARY = "X11 keyboard UI presentation library" -LICENSE = "SGI-1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" -DEPENDS += "virtual/libx11 libxt libxkbfile" -PE = "1" -PR = "r10" - -XORG_EXT = "tar.bz2" - -SRC_URI[md5sum] = "1143e456f7429e18e88f2eadb2f2b6b1" -SRC_URI[sha256sum] = "20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb deleted file mode 100644 index 047697845c..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-graphics/xorg-lib/xcb-util.inc - -SUMMARY = "XCB port of libXcursor" - -DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974" - -SRC_URI[sha256sum] = "28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch new file mode 100644 index 0000000000..546973e0ac --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-make-src-string-const-in-strlcpy.patch @@ -0,0 +1,69 @@ +From 4ee56105881d7bb1da1e668ac5bb47a4e0846676 Mon Sep 17 00:00:00 2001 +From: Lianbo Jiang <lijiang@redhat.com> +Date: Wed, 5 Jul 2023 10:02:59 +0800 +Subject: [PATCH] Fix compilation error due to new strlcpy function that glibc + added +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The crash-utility has its own strlcpy(), but recently the latest glibc +has also implemented the strlcpy function, which is derived from +OpenBSD. Eventually this caused the following compilation error: + + # make -j8 lzo + ... + In file included from global_data.c:18: + defs.h:5556:8: error: conflicting types for ‘strlcpy’; have ‘size_t(char *, char *, size_t)’ {aka ‘long unsigned int(char *, char *, long unsigned int)’} + 5556 | size_t strlcpy(char *, char *, size_t); + | ^~~~~~~ + In file included from memory.c:19: + defs.h:5556:8: error: conflicting types for ‘strlcpy’; have ‘size_t(char *, char *, size_t)’ {aka ‘long unsigned int(char *, char *, long unsigned int)’} + 5556 | size_t strlcpy(char *, char *, size_t); + | ^~~~~~~ + ... + +To fix the issue, let's declare the strlcpy() as a weak function and +keep the same parameter types as the glibc function has. + +Related glibc commits: +454a20c8756c ("Implement strlcpy and strlcat [BZ #178]") +d2fda60e7c40 ("manual: Manual update for strlcat, strlcpy, wcslcat, wclscpy") +388ae538ddcb ("hurd: Add strlcpy, strlcat, wcslcpy, wcslcat to libc.abilist") + +Upstream-Status: Backport [https://github.com/kraj/crash/commit/4ee56105881d7bb1da1e668ac5bb47a4e0846676] +Signed-off-by: Lianbo Jiang <lijiang@redhat.com> +--- + defs.h | 2 +- + tools.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/defs.h b/defs.h +index 8f7d1fa..26afe23 100644 +--- a/defs.h ++++ b/defs.h +@@ -5553,7 +5553,7 @@ uint32_t swap32(uint32_t, int); + uint64_t swap64(uint64_t, int); + ulong *get_cpumask_buf(void); + int make_cpumask(char *, ulong *, int, int *); +-size_t strlcpy(char *, char *, size_t); ++size_t strlcpy(char *, const char *, size_t) __attribute__ ((__weak__)); + struct rb_node *rb_first(struct rb_root *); + struct rb_node *rb_parent(struct rb_node *, struct rb_node *); + struct rb_node *rb_right(struct rb_node *, struct rb_node *); +diff --git a/tools.c b/tools.c +index 392a797..0f2db10 100644 +--- a/tools.c ++++ b/tools.c +@@ -6795,7 +6795,7 @@ make_cpumask_error: + * always be NULL-terminated. + */ + size_t +-strlcpy(char *dest, char *src, size_t size) ++strlcpy(char *dest, const char *src, size_t size) + { + size_t ret = strlen(src); + +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.2.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.2.bb index f58bb6ef54..f8a460b8ce 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.2.bb @@ -20,6 +20,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http file://0001-cross_add_configure_option.patch \ file://donnot-extract-gdb-during-do-compile.patch \ file://gdb_build_jobs_and_not_write_crash_target.patch \ + file://0001-make-src-string-const-in-strlcpy.patch \ " SRCREV = "f1cd581d1c4afa5b8ffdfaa6a3ea9f545fe4ec91" diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.3.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.6.bb index 1e8ce7e69b..dfe9f7b51d 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.6.bb @@ -9,7 +9,7 @@ DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig ptest systemd update-rc.d -SRCREV = "e4706bf28a0699094add5d77a4b97145c2292c47" +SRCREV = "da62115c0fab3a4608e4b0ee0c8aa0cf134c14ca" SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ file://minicoredumper.service \ diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch deleted file mode 100644 index 6cfd2e81bc..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 11b9ef265a942cb3fdd373520d0c3fce67d3cdf9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 26 Jan 2023 18:05:33 -0800 -Subject: [PATCH] include missing <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Backport [https://github.com/kraj/geos/commit/0e8d4368b] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/geos/geomgraph/TopologyLocation.h | 1 + - include/geos/io/WKTWriter.h | 1 + - include/geos/shape/fractal/HilbertCode.h | 1 + - include/geos/shape/fractal/HilbertEncoder.h | 1 + - include/geos/shape/fractal/MortonCode.h | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h -index 4cbbacb3..a3ecd212 100644 ---- a/include/geos/geomgraph/TopologyLocation.h -+++ b/include/geos/geomgraph/TopologyLocation.h -@@ -25,6 +25,7 @@ - #include <geos/inline.h> - #include <geos/geom/Location.h> - -+#include <cstdint> - #include <vector> - #include <array> - #include <string> -diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h -index c0af8e71..0d60e975 100644 ---- a/include/geos/io/WKTWriter.h -+++ b/include/geos/io/WKTWriter.h -@@ -25,6 +25,7 @@ - - #include <string> - #include <cctype> -+#include <cstdint> - - #ifdef _MSC_VER - #pragma warning(push) -diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h -index 46012efc..beeb28c6 100644 ---- a/include/geos/shape/fractal/HilbertCode.h -+++ b/include/geos/shape/fractal/HilbertCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { -diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h -index 61c0010d..0126d3d9 100644 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -16,6 +16,7 @@ - #pragma once - - #include <geos/export.h> -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h -index 6743f87c..ad4a42e7 100644 ---- a/include/geos/shape/fractal/MortonCode.h -+++ b/include/geos/shape/fractal/MortonCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.12.0.bb index 558acd92bf..95cb29775a 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.12.0.bb @@ -5,13 +5,10 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2 \ - file://0001-include-missing-cstdint.patch" -SRC_URI[sha256sum] = "70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14" +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39" -inherit autotools pkgconfig binconfig - -EXTRA_OECONF += "--enable-inline=no" +inherit cmake pkgconfig binconfig PACKAGES =+ "geoslib ${PN}-c1" diff --git a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index 6e4803f4f3..4e9659aa58 100644 --- a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -3,10 +3,15 @@ Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this Upstream-Status: Pending Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +diff --git a/Makefile b/Makefile +index 404f036..a9b18f0 100644 --- a/Makefile +++ b/Makefile -@@ -68,18 +68,17 @@ XGETTEXT = xgettext +@@ -75,13 +75,12 @@ XGETTEXT = xgettext XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments MSGMERGE = msgmerge @@ -21,9 +26,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) +@@ -90,7 +89,7 @@ LDFLAGS_lib_CYGWIN = $(LDFLAGS_shared) \ + -Wl,--export-all-symbols \ + -Wl,--enable-auto-import LDFLAGS_pam = $(LDFLAGS_shared) -LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ +LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ -Wl,--version-script,$(MAP_PAM) LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb index 8462701b31..8694052e61 100644 --- a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb @@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ file://makefile-add-ldflags.patch \ " -SRC_URI[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" +SRC_URI[sha256sum] = "53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4" # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam # this package's pam_passwdqc.so needs pam diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.1.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.2.bb index bb0bd7d752..9b6a52e2e2 100644 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" DEPENDS = "jansson zlib xz" BRANCH = "branch-1.11" -SRCREV = "3a9e5a789b5165e0c8c4da799c387fdf84bfb75e" +SRCREV = "44d1c4f221ccc4571a4b4b9edb023ed1e89354b7" SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ " diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb index 8d3992a6ec..3e8e2cdf77 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -15,9 +17,6 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_XCURSOR=OFF \ " -# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' -LDFLAGS += "-ldl" - do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0000000000..e140ce2166 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [cross build specific] + +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ####################################################################### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ####################################################################### + diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc index a2d1f57a8b..cb19bc5fb8 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -34,7 +34,7 @@ FILES:${PN}-tools += " \ FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" RRECOMMENDS:${PN}-ptest += "coreutils" -RDEPENDS:${PN}-ptest += "bats" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)}" do_install:append() { rm -f ${D}${bindir}/gpiod-test diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index ea51c19f4a..7907dcfc24 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -22,6 +22,7 @@ inherit cmake python3native systemd setuptools3 pkgconfig EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCPP_BINDINGS=ON \ -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ diff --git a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb index 26f8fab200..911582553c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb @@ -6,6 +6,4 @@ SRC_URI[sha256sum] = "474e9575e1235a0d8e3661f072de0193bab6ea1023363772f698a2cc39 inherit perlnative autotools -EXTRA_AUTORECONF += "--install" - BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2023-2617.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2023-2617.patch deleted file mode 100644 index 92c096e29c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2023-2617.patch +++ /dev/null @@ -1,88 +0,0 @@ -commit ccc277247ac1a7aef0a90353edcdec35fbc5903c -Author: Nano <nanoapezlk@gmail.com> -Date: Wed Apr 26 15:09:52 2023 +0800 - - fix(wechat_qrcode): Init nBytes after the count value is determined (#3480) - - * fix(wechat_qrcode): Initialize nBytes after the count value is determined - - * fix(wechat_qrcode): Incorrect count data repair - - * chore: format expr - - * fix(wechat_qrcode): Avoid null pointer exception - - * fix(wechat_qrcode): return when bytes_ is empty - - * test(wechat_qrcode): add test case - - --------- - - Co-authored-by: GZTime <Time.GZ@outlook.com> - -CVE: CVE-2023-2617 - -Upstream-Status: Backport [https://github.com/opencv/opencv_contrib/commit/ccc277247ac1a7aef0a90353edcdec35fbc5903c] - -Signed-off-by: Soumya <soumya.sambu@windriver.com> ---- - -diff --git a/modules/wechat_qrcode/src/zxing/qrcode/decoder/decoded_bit_stream_parser.cpp b/modules/wechat_qrcode/src/zxing/qrcode/decoder/decoded_bit_stream_parser.cpp -index 05de793c..b3a0a69c 100644 ---- a/modules/wechat_qrcode/src/zxing/qrcode/decoder/decoded_bit_stream_parser.cpp -+++ b/modules/wechat_qrcode/src/zxing/qrcode/decoder/decoded_bit_stream_parser.cpp -@@ -65,7 +65,8 @@ void DecodedBitStreamParser::append(std::string& result, string const& in, - - void DecodedBitStreamParser::append(std::string& result, const char* bufIn, size_t nIn, - ErrorHandler& err_handler) { -- if (err_handler.ErrCode()) return; -+ // avoid null pointer exception -+ if (err_handler.ErrCode() || bufIn == nullptr) return; - #ifndef NO_ICONV_INSIDE - if (nIn == 0) { - return; -@@ -190,16 +191,20 @@ void DecodedBitStreamParser::decodeByteSegment(Ref<BitSource> bits_, string& res - CharacterSetECI* currentCharacterSetECI, - ArrayRef<ArrayRef<char> >& byteSegments, - ErrorHandler& err_handler) { -- int nBytes = count; - BitSource& bits(*bits_); - // Don't crash trying to read more bits than we have available. - int available = bits.available(); - // try to repair count data if count data is invalid - if (count * 8 > available) { -- count = (available + 7 / 8); -+ count = (available + 7) / 8; - } -+ size_t nBytes = count; -+ -+ ArrayRef<char> bytes_(nBytes); -+ // issue https://github.com/opencv/opencv_contrib/issues/3478 -+ if (bytes_->empty()) -+ return; - -- ArrayRef<char> bytes_(count); - char* readBytes = &(*bytes_)[0]; - for (int i = 0; i < count; i++) { - // readBytes[i] = (char) bits.readBits(8); -diff --git a/modules/wechat_qrcode/test/test_qrcode.cpp b/modules/wechat_qrcode/test/test_qrcode.cpp -index d59932b8..ec2559b0 100644 ---- a/modules/wechat_qrcode/test/test_qrcode.cpp -+++ b/modules/wechat_qrcode/test/test_qrcode.cpp -@@ -455,5 +455,16 @@ TEST_P(Objdetect_QRCode_Easy_Multi, regression) { - std::string qrcode_model_path[] = {"", "dnn/wechat_2021-01"}; - INSTANTIATE_TEST_CASE_P(/**/, Objdetect_QRCode_Easy_Multi, testing::ValuesIn(qrcode_model_path)); - -+TEST(Objdetect_QRCode_bug, issue_3478) { -+ auto detector = wechat_qrcode::WeChatQRCode(); -+ std::string image_path = findDataFile("qrcode/issue_3478.png"); -+ Mat src = imread(image_path, IMREAD_GRAYSCALE); -+ ASSERT_FALSE(src.empty()) << "Can't read image: " << image_path; -+ std::vector<std::string> outs = detector.detectAndDecode(src); -+ ASSERT_EQ(1, (int) outs.size()); -+ ASSERT_EQ(16, (int) outs[0].size()); -+ ASSERT_EQ("KFCVW50 ", outs[0]); -+} -+ - } // namespace - } // namespace opencv_test diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.7.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb index a1fbaaa091..9564bbbe9d 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "725e440d278aca07d35a5e8963ef990572b07316" -SRCREV_contrib = "e247b680a6bd396f110274b6c214406a93171350" +SRCREV_opencv = "f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef" +SRCREV_contrib = "f10c84d48b0714f2b408c9e5cccfac1277c8e6cc" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" @@ -19,8 +19,8 @@ SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ - git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ @@ -31,7 +31,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ - file://CVE-2023-2617.patch;patchdir=contrib \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb b/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb index 5f3c9b6f00..2f37b099b4 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb @@ -46,8 +46,3 @@ do_install () { PCP_MAN_DIR=${D}/${mandir} \ PCP_DOC_DIR=${D}/${docdir} } -#| chkacc1.c:8:10: fatal error: localconfig.h: No such file or directory -#| 8 | #include "localconfig.h" -#| | ^~~~~~~~~~~~~~~ -PARALLEL_MAKE = "" - diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc b/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc index 708ebfe7ab..4cafa7234b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp.inc @@ -9,24 +9,32 @@ COMPATIBLE_HOST:libc-musl = "null" SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ file://config.linux \ " -SRC_URI[sha256sum] = "6ef33b7aa14c09860ba7cd8873e76d38ccd24eab0c94a50e235f813e77fe3610" +SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" inherit setuptools3-base pkgconfig autotools-brokensep # Specify any options you want to pass to the configure script using EXTRA_OECONF: CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" -EXTRA_OECONF:append = " --with-dstat-symlink=yes --with-infiniband=no \ - --with-pmdapodman=no --with-python=no --with-python3=yes --with-perl=no \ - --with-pmdabcc=no --with-pmdajson=no --with-perfevent=no \ - --with-pmdabcc=yes \ - --with-rundir=${localstatedir}/run \ - --with-sysconfigdir=${sysconfdir} \ - --with-logdir=${localstatedir}/log \ - --with-docdir=${docdir} \ - " +EXTRA_OECONF:append = "\ + --with-dstat-symlink=yes \ + --with-infiniband=no \ + --with-python=no \ + --with-perl=no \ + --with-python3=yes \ + --with-pmdajson=no \ + --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" PACKAGECONFIG ?= "" + +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch index 292499850e..abf4aee61d 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -11,11 +11,9 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> src/libpcp/src/GNUmakefile | 1 - 2 files changed, 7 deletions(-) -diff --git a/configure.ac b/configure.ac -index 5b25382..5d24714 100644 --- a/configure.ac +++ b/configure.ac -@@ -623,12 +623,6 @@ fi +@@ -607,12 +607,6 @@ fi which=$WHICH AC_SUBST(which) @@ -28,18 +26,14 @@ index 5b25382..5d24714 100644 ar=$AR AC_SUBST(ar) -diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile -index 3c4ccd6..d1eba19 100644 --- a/src/libpcp/src/GNUmakefile +++ b/src/libpcp/src/GNUmakefile -@@ -176,7 +176,6 @@ exports: exports.in mk.exports - # cases +@@ -179,8 +179,6 @@ exports: exports.in mk.exports + # consistent in all placess. # check.done: $(OBJECTS) - ./check-statics +- ./check-errorcodes touch check.done ifneq ($(LIBTARGET),) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch index 591f94f374..b03c48e581 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch @@ -14,11 +14,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -diff --git a/configure.ac b/configure.ac -index 5d24714..4e2d8ec 100644 --- a/configure.ac +++ b/configure.ac -@@ -913,7 +913,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], +@@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], [ PY_MAJOR="$1" PY_MINOR="$2" PY_VERSION="python$PY_MAJOR.$PY_MINOR" @@ -27,7 +25,7 @@ index 5d24714..4e2d8ec 100644 saved_CFLAGS="$CFLAGS" saved_CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" -@@ -1524,7 +1524,7 @@ AC_SUBST(qmake) +@@ -1603,7 +1603,7 @@ AC_SUBST(qmake) enable_qt3d=false AS_IF([test "x$do_qt3d" != "xno"], [ @@ -36,45 +34,7 @@ index 5d24714..4e2d8ec 100644 then enable_qt3d=$enable_qt elif test x"$do_qt3d" = x"yes" -@@ -3810,13 +3810,13 @@ then - - saved_CFLAGS="$CFLAGS" - saved_CPPFLAGS="$CPPFLAGS" -- NSS_INC_DIRS="-I/usr/include/nss -I/usr/include/nss3" -- NSPR_INC_DIRS="-I/usr/include/nspr -I/usr/include/nspr4" -+ NSS_INC_DIRS="-I${STAGING_INCDIR}/nss -I${STAGING_INCDIR}/nss3" -+ NSPR_INC_DIRS="-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nspr4" - CFLAGS="$CFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" - CPPFLAGS="$CPPFLAGS $NSS_INC_DIRS $NSPR_INC_DIRS" - -- AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I/usr/include/nss], [ -- AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I/usr/include/nss3], [ -+ AC_CHECK_HEADERS([nss/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss], [ -+ AC_CHECK_HEADERS([nss3/nss.h], [NSSCFLAGS=-I${STAGING_INCDIR}/nss3], [ - enable_secure=false - if test "$do_secure" = "yes" - then -@@ -3826,8 +3826,8 @@ then - ]) - AC_SUBST(NSSCFLAGS) - -- AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr], [ -- AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I/usr/include/nspr4], [ -+ AC_CHECK_HEADERS([nspr/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr], [ -+ AC_CHECK_HEADERS([nspr4/nspr.h], [NSPRCFLAGS=-I${STAGING_INCDIR}/nspr4], [ - enable_secure=false - if test "$do_secure" = "yes" - then -@@ -3837,7 +3837,7 @@ then - ]) - AC_SUBST(NSPRCFLAGS) - -- AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I/usr/include/sasl], [ -+ AC_CHECK_HEADERS([sasl/sasl.h], [SASLCFLAGS=-I${STAGING_INCDIR}/sasl], [ - enable_secure=false - if test "$do_secure" = "yes" - then -@@ -3938,7 +3938,7 @@ AC_SUBST(enable_decompression) +@@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression) AC_SUBST(enable_lzma) dnl check for array sessions @@ -83,6 +43,3 @@ index 5d24714..4e2d8ec 100644 then pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread else --- -2.35.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch new file mode 100644 index 0000000000..009dfe2d04 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -0,0 +1,36 @@ +From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Jul 2023 08:45:14 -0700 +Subject: [PATCH] htop: Change dependency order of header and sourcefiles + +Fixes build race +| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory +| 29 | #include "DiskIOMeter.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. +| make[3]: *** [<builtin>: pcp-htop.o] Error 1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/pcp/htop/GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile +index 6b7c0c5..5153c63 100644 +--- a/src/pcp/htop/GNUmakefile ++++ b/src/pcp/htop/GNUmakefile +@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) + CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) + + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) +-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) +-SUBXFILES = $(SUBCFILES) $(SUBHFILES) ++TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) ++SUBXFILES = $(SUBHFILES) $(SUBCFILES) + CFILES = $(TOPCFILES) $(SUBCFILES) + HFILES = $(TOPHFILES) $(SUBHFILES) + LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.6.bb b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index 0543d77a78..b337df6ea4 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -18,17 +18,26 @@ SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" #export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" -inherit useradd systemd features_check +inherit useradd systemd features_check python3targetconfig # Needs libx11 REQUIRED_DISTRO_FEATURES = "x11" SYSTEMD_AUTO_ENABLE:${PN} = "enable" -SYSTEMD_SERVICE:${PN} = "pmcd.service pmcd.service pmie_check.service pmie_farm_check.service \ - pmlogger_daily.service pmlogger_farm_check.service pmfind.service \ - pmie_daily.service pmlogger.service pmlogger_daily_report.service \ - pmproxy.service pmie.service pmie_farm.service pmlogger_check.service \ - pmlogger_farm.service" +SYSTEMD_SERVICE:${PN} = "\ + pmie_farm_check.service \ + pmie_farm.service \ + pmfind.service \ + pmlogger_farm_check.service \ + pmcd.service \ + pmie.service \ + pmlogger_daily.service \ + pmlogger.service \ + pmlogger_farm.service \ + pmie_check.service \ + pmproxy.service \ + pmlogger_check.service \ + pmie_daily.service" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ @@ -88,7 +97,7 @@ do_install () { PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ libpcp-gui2 libpcp-gui2-dev \ - libpcp-import1 \ + libpcp-import1 libpcp-archive1 \ libpcp-mmv1 libpcp-mmv1-dev \ libpcp-pmda3 libpcp-pmda3-dev \ libpcp-trace2 libpcp-trace2-dev \ @@ -97,6 +106,8 @@ PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ " FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ " +FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ +" FILES:libpcp-gui2-dev = " \ ${libdir}/libpcp_gui.so \ ${libdir}/libpcp_gui.a \ @@ -166,6 +177,7 @@ FILES:${PN} = " \ ${datadir}/zsh \ ${systemd_system_unitdir}/ \ ${libdir}/pcp/ \ + ${libdir}/sysusers.d/pcp.conf \ ${datadir}/pcp \ ${libdir}/*.sh \ ${datadir}/man \ @@ -184,7 +196,7 @@ FILES:${PN}-export-zabbix-agent += " \ ${mandir}/man3/zbxpcp.3.gz \ ${libdir}/zabbix \ " -FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" FILES:${PN}-dev += " \ ${includedir}/pcp \ @@ -222,7 +234,3 @@ FILES:${PN}-dev += " \ ${datadir}/man/man3/pms* \ ${datadir}/man/man3/pmt* \ " -#| chkacc1.c:8:10: fatal error: localconfig.h: No such file or directory -#| 8 | #include "localconfig.h" -#| | ^~~~~~~~~~~~~~~ -PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index c0e1790ec2..6ce42ec187 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -25,6 +25,8 @@ PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5" PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib" #PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" +# disable Werror by default, useful for dev mode +PACKAGECONFIG[quality] = "--enable-quality-check=yes,--enable-quality-check=no," FILES:${PN}-dev += " \ ${libdir}/purple-2/*.la \ diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch new file mode 100644 index 0000000000..70ba1cf123 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch @@ -0,0 +1,41 @@ +From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001 +From: Jordan Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 16 May 2023 18:52:19 +0000 +Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h + +Fixes #1398 + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + goo/JpegWriter.cc | 2 +- + poppler/ImageEmbeddingUtils.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc +index ca69fd055..566ee38f8 100644 +--- a/goo/JpegWriter.cc ++++ b/goo/JpegWriter.cc +@@ -23,7 +23,7 @@ + #ifdef ENABLE_LIBJPEG + + # include "poppler/Error.h" +- ++# include <cstdio> + extern "C" { + # include <jpeglib.h> + } +diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc +index 0c13fe968..07b9dfb62 100644 +--- a/poppler/ImageEmbeddingUtils.cc ++++ b/poppler/ImageEmbeddingUtils.cc +@@ -14,6 +14,7 @@ + + #include <memory> + #ifdef ENABLE_LIBJPEG ++# include <cstdio> + extern "C" { + # include <jpeglib.h> + } +-- +GitLab diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 099be58a42..896176801b 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -7,6 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ file://0001-cmake-Do-not-use-isystem.patch \ + file://jpeg-stdio.patch \ " SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" diff --git a/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch new file mode 100644 index 0000000000..3c364dcc4e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -0,0 +1,38 @@ +From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de> +Date: Tue, 9 May 2023 20:00:26 +0200 +Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Show pv progress bar even if no terminal is set, e.g., in a busybox +init script. The description of pv_in_forground() states it will +return true "if we aren't outputting to a terminal". However, this +is not the case since tcgetpgrg() will return an error and set ERRNO +to ENOTTY if the output fd is not an tty. We now handle this error +correctly and pv_in_foreground() returns also true in that case. + +Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de> +--- + src/pv/display.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pv/display.c b/src/pv/display.c +index aff643b..8d1f4c9 100644 +--- a/src/pv/display.c ++++ b/src/pv/display.c +@@ -48,6 +48,10 @@ bool pv_in_foreground(void) + + our_process_group = getpgrp(); + tty_process_group = tcgetpgrp(STDERR_FILENO); ++ ++ if (tty_process_group == -1 && errno == ENOTTY) ++ return true; ++ + if (our_process_group == tty_process_group) + return true; + +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb index 867a621d1a..6d449a945b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -5,6 +5,7 @@ LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ + file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" diff --git a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch new file mode 100644 index 0000000000..e709616797 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch @@ -0,0 +1,34 @@ +From da171e12d961b41b89196627ef5e5baae1e637ce Mon Sep 17 00:00:00 2001 +From: David Anes <david.anes@suse.com> +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/ac914399b9013c54572833d4818e6ce008136dc9] +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8..8bcee13 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 1699112764..30df8e0648 100644 --- a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -11,6 +11,7 @@ DEPENDS = "libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ + file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ " SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch deleted file mode 100644 index b997389aa2..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog/0001-Do-not-use-LFS64-functions-on-linux-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 30 Dec 2022 13:04:08 -0800 -Subject: [PATCH] Do not use LFS64 functions on linux/musl - -On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using -LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped -providing aliases for these functions [1] which means it wont compile on -newer musl systems. Therefore only use it on 32bit glibc/linux platforms -and exclude musl like cygwin or OSX - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 - -Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/spdlog/details/os.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/include/spdlog/details/os-inl.h -+++ b/include/spdlog/details/os-inl.h -@@ -237,7 +237,7 @@ SPDLOG_INLINE size_t filesize(FILE *f) - int fd = ::fileno(f); - # endif - // 64 bits(but not in osx or cygwin, where fstat64 is deprecated) --# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) -+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) - struct stat64 st; - if (::fstat64(fd, &st) == 0) - { diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog/fix-build-for-master-fmt.patch b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog/fix-build-for-master-fmt.patch deleted file mode 100644 index c767db919f..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog/fix-build-for-master-fmt.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Backport -[https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05] - -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> - -From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001 -From: H1X4 <10332146+H1X4Dev@users.noreply.github.com> -Date: Fri, 31 Mar 2023 20:39:32 +0300 -Subject: [PATCH] fix build for master fmt (non-bundled) (#2694) - -* fix build for master fmt (non-bundled) - -* update fmt_runtime_string macro - -* fix build of updated macro ---- - include/spdlog/common.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index e69201a81..5f671c5c6 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>; - template<class T> - using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type; - -+template <typename Char> -+#if FMT_VERSION >= 90101 -+using fmt_runtime_string = fmt::runtime_format_string<Char>; -+#else -+using fmt_runtime_string = fmt::basic_runtime<Char>; -+#endif -+ - // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, - // in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char> - template<class T, class Char = char> - struct is_convertible_to_basic_format_string - : std::integral_constant<bool, -- std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value> -+ std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value> - {}; - - # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.12.0.bb index 2800be4784..c7d8ff8f3d 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.12.0.bb @@ -3,11 +3,8 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x \ - file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch \ - file://fix-build-for-master-fmt.patch \ - " +SRCREV = "7e635fca68d014934b4af8a1cf874f63989352b7" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" DEPENDS += "fmt" diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch deleted file mode 100644 index 547949dd60..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch +++ /dev/null @@ -1,33 +0,0 @@ -From de869ad2cb19d81257a159770ebe27593a71593c Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 11:29:51 +0800 -Subject: [PATCH] do not strip pdata_tools at do_install - -It caused QA Issue: --------------- -|ERROR: QA Issue: File '/usr/sbin/pdata_tools' from thin-provisioning-tools -was already stripped, this will prevent future debugging! [already-stripped] --------------- - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 02b75dd..df590b4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -267,7 +267,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) - install: bin/pdata_tools $(MANPAGES) - $(INSTALL_DIR) $(BINDIR) - $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) -- $(STRIP) $(BINDIR)/pdata_tools - ln -s -f pdata_tools $(BINDIR)/cache_check - ln -s -f pdata_tools $(BINDIR)/cache_dump - ln -s -f pdata_tools $(BINDIR)/cache_metadata_size --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch deleted file mode 100644 index de934c19a8..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 38397b42e2c3450c2aee20e6fb92f362db4e35ef Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 2 Jul 2019 13:20:39 +0800 -Subject: [PATCH] thin-provisioning-tools: use sh on path when invoking txt2man - -txt2man contains a test which might try to use ksh to run the script, so we -avoid running /bin/sh. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: joe.slater <joe.slater@windriver.com> - -Rebase to 0.8.5 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 7c867b2..5303994 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -223,7 +223,7 @@ endif - %.8: %.txt bin/txt2man - @echo " [txt2man] $<" - @mkdir -p $(dir $@) -- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ -+ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ - - #---------------------------------------------------------------- - --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc new file mode 100644 index 0000000000..f7992b9411 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc @@ -0,0 +1,306 @@ +# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.0.1 \ + crate://crates.io/anyhow/1.0.70 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.20.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bytemuck/1.13.1 \ + crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/cassowary/0.3.0 \ + crate://crates.io/cc/1.0.79 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/clap/3.2.23 \ + crate://crates.io/clap_lex/0.2.4 \ + crate://crates.io/console/0.15.5 \ + crate://crates.io/crc32fast/1.3.2 \ + crate://crates.io/data-encoding/2.3.3 \ + crate://crates.io/difflib/0.4.0 \ + crate://crates.io/downcast/0.11.0 \ + crate://crates.io/duct/0.13.6 \ + crate://crates.io/either/1.8.1 \ + crate://crates.io/encode_unicode/0.3.6 \ + crate://crates.io/env_logger/0.7.1 \ + crate://crates.io/errno/0.3.1 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/exitcode/1.1.2 \ + crate://crates.io/fastrand/1.9.0 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/flate2/1.0.25 \ + crate://crates.io/float-cmp/0.9.0 \ + crate://crates.io/fragile/2.0.0 \ + crate://crates.io/futures/0.3.28 \ + crate://crates.io/futures-channel/0.3.28 \ + crate://crates.io/futures-core/0.3.28 \ + crate://crates.io/futures-executor/0.3.28 \ + crate://crates.io/futures-io/0.3.28 \ + crate://crates.io/futures-macro/0.3.28 \ + crate://crates.io/futures-sink/0.3.28 \ + crate://crates.io/futures-task/0.3.28 \ + crate://crates.io/futures-util/0.3.28 \ + crate://crates.io/getrandom/0.1.16 \ + crate://crates.io/getrandom/0.2.9 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.2.6 \ + crate://crates.io/hermit-abi/0.3.1 \ + crate://crates.io/indexmap/1.9.3 \ + crate://crates.io/indicatif/0.17.3 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/io-lifetimes/1.0.10 \ + crate://crates.io/iovec/0.1.4 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/jobserver/0.1.26 \ + crate://crates.io/json/0.12.4 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.142 \ + crate://crates.io/linux-raw-sys/0.3.4 \ + crate://crates.io/log/0.4.17 \ + crate://crates.io/memchr/2.5.0 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/miniz_oxide/0.6.2 \ + crate://crates.io/mockall/0.11.4 \ + crate://crates.io/mockall_derive/0.11.4 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/normalize-line-endings/0.3.0 \ + crate://crates.io/num-derive/0.3.3 \ + crate://crates.io/num-traits/0.2.15 \ + crate://crates.io/num_cpus/1.15.0 \ + crate://crates.io/number_prefix/0.4.0 \ + crate://crates.io/numtoa/0.1.0 \ + crate://crates.io/once_cell/1.17.1 \ + crate://crates.io/os_pipe/1.1.4 \ + crate://crates.io/os_str_bytes/6.5.0 \ + crate://crates.io/pin-project-lite/0.2.9 \ + crate://crates.io/pin-utils/0.1.0 \ + crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/portable-atomic/0.3.19 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/predicates/2.1.5 \ + crate://crates.io/predicates-core/1.0.6 \ + crate://crates.io/predicates-tree/1.0.9 \ + crate://crates.io/proc-macro2/1.0.56 \ + crate://crates.io/quick-xml/0.23.1 \ + crate://crates.io/quickcheck/0.9.2 \ + crate://crates.io/quickcheck_macros/0.9.1 \ + crate://crates.io/quote/1.0.26 \ + crate://crates.io/rand/0.7.3 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.2.2 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.5.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rand_hc/0.2.0 \ + crate://crates.io/rangemap/1.3.0 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/redox_termios/0.1.2 \ + crate://crates.io/regex/1.8.1 \ + crate://crates.io/regex-syntax/0.7.1 \ + crate://crates.io/retain_mut/0.1.7 \ + crate://crates.io/roaring/0.10.1 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.37.14 \ + crate://crates.io/safemem/0.3.3 \ + crate://crates.io/semver/1.0.17 \ + crate://crates.io/shared_child/1.0.0 \ + crate://crates.io/slab/0.4.8 \ + crate://crates.io/strsim/0.10.0 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.15 \ + crate://crates.io/tempfile/3.5.0 \ + crate://crates.io/termcolor/1.2.0 \ + crate://crates.io/termion/1.5.6 \ + crate://crates.io/termtree/0.4.1 \ + crate://crates.io/textwrap/0.16.0 \ + crate://crates.io/thiserror/1.0.40 \ + crate://crates.io/thiserror-impl/1.0.40 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/tui/0.16.0 \ + crate://crates.io/unicode-ident/1.0.8 \ + crate://crates.io/unicode-segmentation/1.10.1 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.42.0 \ + crate://crates.io/windows-sys/0.45.0 \ + crate://crates.io/windows-sys/0.48.0 \ + crate://crates.io/windows-targets/0.42.2 \ + crate://crates.io/windows-targets/0.48.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ + crate://crates.io/windows_aarch64_msvc/0.42.2 \ + crate://crates.io/windows_aarch64_msvc/0.48.0 \ + crate://crates.io/windows_i686_gnu/0.42.2 \ + crate://crates.io/windows_i686_gnu/0.48.0 \ + crate://crates.io/windows_i686_msvc/0.42.2 \ + crate://crates.io/windows_i686_msvc/0.48.0 \ + crate://crates.io/windows_x86_64_gnu/0.42.2 \ + crate://crates.io/windows_x86_64_gnu/0.48.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ + crate://crates.io/windows_x86_64_msvc/0.42.2 \ + crate://crates.io/windows_x86_64_msvc/0.48.0 \ + crate://crates.io/zstd/0.11.2+zstd.1.5.2 \ + crate://crates.io/zstd-safe/5.0.2+zstd.1.5.2 \ + crate://crates.io/zstd-sys/2.0.8+zstd.1.5.5 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.0.1.sha256sum] = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +SRC_URI[anyhow-1.0.70.sha256sum] = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[base64-0.20.0.sha256sum] = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bytemuck-1.13.1.sha256sum] = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[clap-3.2.23.sha256sum] = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +SRC_URI[console-0.15.5.sha256sum] = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[data-encoding-2.3.3.sha256sum] = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +SRC_URI[difflib-0.4.0.sha256sum] = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +SRC_URI[duct-0.13.6.sha256sum] = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +SRC_URI[either-1.8.1.sha256sum] = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +SRC_URI[env_logger-0.7.1.sha256sum] = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +SRC_URI[errno-0.3.1.sha256sum] = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" +SRC_URI[fastrand-1.9.0.sha256sum] = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +SRC_URI[flate2-1.0.25.sha256sum] = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +SRC_URI[float-cmp-0.9.0.sha256sum] = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +SRC_URI[futures-0.3.28.sha256sum] = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +SRC_URI[futures-channel-0.3.28.sha256sum] = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +SRC_URI[futures-core-0.3.28.sha256sum] = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +SRC_URI[futures-executor-0.3.28.sha256sum] = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +SRC_URI[futures-io-0.3.28.sha256sum] = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +SRC_URI[futures-macro-0.3.28.sha256sum] = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +SRC_URI[futures-sink-0.3.28.sha256sum] = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +SRC_URI[futures-task-0.3.28.sha256sum] = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +SRC_URI[futures-util-0.3.28.sha256sum] = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +SRC_URI[hermit-abi-0.3.1.sha256sum] = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[io-lifetimes-1.0.10.sha256sum] = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +SRC_URI[jobserver-0.1.26.sha256sum] = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +SRC_URI[json-0.12.4.sha256sum] = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.142.sha256sum] = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +SRC_URI[linux-raw-sys-0.3.4.sha256sum] = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[miniz_oxide-0.6.2.sha256sum] = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +SRC_URI[mockall-0.11.4.sha256sum] = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +SRC_URI[mockall_derive-0.11.4.sha256sum] = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +SRC_URI[num-derive-0.3.3.sha256sum] = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +SRC_URI[num_cpus-1.15.0.sha256sum] = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +SRC_URI[once_cell-1.17.1.sha256sum] = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +SRC_URI[os_pipe-1.1.4.sha256sum] = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +SRC_URI[os_str_bytes-6.5.0.sha256sum] = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +SRC_URI[portable-atomic-0.3.19.sha256sum] = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[predicates-2.1.5.sha256sum] = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +SRC_URI[proc-macro2-1.0.56.sha256sum] = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +SRC_URI[quick-xml-0.23.1.sha256sum] = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +SRC_URI[quickcheck-0.9.2.sha256sum] = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" +SRC_URI[quickcheck_macros-0.9.1.sha256sum] = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f" +SRC_URI[quote-1.0.26.sha256sum] = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +SRC_URI[rangemap-1.3.0.sha256sum] = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[redox_termios-0.1.2.sha256sum] = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +SRC_URI[regex-1.8.1.sha256sum] = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +SRC_URI[regex-syntax-0.7.1.sha256sum] = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +SRC_URI[retain_mut-0.1.7.sha256sum] = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" +SRC_URI[roaring-0.10.1.sha256sum] = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.37.14.sha256sum] = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" +SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +SRC_URI[semver-1.0.17.sha256sum] = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +SRC_URI[slab-0.4.8.sha256sum] = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.15.sha256sum] = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +SRC_URI[tempfile-3.5.0.sha256sum] = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +SRC_URI[thiserror-1.0.40.sha256sum] = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +SRC_URI[thiserror-impl-1.0.40.sha256sum] = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +SRC_URI[tui-0.16.0.sha256sum] = "39c8ce4e27049eed97cfa363a5048b09d995e209994634a0efc26a14ab6c0c23" +SRC_URI[unicode-ident-1.0.8.sha256sum] = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.42.0.sha256sum] = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +SRC_URI[windows-targets-0.48.0.sha256sum] = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +SRC_URI[zstd-0.11.2+zstd.1.5.2.sha256sum] = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +SRC_URI[zstd-safe-5.0.2+zstd.1.5.2.sha256sum] = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +SRC_URI[zstd-sys-2.0.8+zstd.1.5.5.sha256sum] = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc new file mode 100644 index 0000000000..46e826cabc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc @@ -0,0 +1,10 @@ +SRC_URI += "\ + git://github.com/zowens/crc32c;protocol=https;nobranch=1;name=crc32c;destsuffix=crc32c;type=git-dependency \ + git://github.com/jthornber/rio;protocol=https;nobranch=1;name=rio;destsuffix=rio;type=git-dependency \ +" + +SRCREV_FORMAT .= "_crc32c" +SRCREV_crc32c = "3779fe88fea034922f808586b2564fbcab31efdc" + +SRCREV_FORMAT .= "_rio" +SRCREV_rio = "2979a720f671e836302c01546f9cc9f7988610c8" diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch new file mode 100644 index 0000000000..a9f1c8601d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Replace-LFS-functions.patch @@ -0,0 +1,91 @@ +From 289105253fbf342fd22cbcde2ccc1127f732ab09 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jul 2023 14:21:17 -0700 +Subject: [PATCH] Replace LFS functions + +The original functions are able to consume 64bit off_t now a days +therefore *64 equivalents can be replaced, as a side it fixes build with +musl. + +Upstream-Status: Submitted [https://github.com/jthornber/thin-provisioning-tools/pull/267] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/file_utils.rs | 10 +++++----- + src/io_engine/base.rs | 4 ++-- + src/thin/trim.rs | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/file_utils.rs b/src/file_utils.rs +index 0ca3c0f..d2b3ee9 100644 +--- a/src/file_utils.rs ++++ b/src/file_utils.rs +@@ -11,18 +11,18 @@ fn test_bit(mode: u32, flag: u32) -> bool { + (mode & libc::S_IFMT) == flag + } + +-fn is_file_or_blk_(info: &libc::stat64) -> bool { ++fn is_file_or_blk_(info: &libc::stat) -> bool { + test_bit(info.st_mode, libc::S_IFBLK) || test_bit(info.st_mode, libc::S_IFREG) + } + + // wrapper of libc::stat64 +-fn libc_stat64(path: &Path) -> io::Result<libc::stat64> { ++fn libc_stat64(path: &Path) -> io::Result<libc::stat> { + let c_path = std::ffi::CString::new(path.as_os_str().as_bytes()) + .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?; + + unsafe { +- let mut st: libc::stat64 = std::mem::zeroed(); +- let r = libc::stat64(c_path.as_ptr(), &mut st); ++ let mut st: libc::stat = std::mem::zeroed(); ++ let r = libc::stat(c_path.as_ptr(), &mut st); + if r == 0 { + Ok(st) + } else { +@@ -56,7 +56,7 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> { + let fd = file.as_raw_fd(); + let mut cap = 0u64; + unsafe { +- if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 { ++ if libc::ioctl(fd, BLKGETSIZE64 as libc::c_int, &mut cap) == 0 { + Ok(cap) + } else { + Err(io::Error::last_os_error()) +diff --git a/src/io_engine/base.rs b/src/io_engine/base.rs +index 725ebf7..db6209f 100644 +--- a/src/io_engine/base.rs ++++ b/src/io_engine/base.rs +@@ -115,7 +115,7 @@ pub trait VectoredIo { + + fn read_vectored_at(file: &File, bufs: &mut [libc::iovec], pos: u64) -> io::Result<usize> { + let ptr = bufs.as_ptr(); +- let ret = match unsafe { libc::preadv64(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } ++ let ret = match unsafe { libc::preadv(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } + { + -1 => return Err(io::Error::last_os_error()), + n => n, +@@ -125,7 +125,7 @@ fn read_vectored_at(file: &File, bufs: &mut [libc::iovec], pos: u64) -> io::Resu + + fn write_vectored_at(file: &File, bufs: &[libc::iovec], pos: u64) -> io::Result<usize> { + let ptr = bufs.as_ptr(); +- let ret = match unsafe { libc::pwritev64(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } ++ let ret = match unsafe { libc::pwritev(file.as_raw_fd(), ptr, bufs.len() as i32, pos as i64) } + { + -1 => return Err(io::Error::last_os_error()), + n => n, +diff --git a/src/thin/trim.rs b/src/thin/trim.rs +index 3d938ca..91a53dd 100644 +--- a/src/thin/trim.rs ++++ b/src/thin/trim.rs +@@ -135,7 +135,7 @@ impl<'a> Iterator for RangeIterator<'a> { + const BLKDISCARD: u32 = 0x1277; + fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> { + unsafe { +- if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 { ++ if libc::ioctl(fd, BLKDISCARD as libc::c_int, range) == 0 { + Ok(()) + } else { + Err(std::io::Error::last_os_error()) +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb deleted file mode 100644 index 25d72006fd..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.9.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Tools of dm-thin device-mapper" -DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." -HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" -LICENSE = "GPL-3.0-only" -SECTION = "devel" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ - file://0001-do-not-strip-pdata_tools-at-do_install.patch \ - file://use-sh-on-path.patch \ -" - -SRCREV = "d6d93c3157631b242a13a81d30f75453e576c55a" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -DEPENDS += "expat libaio boost" - -inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.4.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.4.bb new file mode 100644 index 0000000000..e79f62ff6e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.4.bb @@ -0,0 +1,47 @@ +SUMMARY = "Tools of dm-thin device-mapper" +DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." +HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" +LICENSE = "GPL-3.0-only" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + " +SRC_URI:append:libc-musl = " file://0001-Replace-LFS-functions.patch" + +SRCREV = "3baa3fa3a3e4f714e6170a4152b186f0fa1d76e1" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cargo cargo-update-recipe-crates + +require ${BPN}-crates.inc +require ${BPN}-git-crates.inc + +do_install:append() { + for tool in cache_check \ + cache_dump \ + cache_metadata_size \ + cache_repair \ + cache_restore \ + cache_writeback \ + thin_check \ + thin_delta \ + thin_dump \ + thin_ls \ + thin_repair \ + thin_restore \ + thin_rmap \ + thin_metadata_size \ + thin_metadata_pack \ + thin_metadata_unpack \ + thin_trim \ + era_check \ + era_dump \ + era_invalidate \ + era_restore; do + ln -sf pdata_tools ${D}${bindir}/$tool + done +} diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch new file mode 100644 index 0000000000..37ef3a9d58 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch @@ -0,0 +1,29 @@ +Initial support for kernel 6.4 +https://www.virtualbox.org/changeset/99666/vbox + +Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -75,4 +75,11 @@ + #if RTLNX_VER_MAX(2,5,12) + # define PageUptodate(a_pPage) Page_Uptodate(a_pPage) ++#endif ++ ++/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ ++#if RTLNX_VER_MIN(6,4,0) ++# define VBOX_ITER_IOV(_iter) iter_iov(_iter) ++#else ++# define VBOX_ITER_IOV(_iter) iter->iov + #endif + +@@ -2400,5 +2407,5 @@ + if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { + # endif +- const struct iovec *pCurIov = iter->iov; ++ const struct iovec *pCurIov = VBOX_ITER_IOV(iter); + size_t cLeft = iter->nr_segs; + size_t cPagesSpan = 0; + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch new file mode 100644 index 0000000000..20c8fbd3fd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch @@ -0,0 +1,43 @@ +Initial support for kernel 6.4 +https://www.virtualbox.org/changeset/99667/vbox + + +Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -77,11 +77,4 @@ + #endif + +-/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ +-#if RTLNX_VER_MIN(6,4,0) +-# define VBOX_ITER_IOV(_iter) iter_iov(_iter) +-#else +-# define VBOX_ITER_IOV(_iter) iter->iov +-#endif +- + + /********************************************************************************************************************************* +@@ -94,4 +87,12 @@ + #else + # define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type) ++#endif ++ ++/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field ++ * of struct iov_iter. */ ++#if RTLNX_VER_MIN(6,4,0) ++# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter) ++#else ++# define VBSF_GET_ITER_IOV(_iter) iter->iov + #endif + +@@ -2407,5 +2408,5 @@ + if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { + # endif +- const struct iovec *pCurIov = VBOX_ITER_IOV(iter); ++ const struct iovec *pCurIov = VBSF_GET_ITER_IOV(iter); + size_t cLeft = iter->nr_segs; + size_t cPagesSpan = 0; + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb index ed3e429b37..233323bf75 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.8.bb @@ -13,6 +13,8 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch \ + file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch \ " SRC_URI[sha256sum] = "c305fbe480f507eac7c36893ead66dffaacda944f19c3813a4533e9c39bae237" diff --git a/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb index 7f08a82d61..7abdcb2523 100644 --- a/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=544799d0b492f119fa04641d1b8868ed" SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=master" PV = "0+git${SRCPV}" -SRCREV = "cacd2790eae7bf4767d4243f5b31134698d3b20d" +SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3" S = "${WORKDIR}/git" |