nfs-utils: replace problematic pending patch with upstream submission
PATCH 1/18 nfs-utils: replace problematic pending patch with upstream submission
From: Alexander Kanavin <[email protected]>
The now-removed patch was added for clang compatibility, but over time started fixing problems that do not exist, and got its description to mismatch the content.
The new patch is fixing the only problem with clang that still occurs. I verified that all files that were patched before still build without errors.
If you find other issues (this would be with non-default options probably), please fix them similarly.
--- ...ect-warning-options-during-configure.patch | 109 ------------------ ...mon.c-fix-a-formatting-error-with-cl.patch | 40 +++++++ .../nfs-utils/nfs-utils_2.8.2.bb | 2 +- 3 files changed, 41 insertions(+), 110 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Detect-warning-options-during-configure.patch create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Detect-warning-options-during-configure.patch deleted +0 -109
@@ -1,109 +0,0 @@ -From 1ab0c326405c6daa06f1a7eb4b0b60bf4e0584c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 31 Dec 2019 08:15:34 -0800 -Subject: [PATCH] Detect warning options during configure - -Certain options maybe compiler specific therefore its better -to detect them before use. - -nfs_error copies the format string and appends newline to it -but compiler can forget that it was format string since its not -same fmt string that was passed. Ignore the warning - -Wdiscarded-qualifiers is gcc specific and this is no longer needed - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - ---- - support/nfs/xcommon.c | 6 ++++++ - support/nfs/xlog.c | 6 ++++++ - support/nfsidmap/libnfsidmap.c | 3 +++ - utils/exportfs/exportfs.c | 3 +++ - 4 files changed, 18 insertions(+) - -diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c -index 3989f0bc..ff438c18 100644 ---- a/support/nfs/xcommon.c -+++ b/support/nfs/xcommon.c -@@ -98,7 +98,10 @@ nfs_error (const char *fmt, ...) { - - fmt2 = xstrconcat2 (fmt, "\n"); - va_start (args, fmt); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vfprintf (stderr, fmt2, args); -+#pragma GCC diagnostic pop - va_end (args); - free (fmt2); - } -@@ -132,7 +135,10 @@ die(int err, const char *fmt, ...) { - va_list args; - - va_start(args, fmt); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vfprintf(stderr, fmt, args); -+#pragma GCC diagnostic pop - fprintf(stderr, "\n"); - va_end(args); - -diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c -index fa125cef..dc4c9ea1 100644 ---- a/support/nfs/xlog.c -+++ b/support/nfs/xlog.c -@@ -178,11 +178,16 @@ xlog_backend(int kind, const char *fmt, va_list args) - fprintf(stderr, "%s: ", log_name); - #endif - va_copy(args2, args); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vfprintf(stderr, fmt, args2); -+#pragma GCC diagnostic pop - fprintf(stderr, "\n"); - va_end(args2); - } - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - if (log_syslog) { - switch (kind) { - case L_FATAL: -@@ -203,6 +208,7 @@ xlog_backend(int kind, const char *fmt, va_list args) - break; - } - } -+#pragma GCC diagnostic pop - - if (kind == L_FATAL) - exit(1); -diff --git a/support/nfsidmap/libnfsidmap.c b/support/nfsidmap/libnfsidmap.c -index f8c36480..1a28be0a 100644 ---- a/support/nfsidmap/libnfsidmap.c -+++ b/support/nfsidmap/libnfsidmap.c -@@ -99,7 +99,10 @@ static void default_logger(const char *fmt, ...) - va_list vp; - - va_start(vp, fmt); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vsyslog(LOG_WARNING, fmt, vp); -+#pragma GCC diagnostic pop - va_end(vp); - } - -diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c -index b03a047b..eac1ff2a 100644 ---- a/utils/exportfs/exportfs.c -+++ b/utils/exportfs/exportfs.c -@@ -646,7 +646,10 @@ dumpopt(char c, char *fmt, ...) - - va_start(ap, fmt); - printf("%c", c); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - vprintf(fmt, ap); -+#pragma GCC diagnostic pop - va_end(ap); - return ','; - }
meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch new file +40 -0
@@ -0,0 +1,40 @@ +From cc59a7fe15b6ca2ee43cba0dc1d699323b36ffcc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 21 Mar 2025 10:42:56 +0100 +Subject: [PATCH] support/nfs/xcommon.c: fix a formatting error with clang + +Specifically, this happens: + +| xcommon.c:101:24: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| 101 | vfprintf (stderr, fmt2, args); +| | ^~~~ + +A similar approach (print \n seprately) is already used elsewhere in +the same file. + +Upstream-Status: Submitted [via email to [email protected],[email protected]] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + support/nfs/xcommon.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c +index 3989f0b..1d04dd1 100644 +--- a/support/nfs/xcommon.c ++++ b/support/nfs/xcommon.c +@@ -94,13 +94,11 @@ xstrconcat4 (const char *s, const char *t, const char *u, const char *v) { + void + nfs_error (const char *fmt, ...) { + va_list args; +- char *fmt2; + +- fmt2 = xstrconcat2 (fmt, "\n"); + va_start (args, fmt); +- vfprintf (stderr, fmt2, args); ++ vfprintf (stderr, fmt, args); ++ fprintf (stderr, "\n"); + va_end (args); +- free (fmt2); + } + + /* Make a canonical pathname from PATH. Returns a freshly malloced string.
meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb +1 -1
@@ -23,9 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://nfscommon \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ file://0001-Fix-typecast-warning-with-clang.patch \ - file://0001-Detect-warning-options-during-configure.patch \ file://0004-Use-nogroup-for-nobody-group.patch \ file://0005-find-OE-provided-Kerberos.patch \ + file://0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch \ " SRC_URI[sha256sum] = "a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15"
Signature · 1 line
2.39.5
PATCH 2/18 perl-cross: submit determinism.patch upstream
From: Alexander Kanavin <[email protected]>
--- meta/recipes-devtools/perl-cross/files/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/perl-cross/files/determinism.patch +1 -1
@@ -21,7 +21,7 @@ d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with RP 2020/2/7 -Upstream-Status: Pending [75% submitted] +Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/154 https://github.com/arsv/perl-cross/pull/155] Signed-off-by: Richard Purdie <[email protected] --- cnf/configure | 2 +-
Signature · 1 line
2.39.5
PATCH 3/18 tcl8: mark pending patches as inappropriate
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Upstream submission should be done for tcl 9.x patches.
--- meta/recipes-devtools/tcltk8/tcl8/interp.patch | 2 +- meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch | 2 +- .../tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/tcltk8/tcl8/interp.patch +1 -1
@@ -6,7 +6,7 @@ Subject: [PATCH] tcl: fix race in interp.test The interp-36.7 patch has race conditions and is missing cleanup. This patch by a Tcl maintainer should improve matters. -Upstream-Status: Pending +Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches] Signed-off-by: Ross Burton <[email protected]> --- tests/interp.test | 7 ++++---
meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch +1 -1
@@ -3,7 +3,7 @@ From: Richard Purdie <[email protected]> Date: Wed, 9 Dec 2009 23:59:44 +0000 Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function -Upstream-Status: Pending +Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches] Signed-off-by: Alexander Kanavin <[email protected]> --- unix/Makefile.in | 5 ++++-
meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch +1 -1
@@ -7,7 +7,7 @@ Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}. [YOCTO #2876] -Upstream-Status: Pending +Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches] Signed-off-by: Song.Li <[email protected]> Signed-off-by: Kai Kang <[email protected]>
Signature · 1 line
2.39.5
PATCH 4/18 elfutils: remove 0001-libasm-may-link-with-libbz2-if-found.patch
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
The original linking issues seem to be long gone.
--- .../elfutils/elfutils_0.192.bb | 1 - ...libasm-may-link-with-libbz2-if-found.patch | 39 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
meta/recipes-devtools/elfutils/elfutils_0.192.bb +0 -1
@@ -15,7 +15,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0001-dso-link-change.patch \ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ file://0003-fixheadercheck.patch \ - file://0001-libasm-may-link-with-libbz2-if-found.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://ptest.patch \
meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 7bcee92c2006b7adad463be28cf4c3af21489cd2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 4 Oct 2017 22:30:46 -0700 -Subject: [PATCH] libasm may link with libbz2 if found - -This can fail to link binaries like objdump -where indirect libraries may be not found by linker - -| /mnt/a/oe/build/tmp/work/riscv64-bec-linux/elfutils/0.170-r0/recipe-sysroot/usr/lib/libbz2.so.1: error adding symbols: DSO missing from command line -| collect2: error: ld returned 1 exit status - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3bcee3c..18eed9a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,7 +46,7 @@ EXTRA_DIST += make-debug-archive.in - CLEANFILES += make-debug-archive - - if BUILD_STATIC --libasm = ../libasm/libasm.a -+libasm = ../libasm/libasm.a $(zip_LIBS) - libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread - libelf = ../libelf/libelf.a -lz $(zstd_LIBS) - if LIBDEBUGINFOD -@@ -55,7 +55,7 @@ else - libdebuginfod = - endif - else --libasm = ../libasm/libasm.so -+libasm = ../libasm/libasm.so $(zip_LIBS) - libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl - libelf = ../libelf/libelf.so - if LIBDEBUGINFOD
Signature · 1 line
2.39.5
PATCH 5/18 elfutils: remove 0001-dso-link-change.patch
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
The original linking issues seem to be long gone.
--- .../elfutils/elfutils_0.192.bb | 1 - .../elfutils/files/0001-dso-link-change.patch | 49 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
meta/recipes-devtools/elfutils/elfutils_0.192.bb +0 -1
@@ -12,7 +12,6 @@ DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack" # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://run-ptest \ - file://0001-dso-link-change.patch \ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ file://0003-fixheadercheck.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch deleted +0 -49
49 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH 6/18 ca-certificates: submit sysroot patch upstream, drop default-sysroot.patch
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch was using a non-standard environment variable, and was replaced with a patch that adds a command line option (and then this was submitted upstream). ca-certificates recipe was tweaked accordingly, and nothing else in core or meta-oe is using update-ca-certificates.
Drop default-sysroot.patch as the use case is unclear: sysroot is explicitly specified in all known invocations of update-ca-certificate, and if there's a place where it isn't, then update-ca-certificates will error out trying to write to /etc, and should be fixed to explicitly specify the sysroot.
--- ...ca-certificates-add-a-sysroot-option.patch | 36 ++++++++++++ ...2-update-ca-certificates-use-SYSROOT.patch | 46 --------------- ...icates-use-relative-symlinks-from-ET.patch | 18 +++--- .../ca-certificates/default-sysroot.patch | 58 ------------------- .../ca-certificates_20241223.bb | 9 ++- 5 files changed, 49 insertions(+), 118 deletions(-) create mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch new file +36 -0
@@ -0,0 +1,36 @@ +From d6bb773745c2e95fd1a414e916fbed64e0d8df66 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 31 Mar 2025 17:42:25 +0200 +Subject: [PATCH] sbin/update-ca-certificates: add a --sysroot option + +This allows using the script in cross-compilation environments +where the script needs to prefix the sysroot to every other +directory it operates on. There are individual options +to set those directories, but using a common prefix option +instead is a lot less clutter and more robust. + +Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/13] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + sbin/update-ca-certificates | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates +index 4bb77a0..1e737b9 100755 +--- a/sbin/update-ca-certificates ++++ b/sbin/update-ca-certificates +@@ -59,6 +59,14 @@ do + --hooksdir) + shift + HOOKSDIR="$1";; ++ --sysroot) ++ shift ++ SYSROOT="$1" ++ CERTSCONF="$1/${CERTSCONF}" ++ CERTSDIR="$1/${CERTSDIR}" ++ LOCALCERTSDIR="$1/${LOCALCERTSDIR}" ++ ETCCERTSDIR="$1/${ETCCERTSDIR}" ++ HOOKSDIR="$1/${HOOKSDIR}";; + --help|-h|*) + echo "$0: [--verbose] [--fresh]" + exit;;
meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch +9 -9
@@ -1,4 +1,4 @@ -From 38d47c53749c6f16d5d7993410b256116e0ee0b8 Mon Sep 17 00:00:00 2001 +From a69933f96a8675369de702bdb55e57dc21f65e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> Date: Wed, 28 Mar 2018 16:45:05 +0100 Subject: [PATCH] update-ca-certificates: use relative symlinks from
@@ -45,26 +45,26 @@ Signed-off-by: André Draszik <[email protected]> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index f7d0dbf..97a589c 100755 +index 1e737b9..8510082 100755 --- a/sbin/update-ca-certificates +++ b/sbin/update-ca-certificates -@@ -29,6 +29,7 @@ CERTSDIR=$SYSROOT/usr/share/ca-certificates - LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates +@@ -30,6 +30,7 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates CERTBUNDLE=ca-certificates.crt - ETCCERTSDIR=$SYSROOT/etc/ssl/certs + ETCCERTSDIR=/etc/ssl/certs + HOOKSDIR=/etc/ca-certificates/update.d +FSROOT=../../../ # to get from $ETCCERTSDIR to the root of the file system - HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d while [ $# -gt 0 ]; -@@ -125,9 +126,10 @@ add() { + do +@@ -100,9 +101,10 @@ add() { PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ -e 's/[()]/=/g' \ -e 's/,/_/g').pem" -- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ] +- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] + DST="$(echo ${CERT} | sed -e "s|^$SYSROOT||" -e "s|^/|$FSROOT|" )" + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${DST}" ] then -- ln -sf "${CERT##$SYSROOT}" "$PEM" +- ln -sf "$CERT" "$PEM" + ln -sf "${DST}" "$PEM" echo "+$PEM" >> "$ADDED" fi
meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-support/ca-certificates/ca-certificates_20241223.bb +4 -5
@@ -16,9 +16,8 @@ PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" SRC_URI[sha256sum] = "dd8286d0a9dd35c756fea5f1df3fed1510fb891f376903891b003cd9b1ad7e03" SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/${BPN}_${PV}.tar.xz \ - file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ - file://default-sysroot.patch \ + file://0002-sbin-update-ca-certificates-add-a-sysroot-option.patch \ file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \ file://0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch \ "
@@ -62,7 +61,7 @@ do_install:append:class-target () { } pkg_postinst:${PN}:class-target () { - SYSROOT="$D" $D${sbindir}/update-ca-certificates + $D${sbindir}/update-ca-certificates --sysroot $D } CONFFILES:${PN} += "${sysconfdir}/ca-certificates.conf"
@@ -71,11 +70,11 @@ CONFFILES:${PN} += "${sysconfdir}/ca-certificates.conf" # we just run update-ca-certificate from do_install() for nativesdk. CONFFILES:${PN}:append:class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" do_install:append:class-nativesdk () { - SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates + ${D}${sbindir}/update-ca-certificates --sysroot ${D}${SDKPATHNATIVE} } do_install:append:class-native () { - SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates + ${D}${sbindir}/update-ca-certificates --sysroot ${D}${base_prefix} } RDEPENDS:${PN}:append:class-target = " openssl-bin openssl"
Signature · 1 line
2.39.5
PATCH 7/18 vulkan-samples: rewrite and submit reproducubility patch upstream
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
At some point the problematic define ceased to be used anywhere, and so we can simply patch it out (and remove the associated option setting from the recipe).
--- .../0001-framework-Include-stdint.h.patch | 2 +- ...an-samples-Fix-reproducibility-issue.patch | 43 ------------------- ...bal_options.cmake-removed-unused-ROO.patch | 30 +++++++++++++ .../vulkan/vulkan-samples_git.bb | 8 +--- 4 files changed, 32 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch create mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch
meta/recipes-graphics/vulkan/vulkan-samples/0001-framework-Include-stdint.h.patch +1 -1
@@ -1,4 +1,4 @@ -From 445fcfd7b9245881d769880a5942ce9faa893045 Mon Sep 17 00:00:00 2001 +From 9a187d2f54d3683636b951a10c165d949b3a1d18 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 23 Mar 2025 20:09:35 -0700 Subject: [PATCH] framework: Include stdint.h
meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-graphics/vulkan/vulkan-samples/0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch new file +30 -0
@@ -0,0 +1,30 @@ +From da4ef211810bc3b0c51ea89f02c031a170fe0cb8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 1 Apr 2025 18:53:34 +0200 +Subject: [PATCH] bldsys/cmake/global_options.cmake: removed unused + ROOT_PATH_SIZE define + +After various refactorings it is no longer used anywhere (and +is problematic for build reproducibility, as build path sizes can +differ between build hosts). + +Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Samples/pull/1325] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + bldsys/cmake/global_options.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake +index 96c7add..67a6c5e 100644 +--- a/bldsys/cmake/global_options.cmake ++++ b/bldsys/cmake/global_options.cmake +@@ -126,9 +126,6 @@ set(CMAKE_CXX_STANDARD 17) + set(CMAKE_DISABLE_SOURCE_CHANGES ON) + set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + +-string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE) +-add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE}) +- + set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_CXX_FLAGS_DEBUG}") +
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -7
@@ -6,9 +6,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ - file://0001-vulkan-samples-Fix-reproducibility-issue.patch \ file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch;patchdir=third_party/glslang \ file://0001-framework-Include-stdint.h.patch \ + file://0003-bldsys-cmake-global_options.cmake-removed-unused-ROO.patch \ " UPSTREAM_CHECK_COMMITS = "1"
@@ -25,12 +25,6 @@ inherit cmake features_check FILES:${PN} += "${datadir}" -# -# There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths -# used for logging with LOGE in the code. We need to make this match the value we use -# in the debug source remapping from CFLAGS -# -EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" # Binaries built with PCH enabled don't appear reproducible, differing results were seen # from some builds depending on the point the PCH was compiled. Disable it to be # deterministic
Signature · 1 line
2.39.5
PATCH 8/18 tcl: provide a description for shared library name fixup patch
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- ...-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch +8 -2
@@ -1,9 +1,15 @@ From 822a73a5dec13549cb20e6c7338b059ece2ea95a Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 9 Dec 2009 23:59:44 +0000 -Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function +Subject: [PATCH] tcl: add .0 to libtcl.so filename -Upstream-Status: Pending +This patch is fixing the issue after the fact; the issue +is that upstream defines the shared library filename as +libtcl.so (without version) for all platforms in unix/tcl.m4, +and I (AlexK) suspect they won't be interested in +changing that. + +Upstream-Status: Inappropriate [see above] --- unix/Makefile.in | 5 ++++- unix/tcl.m4 | 3 +++
Signature · 1 line
2.39.5
PATCH 9/18 xserver-xorg: submit 0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch upstream
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- ...6pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch +5 -2
@@ -11,8 +11,11 @@ default it for older hardware for which it has shown to be better for. Others fall through to the -modesetting default. -Upstream-Status: Pending [Debian/Fedora patch -https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d] +Patch taken from: +https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d +https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/192254841ab79e102c18fc299f18af0e27d5b517 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1887] Signed-off-by: California Sullivan <[email protected]> ---
Signature · 1 line
2.39.5
PATCH 10/18 apt: remove 0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
The recipe unconditionally disables seccomp, so the code isn't even compiled. If this needs to come back in the future please submit upstream first.
--- ...atat64-and-prlimit64-defines-on-musl.patch | 48 ------------------- meta/recipes-devtools/apt/apt_2.6.1.bb | 1 - 2 files changed, 49 deletions(-) delete mode 100644 meta/recipes-devtools/apt/apt/0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch
meta/recipes-devtools/apt/apt/0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch deleted +0 -48
@@ -1,48 +0,0 @@ -From e849b161ce1d87ab369b921438abcf5b3a03e186 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 25 Apr 2021 08:57:03 -0700 -Subject: [PATCH] Hide fstatat64 and prlimit64 defines on musl - -musl defines fstatat64 and prlimit64 as macros which confuses the -seccomp sysall rewiring since there are syscalls with same names - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - methods/aptmethod.h | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/methods/aptmethod.h b/methods/aptmethod.h -index bd50e80..3085aed 100644 ---- a/methods/aptmethod.h -+++ b/methods/aptmethod.h -@@ -121,6 +121,12 @@ protected: - if (ctx == NULL) - return _error->FatalE("HttpMethod::Configuration", "Cannot init seccomp"); - -+#ifndef __GLIBC__ -+#pragma push_macro("fstatat64") -+#pragma push_macro("prlimit64") -+#undef fstatat64 -+#undef prlimit64 -+#endif - #define ALLOW(what) \ - if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(what), 0))) \ - return _error->FatalE("HttpMethod::Configuration", "Cannot allow %s: %s", #what, strerror(-rc)); -@@ -320,9 +326,11 @@ protected: - if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, seccomp_syscall_resolve_name(custom.c_str()), 0))) - return _error->FatalE("aptMethod::Configuration", "Cannot allow %s: %s", custom.c_str(), strerror(-rc)); - } -- - #undef ALLOW -- -+#ifndef __GLIBC__ -+#pragma pop_macro("fstatat64") -+#pragma pop_macro("prlimit64") -+#endif - rc = seccomp_load(ctx); - if (rc == -EINVAL) - { --- -2.31.1 -
meta/recipes-devtools/apt/apt_2.6.1.bb +0 -1
@@ -11,7 +11,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-Fix-musl-build.patch \ file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ file://0001-cmake-Do-not-build-po-files.patch \ - file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ file://0001-aptwebserver.cc-Include-array.patch \ file://0001-Remove-using-std-binary_function.patch \ file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \
Signature · 1 line
2.39.5
PATCH 11/18 mdadm: fetch from git
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
Upstream has released a new version (4.4) but not the tarball for it.
Adjust one of the devtool selftests, as it requires that the recipe under test is using a tarball. Another selftest also needs to be tweaked to correctly clean up its modifications to that same recipe on test completion.
--- meta/lib/oeqa/selftest/cases/devtool.py | 11 +++++++---- meta/recipes-extended/mdadm/mdadm_4.3.bb | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-)
meta/lib/oeqa/selftest/cases/devtool.py +7 -4
@@ -1185,13 +1185,16 @@ class DevtoolUpdateTests(DevtoolBase): result = runCmd('echo "A new file" > devtool-new-file', cwd=tempdir) result = runCmd('git add devtool-new-file', cwd=tempdir) result = runCmd('git commit -m "Add a new file"', cwd=tempdir) - self.add_command_to_tearDown('cd %s; rm %s/*.patch; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) + cleanup_cmd = 'cd %s; rm %s/*.patch; git add %s; git checkout %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile)) + self.add_command_to_tearDown(cleanup_cmd) result = runCmd('devtool update-recipe %s' % testrecipe) result = runCmd('git add minicom', cwd=os.path.dirname(recipefile)) expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), ('A ', '.*/0001-Change-the-README.patch$'), ('A ', '.*/0002-Add-a-new-file.patch$')] self._check_repo_status(os.path.dirname(recipefile), expected_status) + result = runCmd(cleanup_cmd) + self._check_repo_status(os.path.dirname(recipefile), []) def test_devtool_update_recipe_git(self): # Check preconditions
@@ -1248,7 +1251,7 @@ class DevtoolUpdateTests(DevtoolBase): def test_devtool_update_recipe_append(self): # Check preconditions - testrecipe = 'mdadm' + testrecipe = 'minicom' bb_vars = get_bb_vars(['FILE', 'SRC_URI'], testrecipe) recipefile = bb_vars['FILE'] src_uri = bb_vars['SRC_URI']
@@ -1266,7 +1269,7 @@ class DevtoolUpdateTests(DevtoolBase): # Check git repo self._check_src_repo(tempsrcdir) # Add a commit - result = runCmd("sed 's!\\(#define VERSION\\W*\"[^\"]*\\)\"!\\1-custom\"!' -i ReadMe.c", cwd=tempsrcdir) + result = runCmd('echo "Additional line" >> README', cwd=tempsrcdir) result = runCmd('git commit -a -m "Add our custom version"', cwd=tempsrcdir) self.add_command_to_tearDown('cd %s; rm -f %s/*.patch; git checkout .' % (os.path.dirname(recipefile), testrecipe)) # Create a temporary layer and add it to bblayers.conf
@@ -1305,7 +1308,7 @@ class DevtoolUpdateTests(DevtoolBase): self.assertEqual(expectedlines2, f.readlines()) # Put commit back and check we can run it if layer isn't in bblayers.conf os.remove(bbappendfile) - result = runCmd("sed 's!\\(#define VERSION\\W*\"[^\"]*\\)\"!\\1-custom\"!' -i ReadMe.c", cwd=tempsrcdir) + result = runCmd('echo "Additional line" >> README', cwd=tempsrcdir) result = runCmd('git commit -a -m "Add our custom version"', cwd=tempsrcdir) result = runCmd('bitbake-layers remove-layer %s' % templayerdir, cwd=self.builddir) result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
meta/recipes-extended/mdadm/mdadm_4.3.bb +3 -2
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;branch=main;tag=mdadm-${PV} \ file://run-ptest \ file://mdadm-3.3.2_x32_abi_time_t.patch \ file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \
@@ -26,7 +26,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-include-libgen.h-for-basename-API.patch \ " -SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" +SRCREV = "d709d4161d1dd51a976147e8372fbd99ff8183bd" +S = "${WORKDIR}/git" inherit ptest systemd
Signature · 1 line
2.39.5
PATCH 12/18 mdadm: update 4.3 -> 4.4
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
This update has been tested with glibc/musl and gcc/clang in all four combinations.
Drop patches:
0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch 0001-fix-gcc-8-format-truncation-warning.patch 0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch mdadm-3.3.2_x32_abi_time_t.patch
(issue fixed upstream)
0001-include-libgen.h-for-basename-API.patch 0001-mdadm.h-Undefine-dprintf-before-redefining.patch (issue no longer occurs)
0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch (service file significantly rewritten, the need for the tweak should be reassessed)
debian-no-Werror.patch
(replaced with setting CWFLAGS to an empty string in the recipe; we already set correct flags via CC/CFLAGS, and upstream's only get in the way)
---
...-corosync-and-dlm-header-files-check.patch | 6 +-
.../files/0001-Makefile-install-mdcheck.patch | 6 +-
...for-implicit-fallthrough-warning-sup.patch | 44 ---------------
...-fix-gcc-8-format-truncation-warning.patch | 36 ------------
...01-include-libgen.h-for-basename-API.patch | 56 -------------------
...-y-for-use-syslog-to-recive-event-re.patch | 25 ---------
...h-Undefine-dprintf-before-redefining.patch | 39 -------------
...FILE_OFFSET_BITS-to-enable-largefile.patch | 18 +++---
...ts.h-include-for-NAME_MAX-definition.patch | 24 --------
...-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch | 10 ++--
.../mdadm/files/debian-no-Werror.patch | 29 ----------
.../files/mdadm-3.3.2_x32_abi_time_t.patch | 36 ------------
.../mdadm/files/xmalloc.patch | 32 +++++++++++
.../mdadm/{mdadm_4.3.bb => mdadm_4.4.bb} | 15 ++---
14 files changed, 56 insertions(+), 320 deletions(-)
delete mode 100644 meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
delete mode 100644 meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch
delete mode 100644 meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch
delete mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch
delete mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
delete mode 100644 meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch
delete mode 100644 meta/recipes-extended/mdadm/files/debian-no-Werror.patch
delete mode 100644 meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
create mode 100644 meta/recipes-extended/mdadm/files/xmalloc.patch
rename meta/recipes-extended/mdadm/{mdadm_4.3.bb => mdadm_4.4.bb} (84%)meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch +3 -3
@@ -1,4 +1,4 @@ -From 76856a34a4e339e4a53b09d028f89fcc520e3127 Mon Sep 17 00:00:00 2001 +From 232101e2fcc6359fb6db2bc232570e373e368c75 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" <[email protected]> Date: Tue, 9 Feb 2016 11:44:01 +0200 Subject: [PATCH] Fix the path of corosync and dlm header files check
@@ -14,10 +14,10 @@ Signed-off-by: Maxin B. John <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index cbdba49..7bfd336 100644 +index bcd092de..0a78cd22 100644 --- a/Makefile +++ b/Makefile -@@ -109,8 +109,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots +@@ -130,8 +130,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots SYSTEMD_DIR=/lib/systemd/system LIB_DIR=/usr/libexec/mdadm
meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch +3 -3
@@ -1,4 +1,4 @@ -From 0be066d57a7dd1aead5488d0a095863608f2e559 Mon Sep 17 00:00:00 2001 +From 407691e11037709af888ce2cf6bd5eac6971ac61 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 25 Jan 2022 16:25:01 +0800 Subject: [PATCH] Makefile: install mdcheck
@@ -14,10 +14,10 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 1141971..f4059e2 100644 +index 981e16fa..b28e7855 100644 --- a/Makefile +++ b/Makefile -@@ -325,6 +325,7 @@ install-systemd: systemd/[email protected] +@@ -345,6 +345,7 @@ install-systemd: systemd/[email protected] install-bin: mdadm mdmon $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch deleted +0 -44
44 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 78e5bb08971a5644a56af60d51ef35e13522e811 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <[email protected]> -Date: Fri, 14 Dec 2018 15:12:31 +0800 -Subject: [PATCH] fix gcc-8 format-truncation warning - -While compiling with `-Werror=format-truncation=', it failed -[snip] -|super0.c:236:32: error: 'snprintf' output may be truncated -before the last format character [-Werror=format-truncation=] -| snprintf(nb, sizeof(nb), "%4d", d); -| ^ -|super0.c:236:3: note: 'snprintf' output between 5 and 12 bytes -into a destination of size 11 -| snprintf(nb, sizeof(nb), "%4d", d); -[snip] - -Upstream-Status: Submitted [https://github.com/neilbrown/mdadm/pull/34] - -Signed-off-by: Hongxu Jia <[email protected]> ---- - super0.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/super0.c b/super0.c -index a7c5f81..a79b6bd 100644 ---- a/super0.c -+++ b/super0.c -@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost) - d++) { - mdp_disk_t *dp; - char *dv; -- char nb[11]; -+ char nb[12]; - int wonly, failfast; - if (d>=0) dp = &sb->disks[d]; - else dp = &sb->this_disk;
meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch deleted +0 -56
56 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From c27e128fdc062ec3fcdf7b48a8c5078615c538df Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Mon, 1 Jul 2019 11:34:49 +0800 -Subject: [PATCH] mdadm: add option -y for use syslog to recive event report - -fix service startup failed when there is -No mail address or alert command - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Changqing Li <[email protected]> ---- - systemd/mdmonitor.service | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service -index 9c36478..d289846 100644 ---- a/systemd/mdmonitor.service -+++ b/systemd/mdmonitor.service -@@ -14,4 +14,4 @@ Documentation=man:mdadm(8) - Environment= MDADM_MONITOR_ARGS=--scan - EnvironmentFile=-/run/sysconfig/mdadm - ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh --ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS -+ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS
meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 4dd5c2659722b44409cee28b4cea68cdeaa1f987 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 9 May 2016 22:03:57 +0000 -Subject: [PATCH] mdadm.h: Undefine dprintf before redefining - -dprintf is also defined in libc see -usr/include/bits/stdio2.h, this comes into -play especially when fortify sources is enabled -and compilers like clang reports the override - -In file included from policy.c:25: -./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined] - ^ -/mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending ---- - mdadm.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mdadm.h b/mdadm.h -index 1f28b3e..04996e2 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -1869,11 +1869,13 @@ static inline sighandler_t signal_s(int sig, sighandler_t handler) - } - - #ifdef DEBUG -+#undef dprintf - #define dprintf(fmt, arg...) \ - fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg) - #define dprintf_cont(fmt, arg...) \ - fprintf(stderr, fmt, ##arg) - #else -+#undef dprintf - #define dprintf(fmt, arg...) \ - ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) - #define dprintf_cont(fmt, arg...) \
meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch +9 -9
@@ -1,4 +1,4 @@ -From aa86de05cd6a75222b38e0789ac96fe00f705430 Mon Sep 17 00:00:00 2001 +From 9e3b15adf86147fe581cd2159cb99708abe26158 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 10 Nov 2022 12:31:22 -0800 Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <[email protected]> 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/raid6check.c b/raid6check.c -index 9947776..8e7f142 100644 +index 99477761..8e7f1421 100644 --- a/raid6check.c +++ b/raid6check.c @@ -22,6 +22,9 @@
@@ -60,7 +60,7 @@ index 9947776..8e7f142 100644 if (seek_res < 0) { fprintf(stderr, "lseek to source %d failed\n", i); diff --git a/restripe.c b/restripe.c -index a7a7229..1c03577 100644 +index 5e126eb7..af76c634 100644 --- a/restripe.c +++ b/restripe.c @@ -22,6 +22,9 @@
@@ -71,9 +71,9 @@ index a7a7229..1c03577 100644 +#define _FILE_OFFSET_BITS 64 + #include "mdadm.h" - #include <stdint.h> + #include "xmalloc.h" -@@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned long long *offsets, +@@ -583,7 +586,7 @@ int save_stripes(int *source, unsigned long long *offsets, raid_disks, level, layout); if (dnum < 0) abort(); if (source[dnum] < 0 ||
@@ -82,7 +82,7 @@ index a7a7229..1c03577 100644 offsets[dnum] + offset, 0) < 0 || read(source[dnum], buf+disk * chunk_size, chunk_size) != chunk_size) { -@@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned long long *offsets, +@@ -756,8 +759,8 @@ int restore_stripes(int *dest, unsigned long long *offsets, raid_disks, level, layout); if (src_buf == NULL) { /* read from file */
@@ -93,7 +93,7 @@ index a7a7229..1c03577 100644 rv = -1; goto abort; } -@@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned long long *offsets, +@@ -818,7 +821,7 @@ int restore_stripes(int *dest, unsigned long long *offsets, } for (i=0; i < raid_disks ; i++) if (dest[i] >= 0) {
@@ -102,7 +102,7 @@ index a7a7229..1c03577 100644 offsets[i]+offset, 0) < 0) { rv = -1; goto abort; -@@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned long long *offsets, +@@ -868,7 +871,7 @@ int test_stripes(int *source, unsigned long long *offsets, int disk; for (i = 0 ; i < raid_disks ; i++) {
@@ -112,7 +112,7 @@ index a7a7229..1c03577 100644 chunk_size)) { free(q); diff --git a/swap_super.c b/swap_super.c -index b6db574..18c89e2 100644 +index b6db5743..18c89e2b 100644 --- a/swap_super.c +++ b/swap_super.c @@ -1,3 +1,6 @@
meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch deleted +0 -24
@@ -1,24 +0,0 @@ -From 8fa7d3cb96e8833743b635fb198675ad6c020b6e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 12 Mar 2024 10:51:51 +0100 -Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition - -Upstream-Status: Submitted [[email protected],[email protected]] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index b145447..a9cb6c4 100644 ---- a/util.c -+++ b/util.c -@@ -36,7 +36,7 @@ - #include <ctype.h> - #include <dirent.h> - #include <dlfcn.h> -- -+#include <limits.h> - - /* - * following taken from linux/blkpg.h because they aren't
meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch +5 -5
@@ -1,4 +1,4 @@ -From a22b2345b9773d362acd85dd4c4a6a3cda9100d4 Mon Sep 17 00:00:00 2001 +From 8de073c637a1ea968b7304f373a20b13a4a47bbc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 12 Mar 2024 10:54:08 +0100 Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE
@@ -14,14 +14,14 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+) diff --git a/Create.c b/Create.c -index 8082f54..7071f0a 100644 +index fd6c9215..3210a03e 100644 --- a/Create.c +++ b/Create.c -@@ -31,6 +31,7 @@ +@@ -33,6 +33,7 @@ #include <signal.h> #include <sys/signalfd.h> #include <sys/wait.h> +#include <linux/falloc.h> - static int round_size_and_verify(unsigned long long *size, int chunk) - { + #ifndef FALLOC_FL_ZERO_RANGE + #define FALLOC_FL_ZERO_RANGE 16
meta/recipes-extended/mdadm/files/debian-no-Werror.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 319b3191f088cea7b0fb6038ab7625d5e049dcf7 Mon Sep 17 00:00:00 2001 -From: "martin f. krafft" <[email protected]> -Date: Mon, 3 Jan 2022 19:14:12 +0000 -Subject: [PATCH] Remove -Werror from compiler flags - --Werror seems like a bad idea on released/packaged code because a toolchain -update (introducing new warnings) could break the build. We'll let upstream -use it to beautify the code, but remove it for out builds. - -Signed-off-by: martin f. krafft <[email protected]> - -Upstream-Status: Pending ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9ab6a65..1141971 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) - CC := $(CROSS_COMPILE)gcc - endif - CXFLAGS ?= -ggdb --CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds -+CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds - ifdef WARN_UNUSED - CWFLAGS += -Wp -O3 - endif
meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From ca91d9fc07943f209988411f2596e4b69828f208 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]> -Date: Sun, 15 Mar 2015 09:02:14 +0000 -Subject: [PATCH] mdadm: Fix build in x32 ABI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When try to print time_t values as a long int it causes an error because time_t -data type in x32 ABI is long long int. - -Upstream-Status: Pending - -Signed-off-by: Aníbal Limón <[email protected]> ---- - monitor.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/monitor.c b/monitor.c -index 4acec67..8dcdfd6 100644 ---- a/monitor.c -+++ b/monitor.c -@@ -447,9 +447,12 @@ static int read_and_act(struct active_array *a, fd_set *fds) - if (FD_ISSET(mdi->bb_fd, fds)) - check_for_cleared_bb(a, mdi); - } -- - gettimeofday(&tv, NULL); -+#if defined(__x86_64__) && defined(__ILP32__) -+ dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n", -+#else - dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n", -+#endif - a->info.container_member, - tv.tv_sec, tv.tv_usec, - array_states[a->curr_state],
meta/recipes-extended/mdadm/files/xmalloc.patch new file +32 -0
@@ -0,0 +1,32 @@ +From c5cf5a83be4e3ce04ebf3250f77aeb465eeb53a1 Mon Sep 17 00:00:00 2001 +From: Xiao Ni <[email protected]> +Date: Fri, 17 Jan 2025 15:15:40 +0800 +Subject: [PATCH] mdadm/raid6check: add xmalloc.h to raid6check.c + +It reports building error: +raid6check.c:324:26: error: implicit declaration of function xmalloc + +Add xmalloc.h to raid6check.c file to fix this. + +Signed-off-by: Xiao Ni <[email protected]> +Link: https://lore.kernel.org/r/[email protected] +Signed-off-by: Song Liu <[email protected]> + +Upstream-Status: Backport [https://web.git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?h=main&id=e0df6c4c984d564e9e40913727e916a6cd8f466e] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + raid6check.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/raid6check.c b/raid6check.c +index 8e7f1421..486b10c6 100644 +--- a/raid6check.c ++++ b/raid6check.c +@@ -26,6 +26,7 @@ + #define _FILE_OFFSET_BITS 64 + + #include "mdadm.h" ++#include "xmalloc.h" + #include <stdint.h> + #include <sys/mman.h> +
meta/recipes-extended/mdadm/mdadm_4.4.bb renamed from meta/recipes-extended/mdadm/mdadm_4.3.bb +4 -11
@@ -11,22 +11,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;branch=main;tag=mdadm-${PV} \ file://run-ptest \ - file://mdadm-3.3.2_x32_abi_time_t.patch \ - file://0001-mdadm.h-Undefine-dprintf-before-redefining.patch \ file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ - file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ - file://0001-fix-gcc-8-format-truncation-warning.patch \ - file://debian-no-Werror.patch \ file://mdadm.init \ - file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ file://0001-Makefile-install-mdcheck.patch \ file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ - file://0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch \ - file://0001-include-libgen.h-for-basename-API.patch \ + file://xmalloc.patch \ " -SRCREV = "d709d4161d1dd51a976147e8372fbd99ff8183bd" +SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a" S = "${WORKDIR}/git" inherit ptest systemd
@@ -44,7 +37,7 @@ CFLAGS:append:powerpc64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ +EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CWFLAGS="" CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ SYSROOT="${STAGING_DIR_TARGET}" STRIP='
@@ -53,7 +46,7 @@ DEBUG_OPTIMIZATION:append = " -Wno-error" do_install() { oe_runmake 'DESTDIR=${D}' install install-systemd install -d ${D}/${sysconfdir}/ - install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf + install -m 644 ${S}/documentation/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor }
Signature · 1 line
2.39.5
PATCH 13/18 ifupdown: mark defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch as Inappropriate
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- .../defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch +1 -1
@@ -12,7 +12,7 @@ arch specific methods, and the end result will be strangeness like the loopback device not being configured/enabled. Signed-off-by: Paul Gortmaker <[email protected]> -Upstream-Status: Pending +Upstream-Status: Inappropriate [avoiding debian-isms] --- defn2c.pl | 6 +++--- defn2man.pl | 6 +++---
Signature · 1 line
2.39.5
PATCH 14/18 gst-devtools: submit 0001-connect-has-a-different-signature-on-musl.patch upstream
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- .../0001-connect-has-a-different-signature-on-musl.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +1 -1
@@ -8,7 +8,7 @@ API has a different signature, this patch fixes this so it can compile on musl, the functionality should remain same as it is immediately typcasted to struct sockaddr_in* type inside the function before use -Upstream-Status: Pending +Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8767] Signed-off-by: Khem Raj <[email protected]> ---
Signature · 1 line
2.39.5
PATCH 15/18 vim: mark no-path-adjust.patch as Inappropriate
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-support/vim/files/no-path-adjust.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/vim/files/no-path-adjust.patch +1 -1
@@ -6,7 +6,7 @@ Subject: [PATCH] vim: do not adjust script pathnames When cross-compiling, we do not want to reference the host versions of things like perl and awk. -Upstream-Status: Pending +Upstream-Status: Inappropriate [specific to cross compilation and sysroots] Signed-off-by: Joe Slater <[email protected]> Signed-off-by: Mingli Yu <[email protected]>
Signature · 1 line
2.39.5
PATCH 16/18 avahi: mark initscript.patch as Inappropriate
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-connectivity/avahi/files/initscript.patch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-connectivity/avahi/files/initscript.patch +5 -1
@@ -1,4 +1,8 @@ -Upstream-Status: Pending +Note: upcoming avahi 0.9 drops debian initscripts altogether, +so any version update would probably have to copy the last +upstream versions into oe-core, and install them from the recipe. + +Upstream-Status: Inappropriate [upstream removed the files] Index: avahi-0.7/initscript/debian/avahi-daemon.in ===================================================================
Signature · 1 line
2.39.5
PATCH 17/18 apr: drop libtoolize_check.patch
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
It's not clear what the intent was: libtool executable is present in the native sysroot and can be used to obtain versions during build time.
--- .../apr/apr/libtoolize_check.patch | 37 ------------------- meta/recipes-support/apr/apr_1.7.5.bb | 1 - 2 files changed, 38 deletions(-) delete mode 100644 meta/recipes-support/apr/apr/libtoolize_check.patch
meta/recipes-support/apr/apr/libtoolize_check.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 -From: Helmut Grohne <[email protected]> -Date: Tue, 7 Feb 2023 07:04:00 +0000 -Subject: [PATCH] check for libtoolize rather than libtool - -libtool is now in package libtool-bin, but apr only needs libtoolize. - -Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] - -Signed-off-by: Robert Yang <[email protected]> - ---- - build/buildcheck.sh | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/build/buildcheck.sh b/build/buildcheck.sh -index 44921b5..08bc8a8 100755 ---- a/build/buildcheck.sh -+++ b/build/buildcheck.sh -@@ -39,13 +39,11 @@ fi - # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a - # output is multiline from 1.5 onwards - --# Require libtool 1.4 or newer --if test -z "$libtool"; then -- libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` --fi --lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -+# Require libtoolize 1.4 or newer -+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` -+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then -- echo "buildconf: libtool not found." -+ echo "buildconf: libtoolize not found." - echo " You need libtool version 1.4 or newer installed" - echo " to build APR from SVN." - res=1
meta/recipes-support/apr/apr_1.7.5.bb +0 -1
@@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ file://0004-Fix-packet-discards-HTTP-redirect.patch \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ file://autoconf-2.73.patch \
Signature · 1 line
2.39.5
PATCH 18/18 numactl: mark Fix-the-test-output-format.patch as Inappropriate
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- .../numactl/numactl/Fix-the-test-output-format.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +1 -1
@@ -3,7 +3,7 @@ From: Li xin <[email protected]> Date: Tue, 21 Jul 2015 02:01:22 +0900 Subject: [PATCH] Fix the test output format -Upstream-Status: Pending +Upstream-Status: Inappropriate [needs a Makefile fix: regress/regress2 should be part of 'make check' rather than 'make test'] Signed-off-by: Roy Li <[email protected]> Signed-off-by: Li Xin <[email protected]>
Signature · 1 line
2.39.5