Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Monday, November 25
Passed a-full on autobuilder:
https://valkyrie.yoctoproject.org/#/builders/29/builds/497
The following changes since commit c9d5a6c480c377399a7dc998f3755e42072e19a6:
libxml-parser-perl: fix do_fetch error (2024-11-13 06:15:28 -0800)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Alexander Kanavin (2):
package_rpm: use zstd's default compression level
package_rpm: restrict rpm to 4 threads
Bin Lan (1):
lttng-ust: backport patch to fix cmake-multiple-shared-libraries build
error
Changqing Li (1):
sysvinit: backport patch for fixing one issue of pidof
Chen Qi (1):
toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails
Clayton Casciato (1):
uboot-sign: fix concat_dtb arguments
Deepthi Hemraj (1):
binutils: stable 2.42 branch update
Guðni Már Gilbert (2):
shared-mime-info: drop itstool-native from DEPENDS
libpam: drop cracklib from DEPENDS
Hitendra Prajapati (2):
libsoup: fix CVE-2024-52532
ghostscript: upgrade 10.03.1 -> 10.04.0
Jagadeesh Krishnanjanappa (1):
tune-cortexa32: set tune feature as armv8a
Jinfeng Wang (1):
tzdata&tzcode-native: upgrade 2024a -> 2024b
Pavel Zhukov (1):
package_rpm: Check if file exists before open()
Randy MacLeod (1):
systemd: stable update 255.4 -> 255.13
Regis Dargent (1):
udev-extraconf: fix network.sh script did not configure hotplugged
interfaces
Richard Purdie (3):
oeqa/runtime/ssh: Rework ssh timeout
oeqa/runtime/ssh: Fix incorrect timeout fix
qemurunner: Clean up serial_lock handling
Robert Yang (1):
cml1.bbclass: do_diffconfig: Don't override .config with .config.orig
Ross Burton (3):
strace: download release tarballs from GitHub
tcl: skip io-13.6 test case
groff: fix rare build race in hdtbl
Steve Sakoman (2):
webkitgtk: fix erroneous use of unsuported DEBUG_LEVELFLAG variable
llvm: reduce size of -dbg package
Vijay Anusuri (1):
glib-2.0: Backport fix for CVE-2024-52533
Wang Mingyu (1):
wireless-regdb: upgrade 2024.07.04 -> 2024.10.07
meta/classes-global/package_rpm.bbclass | 19 ++-
meta/classes-recipe/cml1.bbclass | 3 +-
meta/classes-recipe/uboot-sign.bbclass | 2 +-
.../include/arm/armv8a/tune-cortexa32.inc | 2 +-
meta/files/toolchain-shar-extract.sh | 4 +
meta/lib/oeqa/runtime/cases/ssh.py | 4 +-
meta/lib/oeqa/utils/qemurunner.py | 11 +-
.../glib-2.0/glib-2.0/CVE-2024-52533.patch | 49 ++++++
.../glib-2.0/gdatetime-test-fail-0001.patch | 72 ++++++++
.../glib-2.0/gdatetime-test-fail-0002.patch | 65 +++++++
.../glib-2.0/gdatetime-test-fail-0003.patch | 63 +++++++
meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb | 4 +
...255.4.bb => systemd-boot-native_255.13.bb} | 0
...d-boot_255.4.bb => systemd-boot_255.13.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
...1-missing_type.h-add-comparison_fn_t.patch | 7 +-
...k-parse_printf_format-implementation.patch | 13 +-
...tall-dependency-links-at-install-tim.patch | 9 +-
...missing.h-check-for-missing-strndupa.patch | 65 ++++---
...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 14 +-
...005-add-missing-FTW_-macros-for-musl.patch | 7 +-
...06-Use-uintmax_t-for-handling-rlim_t.patch | 11 +-
...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 17 +-
...patible-basename-for-non-glibc-syste.patch | 8 +-
...implment-systemd-sysv-install-for-OE.patch | 5 +-
...uffering-when-writing-to-oom_score_a.patch | 9 +-
...compliant-strerror_r-from-GNU-specif.patch | 13 +-
...definition-of-prctl_mm_map-structure.patch | 7 +-
...-not-disable-buffer-in-writing-files.patch | 59 +++----
.../0013-Handle-__cpu_mask-usage.patch | 7 +-
.../systemd/0014-Handle-missing-gshadow.patch | 9 +-
...l.h-Define-MIPS-ABI-defines-for-musl.patch | 13 +-
...ass-correct-parameters-to-getdents64.patch | 7 +-
.../0017-Adjust-for-musl-headers.patch | 17 +-
...trerror-is-assumed-to-be-GNU-specifi.patch | 9 +-
...util-Make-STRERROR-portable-for-musl.patch | 7 +-
...ake-malloc_trim-conditional-on-glibc.patch | 9 +-
...hared-Do-not-use-malloc_info-on-musl.patch | 7 +-
...22-avoid-missing-LOCK_EX-declaration.patch | 11 +-
.../{systemd_255.4.bb => systemd_255.13.bb} | 0
...rom-Mark-Hindley-which-avoids-cleari.patch | 31 ++++
meta/recipes-core/sysvinit/sysvinit_3.04.bb | 1 +
.../udev/udev-extraconf/network.sh | 32 ----
.../binutils/binutils-2.42.inc | 2 +-
meta/recipes-devtools/llvm/llvm_18.1.6.bb | 2 +
meta/recipes-devtools/strace/strace_6.7.bb | 4 +-
meta/recipes-devtools/tcltk/tcl/run-ptest | 2 +
.../avoid-host-contamination.patch | 6 +-
...ript_10.03.1.bb => ghostscript_10.04.0.bb} | 2 +-
...l-Fix-Savannah-66316-missing-grn-dep.patch | 38 +++++
meta/recipes-extended/groff/groff_1.23.0.bb | 1 +
meta/recipes-extended/pam/libpam_1.5.3.bb | 2 +-
meta/recipes-extended/timezone/timezone.inc | 6 +-
...es-when-rpath-is-stripped-from-in-bu.patch | 161 ++++++++++++++++++
.../0001-Makefile.am-update-rpath-link.patch | 33 ----
meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb | 2 +-
....07.04.bb => wireless-regdb_2024.10.07.bb} | 2 +-
meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 2 +-
.../libsoup-3.4.4/CVE-2024-52532-0001.patch | 42 +++++
.../libsoup-3.4.4/CVE-2024-52532-0002.patch | 36 ++++
meta/recipes-support/libsoup/libsoup_3.4.4.bb | 5 +-
.../shared-mime-info/shared-mime-info_2.4.bb | 2 +-
62 files changed, 749 insertions(+), 305 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2024-52533.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0001.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0002.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0003.patch
rename meta/recipes-core/systemd/{systemd-boot-native_255.4.bb => systemd-boot-native_255.13.bb} (100%)
rename meta/recipes-core/systemd/{systemd-boot_255.4.bb => systemd-boot_255.13.bb} (100%)
rename meta/recipes-core/systemd/{systemd_255.4.bb => systemd_255.13.bb} (100%)
create mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch
rename meta/recipes-extended/ghostscript/{ghostscript_10.03.1.bb => ghostscript_10.04.0.bb} (97%)
create mode 100644 meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} (94%)
create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0001.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0002.patchSignature · 1 line
2.34.1
PATCH 1/27 libsoup: fix CVE-2024-52532
From: Hitendra Prajapati <[email protected]>
Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be && https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c
--- .../libsoup-3.4.4/CVE-2024-52532-0001.patch | 42 +++++++++++++++++++ .../libsoup-3.4.4/CVE-2024-52532-0002.patch | 36 ++++++++++++++++ meta/recipes-support/libsoup/libsoup_3.4.4.bb | 5 ++- 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0001.patch create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0002.patch
meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0001.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 29b96fab2512666d7241e46c98cc45b60b795c0c Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <[email protected]> +Date: Wed, 2 Oct 2024 11:17:19 +0200 +Subject: [PATCH] websocket-test: disconnect error copy after the test ends + +Otherwise the server will have already sent a few more wrong +bytes and the client will continue getting errors to copy +but the error is already != NULL and it will assert. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c] +CVE: CVE-2024-52532 +Signed-off-by: Hitendra Prajapati <[email protected]> +--- + tests/websocket-test.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/websocket-test.c b/tests/websocket-test.c +index b954b01..9b37780 100644 +--- a/tests/websocket-test.c ++++ b/tests/websocket-test.c +@@ -1489,8 +1489,9 @@ test_receive_invalid_encode_length_64 (Test *test, + GError *error = NULL; + InvalidEncodeLengthTest context = { test, NULL }; + guint i; ++ guint error_id; + +- g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); ++ error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error); + g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received); + + /* We use 127(\x7f) as payload length with 65535 extended length */ +@@ -1503,6 +1504,7 @@ test_receive_invalid_encode_length_64 (Test *test, + WAIT_UNTIL (error != NULL || received != NULL); + g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR); + g_clear_error (&error); ++ g_signal_handler_disconnect (test->client, error_id); + g_assert_null (received); + + g_thread_join (thread); +-- +2.25.1 +
meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0002.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <[email protected]> +Date: Wed, 11 Sep 2024 11:52:11 +0200 +Subject: [PATCH] websocket: process the frame as soon as we read data + +Otherwise we can enter in a read loop because we were not +validating the data until the all the data was read. + +Fixes #391 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be] +CVE: CVE-2024-52532 +Signed-off-by: Hitendra Prajapati <[email protected]> +--- + libsoup/websocket/soup-websocket-connection.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libsoup/websocket/soup-websocket-connection.c b/libsoup/websocket/soup-websocket-connection.c +index 2f7d920..df8f67d 100644 +--- a/libsoup/websocket/soup-websocket-connection.c ++++ b/libsoup/websocket/soup-websocket-connection.c +@@ -1165,9 +1165,9 @@ soup_websocket_connection_read (SoupWebsocketConnection *self) + } + + priv->incoming->len = len + count; +- } while (count > 0); + +- process_incoming (self); ++ process_incoming (self); ++ } while (count > 0 && !priv->close_sent && !priv->io_closing); + + if (end) { + if (!priv->close_sent || !priv->close_received) { +-- +2.25.1 +
meta/recipes-support/libsoup/libsoup_3.4.4.bb +4 -1
@@ -11,7 +11,10 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ + file://CVE-2024-52532-0001.patch \ + file://CVE-2024-52532-0002.patch \ + " SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa" PROVIDES = "libsoup-3.0"
Signature · 1 line
2.34.1
PATCH 2/27 glib-2.0: Backport fix for CVE-2024-52533
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/glib/-/commit/ec0b708b981af77fef8e4bbb603cde4de4cd2e29
Reference: https://security-tracker.debian.org/tracker/CVE-2024-52533
--- .../glib-2.0/glib-2.0/CVE-2024-52533.patch | 49 +++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2024-52533.patch
meta/recipes-core/glib-2.0/glib-2.0/CVE-2024-52533.patch new file +49 -0
@@ -0,0 +1,49 @@ +From ec0b708b981af77fef8e4bbb603cde4de4cd2e29 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <[email protected]> +Date: Thu, 19 Sep 2024 18:35:53 +0100 +Subject: [PATCH] gsocks4aproxy: Fix a single byte buffer overflow in connect + messages + +`SOCKS4_CONN_MSG_LEN` failed to account for the length of the final nul +byte in the connect message, which is an addition in SOCKSv4a vs +SOCKSv4. + +This means that the buffer for building and transmitting the connect +message could be overflowed if the username and hostname are both +`SOCKS4_MAX_LEN` (255) bytes long. + +Proxy configurations are normally statically configured, so the username +is very unlikely to be near its maximum length, and hence this overflow +is unlikely to be triggered in practice. + +(Commit message by Philip Withnall, diagnosis and fix by Michael +Catanzaro.) + +Fixes: #3461 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/ec0b708b981af77fef8e4bbb603cde4de4cd2e29] +CVE: CVE-2024-52533 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + gio/gsocks4aproxy.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gio/gsocks4aproxy.c b/gio/gsocks4aproxy.c +index 3dad118eb7..b3146d08fd 100644 +--- a/gio/gsocks4aproxy.c ++++ b/gio/gsocks4aproxy.c +@@ -79,9 +79,9 @@ g_socks4a_proxy_init (GSocks4aProxy *proxy) + * +----+----+----+----+----+----+----+----+----+----+....+----+------+....+------+ + * | VN | CD | DSTPORT | DSTIP | USERID |NULL| HOST | | NULL | + * +----+----+----+----+----+----+----+----+----+----+....+----+------+....+------+ +- * 1 1 2 4 variable 1 variable ++ * 1 1 2 4 variable 1 variable 1 + */ +-#define SOCKS4_CONN_MSG_LEN (9 + SOCKS4_MAX_LEN * 2) ++#define SOCKS4_CONN_MSG_LEN (10 + SOCKS4_MAX_LEN * 2) + static gint + set_connect_msg (guint8 *msg, + const gchar *hostname, +-- +GitLab +
meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ file://memory-monitor.patch \ file://skip-timeout.patch \ + file://CVE-2024-52533.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
Signature · 1 line
2.34.1
PATCH 3/27 ghostscript: upgrade 10.03.1 -> 10.04.0
In reply to Steve SakomanFrom: Hitendra Prajapati <[email protected]>
avoid-host-contamination.patch
refreshed for 10.04.0
Changelog:
===========
- addresses CVEs: CVE-2024-46951, CVE-2024-46952, CVE-2024-46953, CVE-2024-46954, CVE-2024-46955, CVE-2024-46956
- add protection for device selection from PostScript input.
- efforts in code hygiene and maintainability continue.
- The usual round of bug fixes, compatibility changes, and incremental improvements.
- add the capability to build with the Tesseract OCR engine.
---
.../ghostscript/ghostscript/avoid-host-contamination.patch | 6 +++---
.../{ghostscript_10.03.1.bb => ghostscript_10.04.0.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-extended/ghostscript/{ghostscript_10.03.1.bb => ghostscript_10.04.0.bb} (97%)meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +3 -3
@@ -1,4 +1,4 @@ -From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001 +From 095bb1db8b2e68cac40e985f347a7039573e1e80 Mon Sep 17 00:00:00 2001 From: Kai Kang <[email protected]> Date: Thu, 29 Mar 2018 16:02:05 +0800 Subject: [PATCH] avoid host contamination
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/devs.mak b/devices/devs.mak -index 186f704..88ab8c9 100644 +index a5dbc7a..27b55f2 100644 --- a/devices/devs.mak +++ b/devices/devs.mak -@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ +@@ -403,7 +403,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
meta/recipes-extended/ghostscript/ghostscript_10.04.0.bb renamed from meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb +1 -1
@@ -27,7 +27,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo file://avoid-host-contamination.patch \ " -SRC_URI[sha256sum] = "31cd01682ad23a801cc3bbc222a55f07c4ea3e068bdfb447792d54db21a2e8ad" +SRC_URI[sha256sum] = "c764dfbb7b13fc71a7a05c634e014f9bb1fb83b899fe39efc0b6c3522a9998b1" PACKAGECONFIG ??= "" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
Signature · 1 line
2.34.1
PATCH 4/27 systemd: stable update 255.4 -> 255.13
In reply to Steve SakomanFrom: Randy MacLeod <[email protected]>
Full change log:
https://github.com/systemd/systemd-stable/compare/v255.4...v255.13
Refreshed most of the musl patches using devtool to eliminate patch fuzz.
---
...255.4.bb => systemd-boot-native_255.13.bb} | 0
...d-boot_255.4.bb => systemd-boot_255.13.bb} | 0
meta/recipes-core/systemd/systemd.inc | 2 +-
...1-missing_type.h-add-comparison_fn_t.patch | 7 +-
...k-parse_printf_format-implementation.patch | 13 ++--
...tall-dependency-links-at-install-tim.patch | 9 +--
...missing.h-check-for-missing-strndupa.patch | 65 +++++++++----------
...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 14 ++--
...005-add-missing-FTW_-macros-for-musl.patch | 7 +-
...06-Use-uintmax_t-for-handling-rlim_t.patch | 11 ++--
...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 17 ++---
...patible-basename-for-non-glibc-syste.patch | 8 +--
...implment-systemd-sysv-install-for-OE.patch | 5 +-
...uffering-when-writing-to-oom_score_a.patch | 9 +--
...compliant-strerror_r-from-GNU-specif.patch | 13 ++--
...definition-of-prctl_mm_map-structure.patch | 7 +-
...-not-disable-buffer-in-writing-files.patch | 59 ++++++++---------
.../0013-Handle-__cpu_mask-usage.patch | 7 +-
.../systemd/0014-Handle-missing-gshadow.patch | 9 +--
...l.h-Define-MIPS-ABI-defines-for-musl.patch | 13 ++--
...ass-correct-parameters-to-getdents64.patch | 7 +-
.../0017-Adjust-for-musl-headers.patch | 17 ++---
...trerror-is-assumed-to-be-GNU-specifi.patch | 9 +--
...util-Make-STRERROR-portable-for-musl.patch | 7 +-
...ake-malloc_trim-conditional-on-glibc.patch | 9 +--
...hared-Do-not-use-malloc_info-on-musl.patch | 7 +-
...22-avoid-missing-LOCK_EX-declaration.patch | 11 ++--
.../{systemd_255.4.bb => systemd_255.13.bb} | 0
28 files changed, 134 insertions(+), 208 deletions(-)
rename meta/recipes-core/systemd/{systemd-boot-native_255.4.bb => systemd-boot-native_255.13.bb} (100%)
rename meta/recipes-core/systemd/{systemd-boot_255.4.bb => systemd-boot_255.13.bb} (100%)
rename meta/recipes-core/systemd/{systemd_255.4.bb => systemd_255.13.bb} (100%)meta/recipes-core/systemd/systemd-boot-native_255.13.bb renamed from meta/recipes-core/systemd/systemd-boot-native_255.4.bb +0 -0
meta/recipes-core/systemd/systemd-boot_255.13.bb renamed from meta/recipes-core/systemd/systemd-boot_255.4.bb +0 -0
meta/recipes-core/systemd/systemd.inc +1 -1
@@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" +SRCREV = "565916c245b53b49f5917f5326d21246f46ae3db" SRCBRANCH = "v255-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}"
meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +2 -5
@@ -1,7 +1,7 @@ -From 01195eb9f7d59139fb45df506ac6b3968c14a57f Mon Sep 17 00:00:00 2001 +From af2784935b483bd0eb5705ef7072a5cea6fe9eef Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 01/22] missing_type.h: add comparison_fn_t +Subject: [PATCH] missing_type.h: add comparison_fn_t Make it work with musl where comparison_fn_t and is not provided.
@@ -56,6 +56,3 @@ index ae91534198..7f67eea38b 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.34.1 -
meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +5 -8
@@ -1,7 +1,7 @@ -From 872b72739e62123867ce6c4f82aa37de24cc3f75 Mon Sep 17 00:00:00 2001 +From b9b4f9bbca46832ea152979d8c9459f29c2e83fa Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH 02/22] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific]
@@ -22,10 +22,10 @@ Signed-off-by: Scott Murray <[email protected]> create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 7419e2b0b0..01fd3ffc19 100644 +index 2418d6e8f7..b544a69aaa 100644 --- a/meson.build +++ b/meson.build -@@ -725,6 +725,7 @@ endif +@@ -731,6 +731,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h',
@@ -34,7 +34,7 @@ index 7419e2b0b0..01fd3ffc19 100644 'threads.h', 'valgrind/memcheck.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d7450d8b44..c3e3daf4bd 100644 +index 111253e3a5..bdaa2fc5e4 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -183,6 +183,11 @@ endforeach
@@ -429,6 +429,3 @@ index be23b2fe75..69a2eb6404 100644 #define SNDBUF_SIZE (8*1024*1024) --- -2.34.1 -
meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +3 -6
@@ -1,8 +1,8 @@ -From 29a58009a172e369ad7166e16dab2f4945c6b0d2 Mon Sep 17 00:00:00 2001 +From 178b7b4adefdf1d80fa3a5eb54a49ef0fc12369f Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/2] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] binfmt: Don't install dependency links at install time for + the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service.
@@ -74,6 +74,3 @@ index 6861c76674..531e9fbd90 100644 + +[Install] +WantedBy=sysinit.target --- -2.34.1 -
meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch +31 -34
235 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +5 -9
@@ -1,8 +1,7 @@ -From 5325ab5813617f35f03806ec420829dde7104387 Mon Sep 17 00:00:00 2001 +From a15045a60893f29ce9720e62cafbc0b87908ad49 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 04/22] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined If the standard library doesn't provide brace expansion users just won't get it.
@@ -115,7 +114,7 @@ index 9b3e73cce0..3790ba3be5 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 230ec09b97..2cc5f391d7 100644 +index f4c8ebc27f..e07ad66c65 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -73,6 +73,12 @@
@@ -131,7 +130,7 @@ index 230ec09b97..2cc5f391d7 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -2434,7 +2440,9 @@ finish: +@@ -2426,7 +2432,9 @@ finish: static int glob_item(Context *c, Item *i, action_t action) { _cleanup_globfree_ glob_t g = {
@@ -141,7 +140,7 @@ index 230ec09b97..2cc5f391d7 100644 }; int r = 0, k; -@@ -2461,7 +2469,9 @@ static int glob_item_recursively( +@@ -2453,7 +2461,9 @@ static int glob_item_recursively( fdaction_t action) { _cleanup_globfree_ glob_t g = {
@@ -151,6 +150,3 @@ index 230ec09b97..2cc5f391d7 100644 }; int r = 0, k; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001 +From b2c98ef636ac7dfdf86e7a42aebc3142a5b167d2 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 05/22] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl.
@@ -39,6 +39,3 @@ index 8684d064ec..70fc2b5376 100644 static char **list_nftw = NULL; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +4 -7
@@ -1,7 +1,7 @@ -From 96e975a2412a20e5f80bd3ab144057d275eb8597 Mon Sep 17 00:00:00 2001 +From 3ea46787827fb6db631b240589d2f447b977f7d9 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 06/22] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to
@@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index bd3da0c401..df1870fd2f 100644 +index 7d27f80834..bde0f8137c 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -1045,9 +1045,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -1042,9 +1042,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
@@ -101,6 +101,3 @@ index bd3da0c401..df1870fd2f 100644 } if (c->ioprio_set) { --- -2.34.1 -
meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +7 -10
@@ -1,7 +1,7 @@ -From 4842cff4f1329f0b5034b529d56f8ad1f234ac4c Mon Sep 17 00:00:00 2001 +From 0e51be93aa8c647bf1761d684c722b92d3cfabc1 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 07/22] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See:
@@ -31,7 +31,7 @@ Signed-off-by: Andre McCurdy <[email protected]> 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 1023ab73ca..c78ff6f27f 100644 +index 6a1e2e76d1..c3f7235e09 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
@@ -64,10 +64,10 @@ index 1023ab73ca..c78ff6f27f 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 569ef466c3..7ae921a113 100644 +index 0d5075e1e6..dc59a9582c 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { +@@ -137,7 +137,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { /* The "root" parameter is decoration only – it's only used as part of log messages */ for (size_t i = 0; i < ELEMENTSOF(table); i++) {
@@ -76,7 +76,7 @@ index 569ef466c3..7ae921a113 100644 continue; if (table[i].target) { /* Create as symlink? */ -@@ -153,7 +153,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { +@@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) {
@@ -85,7 +85,7 @@ index 569ef466c3..7ae921a113 100644 continue; /* check if a specific file exists at the target path */ -@@ -164,7 +164,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { +@@ -156,7 +156,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom();
@@ -94,6 +94,3 @@ index 569ef466c3..7ae921a113 100644 continue; } --- -2.34.1 -
meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +2 -6
@@ -1,8 +1,7 @@ -From bab07e779ff23d5593bb118efaaa31b60a6dce87 Mon Sep 17 00:00:00 2001 +From 9f85e2db2b40313de555b3103aa485b9b84382fe Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 08/22] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out
@@ -29,6 +28,3 @@ index b6d8be3083..0a29036c4c 100644 static inline char* strstr_ptr(const char *haystack, const char *needle) { if (!haystack || !needle) return NULL; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +1 -4
@@ -1,4 +1,4 @@ -From 5712d56f1cd654d2e5d2e9117ff77fe4c299f76b Mon Sep 17 00:00:00 2001 +From c223945b20aadd1e3b1f3986e159cb3755aabf99 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 5 Sep 2015 06:31:47 +0000 Subject: [PATCH] implment systemd-sysv-install for OE
@@ -38,6 +38,3 @@ index cb58d8243b..000bdf6165 100755 ;; *) usage ;; --- -2.39.2 -
meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +3 -6
@@ -1,7 +1,7 @@ -From 25093c5017725b8577c444dfea0f42ad85b43522 Mon Sep 17 00:00:00 2001 +From 64b98f7ba1f5211bd19cd98c9d7e4d0f884cf65d Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 09/22] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error.
@@ -24,7 +24,7 @@ Signed-off-by: Scott Murray <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 201c5596ae..ea51595b6c 100644 +index 4492e7ded2..b61a2aba74 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) {
@@ -36,6 +36,3 @@ index 201c5596ae..ea51595b6c 100644 } int get_oom_score_adjust(int *ret) { --- -2.34.1 -
meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +5 -8
@@ -1,7 +1,7 @@ -From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001 +From bc75e47baaddbd629d9757a2539102649d9501fd Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 10/22] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different.
@@ -24,10 +24,10 @@ Signed-off-by: Chen Qi <[email protected]> 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 77b2e1a0fd..fdba0e0142 100644 +index f415797700..a5c6e9a3bd 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { +@@ -410,7 +410,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0;
@@ -40,7 +40,7 @@ index 77b2e1a0fd..fdba0e0142 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; -@@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static +@@ -595,8 +600,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static if (e && e->message) return e->message;
@@ -71,6 +71,3 @@ index 69a2eb6404..1561859650 100644 if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +2 -5
@@ -1,7 +1,7 @@ -From 49c446cfb78cf74a909bed8c3798b77a5469866a Mon Sep 17 00:00:00 2001 +From e8a03df3275aef82a1bfd5c1ce60058c5e39eb09 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 11/22] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map'
@@ -27,6 +27,3 @@ index 7d9e395c92..88c2d7dfac 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.34.1 -
meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +28 -31
203 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +2 -5
@@ -1,7 +1,7 @@ -From 2f90f8463423cfbb7e83fcef42f1071018c3b56e Mon Sep 17 00:00:00 2001 +From db390dc6bfa0a7b27010e0dcd25f45f17a6e3954 Mon Sep 17 00:00:00 2001 From: Scott Murray <[email protected]> Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH 13/22] Handle __cpu_mask usage +Subject: [PATCH] Handle __cpu_mask usage Fixes errors:
@@ -55,6 +55,3 @@ index ea0c58770e..b65c0bd370 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ --- -2.34.1 -
meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +3 -6
@@ -1,7 +1,7 @@ -From b7c827bb44edbb6251c9fcdb80aa03982c0e7bf3 Mon Sep 17 00:00:00 2001 +From 0019ddcc5c415df52504dd2b779b5acb19e4084d Mon Sep 17 00:00:00 2001 From: Alex Kiernan <[email protected]> Date: Tue, 10 Mar 2020 11:05:20 +0000 -Subject: [PATCH 14/22] Handle missing gshadow +Subject: [PATCH] Handle missing gshadow gshadow usage is now present in the userdb code. Mask all uses of it to allow compilation on musl
@@ -138,7 +138,7 @@ index 22ab04d6ee..4e52e7a911 100644 #include <shadow.h> diff --git a/src/shared/userdb.c b/src/shared/userdb.c -index f60d48ace4..e878199a28 100644 +index 98066bb81d..47dc4dd420 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
@@ -168,6 +168,3 @@ index f60d48ace4..e878199a28 100644 if (r < 0) return r; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +5 -8
@@ -1,7 +1,7 @@ -From 3dc9d9d410bcce54fddfd94f43f7f77f3aa8e281 Mon Sep 17 00:00:00 2001 +From eb4095a963a51a1b3de693f8cf0ac27304f30d24 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 12 Apr 2021 23:44:53 -0700 -Subject: [PATCH 15/22] missing_syscall.h: Define MIPS ABI defines for musl +Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 unlike glibc where these are provided by libc headers, therefore define
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 7 insertions(+) diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index d795efd8f2..d6729d3c1d 100644 +index e2cd8b4e35..f2fe489de7 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h @@ -20,6 +20,12 @@
@@ -31,9 +31,9 @@ index d795efd8f2..d6729d3c1d 100644 + #include "macro.h" #include "missing_keyctl.h" - #include "missing_stat.h" + #include "missing_sched.h" diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 7ae921a113..0ef9d1fd39 100644 +index dc59a9582c..9e802ef5a5 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -20,6 +20,7 @@
@@ -44,6 +44,3 @@ index 7ae921a113..0ef9d1fd39 100644 typedef struct BaseFilesystem { const char *dir; /* directory or symlink to create */ --- -2.34.1 -
meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +2 -5
@@ -1,7 +1,7 @@ -From 0994b59dba9f248ad31cb7087046dc00b72cb4ea Mon Sep 17 00:00:00 2001 +From c9c0cdbc37c2e0ac1917188b6f3a1ad54cbbd816 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 21 Jan 2022 15:15:11 -0800 -Subject: [PATCH 16/22] pass correct parameters to getdents64 +Subject: [PATCH] pass correct parameters to getdents64 Fixes ../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
@@ -32,6 +32,3 @@ index 5e98b7a5d8..aef065047b 100644 if (n < 0) return -errno; if (n == 0) --- -2.34.1 -
meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +7 -10
@@ -1,7 +1,7 @@ -From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001 +From 038809fb270d11909d502d76b56bb83784ff478d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 21 Jan 2022 22:19:37 -0800 -Subject: [PATCH 17/22] Adjust for musl headers +Subject: [PATCH] Adjust for musl headers Upstream-Status: Inappropriate [musl specific]
@@ -425,7 +425,7 @@ index 607fe0053c..9ce4005874 100644 #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index efbae6d868..1ea2151d50 100644 +index 8945827862..7571429523 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -3,7 +3,7 @@
@@ -451,7 +451,7 @@ index 32229a3fc7..662a345d6e 100644 #include "in-addr-util.h" #include "networkd-address.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index ee5f0f2c0a..ea5269a2de 100644 +index a4fa321264..0fd81a53d1 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3,7 +3,7 @@
@@ -464,7 +464,7 @@ index ee5f0f2c0a..ea5269a2de 100644 #include <linux/netdevice.h> #include <sys/socket.h> diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c -index ab9eeb13a5..dd96fe7483 100644 +index 840ccb158d..9f2e85e32f 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -6,7 +6,7 @@
@@ -477,7 +477,7 @@ index ab9eeb13a5..dd96fe7483 100644 #include "sd-ndisc.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index 7218d799fc..30d5574eae 100644 +index eb502ae2cf..5b25ee4523 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,9 +1,5 @@
@@ -502,7 +502,7 @@ index 7218d799fc..30d5574eae 100644 _cleanup_(route_freep) Route *route = NULL; diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c -index 2298f9ea3a..7d5f87de53 100644 +index 011ea1fe6e..59dfe733eb 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -2,7 +2,7 @@
@@ -567,6 +567,3 @@ index f528a46b8e..830318cda5 100644 #include <linux/netdevice.h> #include <linux/pci_regs.h> --- -2.34.1 -
meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +3 -6
@@ -1,8 +1,8 @@ -From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001 +From b771a2ed8d6e07b006710767b79475dece4d789c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 8 Nov 2022 13:31:34 -0800 -Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU - specific version mark it so +Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific + version mark it so Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
@@ -47,6 +47,3 @@ index 376d532281..967cfd4d67 100644 TEST(PROTECT_ERRNO) { errno = 12; --- -2.34.1 -
meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From 46d80840bfe37e67d4f18c37a77751ea1fe63a07 Mon Sep 17 00:00:00 2001 +From f70a8031ded3bcfe4c5f1cea4763ae257ca27be8 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 23 Jan 2023 23:39:46 -0800 -Subject: [PATCH 19/22] errno-util: Make STRERROR portable for musl +Subject: [PATCH] errno-util: Make STRERROR portable for musl Sadly, systemd has decided to use yet another GNU extention in a macro lets make this such that we can use XSI compliant strerror_r() for
@@ -37,6 +37,3 @@ index 27804e6382..274c1c6ef1 100644 /* A helper to print an error message or message for functions that return 0 on EOF. * Note that we can't use ({ … }) to define a temporary variable, so errnum is * evaluated twice. */ --- -2.34.1 -
meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +3 -6
@@ -1,7 +1,7 @@ -From 9eb4867b4e2dbdb2484ae854022aff97e2f0feb3 Mon Sep 17 00:00:00 2001 +From 9ae5377acfa895bfc1ea61aef4fbe754bc2f7f33 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 2 Aug 2023 12:06:27 -0700 -Subject: [PATCH 20/22] sd-event: Make malloc_trim() conditional on glibc +Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc musl does not have this API
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index 288798a0dc..6419a7f216 100644 +index 25f3b1fc4f..9ea3c964b2 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit(
@@ -34,6 +34,3 @@ index 288798a0dc..6419a7f216 100644 usec_t after_timestamp = now(CLOCK_MONOTONIC); if (r > 0) --- -2.34.1 -
meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From 502597b9ddd6b145541b23fadca0b1d3ca9f6367 Mon Sep 17 00:00:00 2001 +From d814a5cae2ecbee079816e3fc7b34a59da356a3b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 2 Aug 2023 12:20:40 -0700 -Subject: [PATCH 21/22] shared: Do not use malloc_info on musl +Subject: [PATCH] shared: Do not use malloc_info on musl Upstream-Status: Inappropriate [musl-specific] Signed-off-by: Khem Raj <[email protected]>
@@ -52,6 +52,3 @@ index 8e70e365dd..9e782caec9 100644 (void) memstream_dump(LOG_INFO, &m); break; } --- -2.34.1 -
meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +4 -7
@@ -1,7 +1,7 @@ -From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 +From e355e927950e8978a417067f25f30bf311896c96 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 2 Jan 2024 11:03:27 +0800 -Subject: [PATCH 22/22] avoid missing LOCK_EX declaration +Subject: [PATCH] avoid missing LOCK_EX declaration This only happens on MUSL. Include sys/file.h to avoid compilation error about missing LOCK_EX declaration.
@@ -15,10 +15,10 @@ Signed-off-by: Chen Qi <[email protected]> 2 files changed, 2 insertions(+) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index 70d963e269..7084811439 100644 +index 308d332c15..b1c43bbc6a 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c -@@ -4,6 +4,7 @@ +@@ -5,6 +5,7 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/prctl.h>
@@ -38,6 +38,3 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); --- -2.34.1 -
meta/recipes-core/systemd/systemd_255.13.bb renamed from meta/recipes-core/systemd/systemd_255.4.bb +0 -0
Signature · 1 line
2.34.1
PATCH 5/27 binutils: stable 2.42 branch update
In reply to Steve SakomanFrom: Deepthi Hemraj <[email protected]>
Below commits on binutils-2.42 stable branch are updated.09ba78f0513 LoongArch: ld:Report an error when seeing an unrecognized relocation 00abcf39930 s390: Add arch15 instructionscaf72067a77 s390: Relax risbg[n]z, risb{h|l}gz, {rns|ros|rxs}bgt operand constraints 543a22c7ee3 s390: Simplify (dis)assembly of insn operands with const bits 7c94c87d463 s390: Align opcodes to lower-casefffb4fae823 s390: Flag conditional branch relative insns as condjump 2d238ecbe50 s390: Use proper string lengths when parsing opcode table flags 10d0dd2ba2b s390: Whitespace fixes in conditional branch flavor descriptions 10a143e273c LoongArch: Add elfNN_loongarch_mkobject to initialize LoongArch tdata 9055fbe5ffb LoongArch: The symbol got type can only be obtained after initialization
Tested on qemux86_64.
There were no additional PASS or FAIL after the update
--- meta/recipes-devtools/binutils/binutils-2.42.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/binutils/binutils-2.42.inc +1 -1
@@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" -SRCREV ?= "8a6764d35e5c15d78de8aef8f27af3eefd9d7544" +SRCREV ?= "09ba78f051319e8f8861b26fb9340e21ca973c70" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" SRC_URI = "\ ${BINUTILS_GIT_URI} \
Signature · 1 line
2.34.1
PATCH 6/27 tzdata&tzcode-native: upgrade 2024a -> 2024b
In reply to Steve SakomanFrom: Jinfeng Wang <[email protected]>
--- .../glib-2.0/gdatetime-test-fail-0001.patch | 72 +++++++++++++++++++ .../glib-2.0/gdatetime-test-fail-0002.patch | 65 +++++++++++++++++ .../glib-2.0/gdatetime-test-fail-0003.patch | 63 ++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb | 3 + meta/recipes-extended/timezone/timezone.inc | 6 +- 5 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0001.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0002.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0003.patch
meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0001.patch new file +72 -0
@@ -0,0 +1,72 @@ +From 39af934b11ec7bb8f943ba963919816266a3316e Mon Sep 17 00:00:00 2001 +From: "Rebecca N. Palmer" <[email protected]> +Date: Fri, 11 Oct 2024 09:38:52 +0100 +Subject: [PATCH 1/3] gdatetime test: Do not assume PST8PDT was always exactly + -8/-7 + +In newer tzdata, it is an alias for America/Los_Angeles, which has a +slightly different meaning: DST did not exist there before 1883. As a +result, we can no longer hard-code the knowledge that interval 0 is +standard time and interval 1 is summer time, and instead we need to look +up the correct intervals from known timestamps. + +Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/3502 +Bug-Debian: https://bugs.debian.org/1084190 +[smcv: expand commit message, fix whitespace] +Signed-off-by: Simon McVittie <[email protected]> + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf] + +Signed-off-by: Jinfeng Wang <[email protected]> +--- + glib/tests/gdatetime.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c +index 141263b66..cfe00906d 100644 +--- a/glib/tests/gdatetime.c ++++ b/glib/tests/gdatetime.c +@@ -2625,6 +2625,7 @@ test_posix_parse (void) + { + GTimeZone *tz; + GDateTime *gdt1, *gdt2; ++ gint i1, i2; + + /* Check that an unknown zone name falls back to UTC. */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +@@ -2648,16 +2649,25 @@ test_posix_parse (void) + + /* This fails rules_from_identifier on Unix (though not on Windows) + * but passes anyway because PST8PDT is a zone name. ++ * ++ * Intervals i1 and i2 (rather than 0 and 1) are needed because in ++ * recent tzdata, PST8PDT may be an alias for America/Los_Angeles, ++ * and hence be aware that DST has not always existed. ++ * https://bugs.debian.org/1084190 + */ + tz = g_time_zone_new_identifier ("PST8PDT"); + g_assert_nonnull (tz); + g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT"); +- g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST"); +- g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600); +- g_assert (!g_time_zone_is_dst (tz, 0)); +- g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PDT"); +- g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==,- 7 * 3600); +- g_assert (g_time_zone_is_dst (tz, 1)); ++ /* a date in winter = non-DST */ ++ i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, 0); ++ /* approximately 6 months in seconds, i.e. a date in summer = DST */ ++ i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, 15000000); ++ g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i1), ==, "PST"); ++ g_assert_cmpint (g_time_zone_get_offset (tz, i1), ==, - 8 * 3600); ++ g_assert (!g_time_zone_is_dst (tz, i1)); ++ g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i2), ==, "PDT"); ++ g_assert_cmpint (g_time_zone_get_offset (tz, i2), ==,- 7 * 3600); ++ g_assert (g_time_zone_is_dst (tz, i2)); + g_time_zone_unref (tz); + + tz = g_time_zone_new_identifier ("PST8PDT6:32:15"); +-- +2.34.1 +
meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0002.patch new file +65 -0
65 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0003.patch new file +63 -0
63 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb +3 -0
@@ -18,6 +18,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://memory-monitor.patch \ file://skip-timeout.patch \ file://CVE-2024-52533.patch \ + file://gdatetime-test-fail-0001.patch \ + file://gdatetime-test-fail-0002.patch \ + file://gdatetime-test-fail-0003.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
meta/recipes-extended/timezone/timezone.inc +3 -3
@@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2024a" +PV = "2024b" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \
@@ -16,5 +16,5 @@ S = "${WORKDIR}/tz" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" -SRC_URI[tzdata.sha256sum] = "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" +SRC_URI[tzcode.sha256sum] = "5e438fc449624906af16a18ff4573739f0cda9862e5ec28d3bcb19cbaed0f672" +SRC_URI[tzdata.sha256sum] = "70e754db126a8d0db3d16d6b4cb5f7ec1e04d5f261255e4558a67fe92d39e550"
Signature · 1 line
2.34.1
PATCH 7/27 wireless-regdb: upgrade 2024.07.04 -> 2024.10.07
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
---
...ireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} (94%)meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "9832a14e1be24abff7be30dee3c9a1afb5fdfcf475a0d91aafef039f8d85f5eb" +SRC_URI[sha256sum] = "f76f2bd79a653e9f9dd50548d99d03a4a4eb157da056dfd5892f403ec28fb3d5" inherit bin_package allarch
Signature · 1 line
2.34.1
PATCH 8/27 uboot-sign: fix concat_dtb arguments
In reply to Steve SakomanFrom: Clayton Casciato <[email protected]>
Fixes [YOCTO #15642]
Ensure empty argument passed from do_uboot_assemble_fitimage is passed to concat_dtb
--- meta/classes-recipe/uboot-sign.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/uboot-sign.bbclass +1 -1
@@ -338,7 +338,7 @@ uboot_assemble_fitimage_helper() { binary="$2" if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then - concat_dtb $type $binary + concat_dtb "$type" "$binary" fi if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then
Signature · 1 line
2.34.1
PATCH 9/27 lttng-ust: backport patch to fix cmake-multiple-shared-libraries build error
In reply to Steve SakomanFrom: Bin Lan <[email protected]>
There are the following error when building doc/examples/cmake-multiple-shared-libraries:
ld: warning: liblttng-ust-common.so.1, needed by lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link)
ld: warning: liblttng-ust-tracepoint.so.1, needed by lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link)
ld: warning: liblttng-ust-common.so.1, needed by lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link)
ld: warning: liblttng-ust-tracepoint.so.1, needed by lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link)
ld: lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_common_alloc_tls'
ld: lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_parent'
ld: lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_child'
ld: lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_parent'
ld: lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_unregister_queue_release'
ld: lttng-ust/2.13.8/build/src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_cancelstate_disable_pop'
collect2: error: ld returned 1 exit status
This change set removes the old patch file 0001-Makefile.am-update-rpath-link.patch, adds a new patch file 0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch.
--- ...es-when-rpath-is-stripped-from-in-bu.patch | 161 ++++++++++++++++++ .../0001-Makefile.am-update-rpath-link.patch | 33 ---- meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb | 2 +- 3 files changed, 162 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch
meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch new file +161 -0
@@ -0,0 +1,161 @@ +From 5d10459b6b5182fcbc98240d9dace026c87a5037 Mon Sep 17 00:00:00 2001 +From: Kienan Stewart <[email protected]> +Date: Mon, 5 Aug 2024 15:41:34 -0400 +Subject: [PATCH] Fix: Build examples when rpath is stripped from in-build-tree + libs + +Observed issue +============== + +Certain tool chains[1, 2] emit warnings or errors when building the +example applications. + +``` +make[3]: Entering directory +'/home/xxx/src/efficios/lttng/master/src/lttng-ust/doc/examples/easy-ust' +CC sample.o +CC tp.o +CCLD sample + +/usr/bin/ld: warning: liblttng-ust-common.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) +/usr/bin/ld: warning: liblttng-ust-tracepoint.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_add_fd_to_tracker' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_child' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_common_ctor' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_init' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_register_queue_release' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_cancelstate_disable_pop' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_synchronize_rcu' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_register_thread' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_prune_release_queue' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_cancelstate_disable_push' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_before_fork' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_lock_fd_tracker' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_trace_clock' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_has_sys_membarrier' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_unlock_fd_tracker' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_exit' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_get_cpu_sym' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_common_alloc_tls' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_after_fork_parent' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_delete_fd_from_tracker' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_register' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_reader' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_urcu_gp' +/usr/bin/ld: ../../../src/lib/lttng-ust/.libs/liblttng-ust.so: undefined reference to `lttng_ust_tp_probe_unregister_queue_release' +collect2: error: ld returned 1 exit status +``` + +=== Reproducer === + +The easiest way to consistently reproduce this type of build failure +is to perform the following steps: + +``` +./configure +make -j$(nproc) +find . -iname '*.so' -exec chrpath -d {} \; +make -C doc/examples clean +make -j$(nproc) +``` + +As the examples are not built with libtool, finding the libraries to +link against depends on the shared objects having an rpath. + +E.g. + +``` +$ chrpath src/lib/lttng-ust/.libs/liblttng-ust.so.1.0.0 +src/lib/lttng-ust/.libs/liblttng-ust.so.1.0.0: RUNPATH=/home/xxx/src/efficios/lttng/master/src/lttng-ust/src/lib/lttng-ust-common/.libs:/home/xxx/src/efficios/lttng/master/src/lttng-ust/src/lib/lttng-ust-tracepoint/.libs:/home/xxx/src/efficios/lttng/master/usr/lib +``` + +The current examples build with `-Wl,-rpath` for `liblttng-ust`, but +not the dependencies of `liblttng-ust` (which would normally be found +via it's own rpath). If the `rpath` is stripped from +`liblttng-ust.so`, or if the tool chain ignores `rpath` explicitly, +then the build with fail. + +In the case of a yocto build environment as in GitHub#61[1], the +following commands reproduced the warnings and the errors seen in the +above test case. + +``` +git clone git://git.yoctoproject.org/poky && cd poky/ +. oe-init-build-env +echo "PACKAGECONFIG:pn-lttng-ust = 'examples'" >>conf/local.conf +bitbake lttng-ust +``` + +=== Solution === + +Explicitly add library search paths and set linker rpath-link are set +for both the standard and cmake examples. Similar changes were +proposed for each of those parts respectively in GitHub#61[1] and GitHub#63[2]. + +=== Known issues === + +While the `rpath-link` for the second order library dependencies will +allow the builds to complete, the examples will not work at +runtime even when using `rpath`. From `man ld.so`, the rpaths in an +executable or shared object are only considered for direct +dependencies. Therefore, without setting `LD_LIBRARY_PATH` or +installing the libraries test applications will fail as follows: + +``` +$ ./doc/examples/easy-ust/sample +./doc/examples/easy-ust/sample: error while loading shared libraries: liblttng-ust-common.so.1: cannot open shared object file: No such file or directory +``` + +References +========== + +[1]: https://github.com/lttng/lttng-ust/pull/61 +[2]: https://github.com/lttng/lttng-ust/pull/63 + +Change-Id: I273ccddd0d0b7a1b57b9e09ddf48d8b5b41e6f8e +Signed-off-by: Kienan Stewart <[email protected]> +Signed-off-by: Mathieu Desnoyers <[email protected]> + +Upstream-Status: Backport [https://github.com/lttng/lttng-ust/commit/5d10459b6b5182fcbc98240d9dace026c87a5037] +Signed-off-by: Bin Lan <[email protected]> + +--- + doc/examples/Makefile.am | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am +index aebf63bd..79766ec0 100644 +--- a/doc/examples/Makefile.am ++++ b/doc/examples/Makefile.am +@@ -169,7 +169,10 @@ all-local: + CFLAGS='$(CFLAGS)' \ + AM_CFLAGS='$(AM_CFLAGS)' \ + LDFLAGS="$(LDFLAGS)" \ +- AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \ ++ AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -L../../../src/lib/lttng-ust-common/.libs -L../../../src/lib/lttng-ust-tracepoint/.libs \ ++ -Wl,-rpath="$(abs_top_builddir)/src/lib/lttng-ust/.libs/" \ ++ -Wl,-rpath-link="$(abs_top_builddir)/src/lib/lttng-ust-common/.libs/" \ ++ -Wl,-rpath-link="$(abs_top_builddir)/src/lib/lttng-ust-tracepoint/.libs/"' \ + LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ + AM_V_P="$(AM_V_P)" \ + AM_V_at="$(AM_V_at)" \ +@@ -222,10 +225,14 @@ all-local: + CXX="$(CXX)" \ + $(CMAKE) \ + -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ +- -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs" \ ++ -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs;$(abs_top_builddir)/src/lib/lttng-ust-common/.libs;$(abs_top_builddir)/src/lib/lttng-ust-tracepoint/.libs" \ + -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ +- -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \ ++ -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS) \ ++ -L../../../src/lib/lttng-ust/.libs -L../../../src/lib/lttng-ust-common/.libs -L../../../src/lib/lttng-ust-tracepoint/.libs \ ++ -Wl,-rpath=$(abs_top_builddir)/src/lib/lttng-ust/.libs/ \ ++ -Wl,-rpath-link=$(abs_top_builddir)/src/lib/lttng-ust-common/.libs/ \ ++ -Wl,-rpath-link=$(abs_top_builddir)/src/lib/lttng-ust-tracepoint/.libs/" \ + .. && \ + $(MAKE) \ + ) || exit 1; \ +-- +2.43.0 +
meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 7d053804ab3823d40ae10d90f4efc49dbfb4cb66 Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Wed, 22 Sep 2021 16:33:10 +0800 -Subject: [PATCH] Makefile.am: update rpath link - -since commit 6339062 Move liblttng-ust to 'src/lib/', -liblttng-ust.so/liblttng-ust-common.so/liblttng-ust-tracepoint.so -'s location changed from one dir to multiple dirs. which make below -error: -ld: warning: liblttng-ust-common.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) -ld: warning: liblttng-ust-tracepoint.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) - -Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/61] - -Signed-off-by: Changqing Li <[email protected]> - ---- - doc/examples/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am -index 57782cc..d46caa6 100644 ---- a/doc/examples/Makefile.am -+++ b/doc/examples/Makefile.am -@@ -167,7 +167,7 @@ all-local: - CFLAGS='$(CFLAGS)' \ - AM_CFLAGS='$(AM_CFLAGS)' \ - LDFLAGS="$(LDFLAGS)" \ -- AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \ -+ AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/:$(PWD)/../../src/lib/lttng-ust-tracepoint/.libs:$(PWD)/../../src/lib/lttng-ust-common/.libs/"' \ - LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ - AM_V_P="$(AM_V_P)" \ - AM_V_at="$(AM_V_at)" \
meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb +1 -1
@@ -31,7 +31,7 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ file://0001-lttng-ust-common-link-with-liburcu-explicitly.patch \ - file://0001-Makefile.am-update-rpath-link.patch \ + file://0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch \ " SRC_URI[sha256sum] = "d4ef98dab9a37ad4f524ccafdfd50af4f266039b528dd5afabce78e49024d937"
Signature · 1 line
2.34.1
PATCH 10/27 shared-mime-info: drop itstool-native from DEPENDS
In reply to Steve SakomanFrom: Guðni Már Gilbert <[email protected]>
itstool was dropped as a dependency in shared-mime-info release v2.2 (2022-03-27)
--- meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb +1 -1
@@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native xmlto-native" +DEPENDS = "libxml2 glib-2.0 shared-mime-info-native xmlto-native" SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;branch=master \ file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \
Signature · 1 line
2.34.1
PATCH 11/27 libpam: drop cracklib from DEPENDS
In reply to Steve SakomanFrom: Guðni Már Gilbert <[email protected]>
cracklib was dropped as a dependency in libpam v1.5.0 See the following commit as reference:
https://github.com/linux-pam/linux-pam/commit/d702ff714c309069111899fd07c09e31c414c166
--- meta/recipes-extended/pam/libpam_1.5.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/pam/libpam_1.5.3.bb +1 -1
@@ -31,7 +31,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ SRC_URI[sha256sum] = "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283" -DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" +DEPENDS = "bison-native flex-native libxml2-native virtual/crypt" EXTRA_OECONF = "--includedir=${includedir}/security \ --libdir=${base_libdir} \
Signature · 1 line
2.34.1
PATCH 12/27 sysvinit: backport patch for fixing one issue of pidof
In reply to Steve SakomanFrom: Changqing Li <[email protected]>
When a program is a link to an executable, and this executable is handled by update-alternatives, renamed to a different name, cmd pidof full_path_of_program will not work.
Eg:/usr/sbin/httpd -> /usr/sbin/httpd.apache2pidof /usr/sbin/httpd cannot get pid of the process httpd
Backport the patch to fix above issue.
--- ...rom-Mark-Hindley-which-avoids-cleari.patch | 31 +++++++++++++++++++ meta/recipes-core/sysvinit/sysvinit_3.04.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch
meta/recipes-core/sysvinit/sysvinit/0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 5be52641a10ad6cd89bc7cdb80318e32be7e6662 Mon Sep 17 00:00:00 2001 +From: Jesse <[email protected]> +Date: Wed, 29 Mar 2023 10:34:45 -0300 +Subject: [PATCH] Accepted patch from Mark Hindley which avoids clearing + realpath information in pidof when trying to find matching executables. + +Upstream-Status: Backport [https://github.com/slicer69/sysvinit/commit/c06458e1c1822a2c8ff89fbdd29262ca97dd18b1#diff-4244fa301bd80b0a8f553ce0751fb0fcde1a45ee9dee71db85135cffde8ac712R13] + +Signed-off-by: Changqing Li <[email protected]> + +--- + src/killall5.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/killall5.c b/src/killall5.c +index 86866b0..f7a401e 100644 +--- a/src/killall5.c ++++ b/src/killall5.c +@@ -766,8 +766,8 @@ PIDQ_HEAD *pidof(char *prog) + return NULL; + + /* Try to stat the executable. */ ++ memset(real_path, 0, sizeof(real_path)); + if ( (prog[0] == '/') && ( realpath(prog, real_path) ) ) { +- memset(&real_path[0], 0, sizeof(real_path)); + dostat++; + } + +-- +2.25.1 +
meta/recipes-core/sysvinit/sysvinit_3.04.bb +1 -0
@@ -23,6 +23,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz \ file://bootlogd.init \ file://01_bootlogd \ file://0001-hddown-include-libgen.h-for-basename-API.patch \ + file://0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch \ " SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2b7e3a5"
Signature · 1 line
2.34.1
PATCH 13/27 package_rpm: use zstd's default compression level
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
zstd uses 3 by default, while 19 is the highest and slowest. It's not clear why 19 was picked to begin with, possibly I copy-pasted it from rpm's examples without thinking:
https://git.yoctoproject.org/poky/commit/?h=master-next&id=4a4d5f78a6962dda5f63e9891825c80a8a87bf66
This brings significant speedups in rpm's compression step:
for example compressing webkitgtk takes 11s instead of 36s.
The rpm size increases from 175648k to 234860k. I think it's a worthy default tradeoff.
--- meta/classes-global/package_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-global/package_rpm.bbclass +1 -1
@@ -10,7 +10,7 @@ IMAGE_PKGTYPE ?= "rpm" RPM = "rpm" RPMBUILD = "rpmbuild" -RPMBUILD_COMPMODE ?= "${@'w19T%d.zstdio' % int(d.getVar('ZSTD_THREADS'))}" +RPMBUILD_COMPMODE ?= "${@'w3T%d.zstdio' % int(d.getVar('ZSTD_THREADS'))}" PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"
Signature · 1 line
2.34.1
PATCH 14/27 package_rpm: restrict rpm to 4 threads
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
TL;DR version:
with this, and the previous compression level changes
I am seeing drastic speedups in package_write_rpm completion times:
webkitgtk goes from 78 seconds to 37 seconds glibc-locale goes from 399 seconds to 58 seconds (!)
The long version:
rpm uses multithreading for two purposes:
- spawning compressors (which are nowadays themselves multi-threaded, so the feature is not as useful as it once was)
- parallel file classification
While the former behaves well on massively parallel CPUs (it was written and verified here :), the latter was then added by upstream and only benchmarked on their very old, slow laptop, apparently:
https://github.com/rpm-software-management/rpm/commit/41f0e214f2266f02d6185ba11f797716de8125d4
On anything more capable it starts showing pathologic behavior, presumably from spawning massive amount of very short-lived threads, and then having to synchronize them. For example classifying glibc-locale takes
5m20s with 256 threads (default on my machine!)
1m49s with 64 threads
59s with 16 threads
48s with 8 threads
Even a more typical recipe like webkitgtk is affected:
47s with 256 threads
32s with 64 threads
27s with 16 or 8 threads
I have found that the optimal amount is actually four: this also means that only four compressors are running at a time, but as they're themselves using threads, and typical recipes are dominated by just two or three large packages, this does not affect overall completion time.
--- meta/classes-global/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes-global/package_rpm.bbclass +1 -0
@@ -705,6 +705,7 @@ python do_package_rpm () { cmd = cmd + " --define '_use_internal_dependency_generator 0'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" cmd = cmd + " --define '_build_id_links none'" + cmd = cmd + " --define '_smp_ncpus_max 4'" cmd = cmd + " --define '_source_payload %s'" % rpmbuild_compmode cmd = cmd + " --define '_binary_payload %s'" % rpmbuild_compmode cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
Signature · 1 line
2.34.1
PATCH 15/27 strace: download release tarballs from GitHub
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
Switch to downloading the release tarballs from GitHub. Their CDN is rock solid, and strace.io is hosted inside Russia which some networks are blocking.
--- meta/recipes-devtools/strace/strace_6.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/strace/strace_6.7.bb +2 -2
@@ -5,7 +5,7 @@ SECTION = "console/utils" LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2433d82e1432a76dc3eadd9002bfe304" -SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \
@@ -17,7 +17,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ " SRC_URI[sha256sum] = "2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7" -inherit autotools ptest +inherit autotools github-releases ptest # Not yet ported to rv32 COMPATIBLE_HOST:riscv32 = "null"
Signature · 1 line
2.34.1
PATCH 16/27 toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails
In reply to Steve SakomanFrom: Chen Qi <[email protected]>
When LD_LIBRARY_PATH is set, post-relocate-setup.sh will fail and exit properly. But such failure is ignored and the SDK installation will continue and tell user that things succeed. This is misleading. So exit immediately if post-relocate-setup.sh fails.
Fixes [Yocto #15586]
--- meta/files/toolchain-shar-extract.sh | 4 ++++ 1 file changed, 4 insertions(+)
meta/files/toolchain-shar-extract.sh +4 -0
@@ -286,6 +286,10 @@ post_relocate="$target_sdk_dir/post-relocate-setup.sh" if [ -e "$post_relocate" ]; then $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $post_relocate $SUDO_EXEC /bin/sh $post_relocate "$target_sdk_dir" "@SDKPATH@" + if [ $? -ne 0 ]; then + echo "Executing $post_relocate failed" + exit 1 + fi $SUDO_EXEC rm -f $post_relocate fi
Signature · 1 line
2.34.1
PATCH 17/27 oeqa/runtime/ssh: Rework ssh timeout
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
After the changes to improve this test, we keep seeing image testing ssh failures, particularly on mips.
It looks like part of the problem is that on a loaded system, 5s is too short for mips to reliably establish an ssh connection. I've seen logs where it keeps timing out and fails to work, then the debug code successfully uses ssh later after everything else fails.
Change the timings/retries to give slow platforms enough time to respond.
--- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +2 -2
@@ -16,7 +16,7 @@ class SSHTest(OERuntimeTestCase): @OETestDepends(['ping.PingTest.test_ping']) @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): - for i in range(20): + for i in range(5): status, output = self.target.run("uname -a", timeout=5) if status == 0: break
@@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase): # give it time for the port to open. # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely # from boot/init not being 100% complete, retry for these too. - time.sleep(5) + time.sleep(30) continue else: self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))
Signature · 1 line
2.34.1
PATCH 18/27 oeqa/runtime/ssh: Fix incorrect timeout fix
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
I'd meant to change the command timeout in the previous change, fix the correct one.
--- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +2 -2
@@ -17,7 +17,7 @@ class SSHTest(OERuntimeTestCase): @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): for i in range(5): - status, output = self.target.run("uname -a", timeout=5) + status, output = self.target.run("uname -a", timeout=30) if status == 0: break elif status == 255 or status == -signal.SIGTERM:
@@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase): # give it time for the port to open. # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely # from boot/init not being 100% complete, retry for these too. - time.sleep(30) + time.sleep(5) continue else: self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))
Signature · 1 line
2.34.1
PATCH 19/27 cml1.bbclass: do_diffconfig: Don't override .config with .config.orig
In reply to Steve SakomanFrom: Robert Yang <[email protected]>
Fixed:
1) $ bitbake virtual/kernel -cmenuconfig
Do some changes and save the new config to default .config.
2) $ bitbake virtual/kernel -cdiffconfig
The config fragment is dumped into ${WORKDIR}/fragment.cfg.
But the .config which was saved by step #1 is overridden by .config.orig, so the changes will be lost if run 'bitbake virtual/kernel'
And the following comment is for subprocess.call(), not for shutil.copy(), so move subprocess.call() to the correct location.
# No need to check the exit code as we know it's going to be # non-zero, but that's what we expect.
--- meta/classes-recipe/cml1.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/cml1.bbclass +1 -2
@@ -93,10 +93,9 @@ python do_diffconfig() { if isdiff: statement = 'diff --unchanged-line-format= --old-line-format= --new-line-format="%L" ' + configorig + ' ' + config + '>' + fragment - subprocess.call(statement, shell=True) # No need to check the exit code as we know it's going to be # non-zero, but that's what we expect. - shutil.copy(configorig, config) + subprocess.call(statement, shell=True) bb.plain("Config fragment has been dumped into:\n %s" % fragment) else:
Signature · 1 line
2.34.1
PATCH 20/27 package_rpm: Check if file exists before open()
In reply to Steve SakomanFrom: Pavel Zhukov <[email protected]>
Exception handler tries to read() /etc/passwd file in sysroot and if file doesn't exist for any reason then it raises FileNotFoundError exception which mask the original source of the problem and makes debugging of the issue more difficult.
Fixes:
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/codebuild/output/src1899304708/src/build/tmp-container/work/core2-64-oe-linux/emqx-bin/4.3.12/recipe-sysroot/etc/passwd'
--- meta/classes-global/package_rpm.bbclass | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
meta/classes-global/package_rpm.bbclass +12 -4
@@ -205,14 +205,22 @@ python write_specfile () { try: owner = pwd.getpwuid(stat_f.st_uid).pw_name except Exception as e: - bb.error("Content of /etc/passwd in sysroot:\n{}".format( - open(d.getVar("RECIPE_SYSROOT") +"/etc/passwd").read())) + filename = d.getVar('RECIPE_SYSROOT') + '/etc/passwd' + if os.path.exists(filename): + bb.error("Content of /etc/passwd in sysroot:\n{}".format( + open(filename).read())) + else: + bb.error("File {} doesn't exist in sysroot!".format(filename)) raise e try: group = grp.getgrgid(stat_f.st_gid).gr_name except Exception as e: - bb.error("Content of /etc/group in sysroot:\n{}".format( - open(d.getVar("RECIPE_SYSROOT") +"/etc/group").read())) + filename = d.getVar("RECIPE_SYSROOT") +"/etc/group" + if os.path.exists(filename): + bb.error("Content of /etc/group in sysroot:\n{}".format( + open(filename).read())) + else: + bb.error("File {} doesn't exists in sysroot!".format(filename)) raise e return "%attr({:o},{},{}) ".format(mode, owner, group)
Signature · 1 line
2.34.1
PATCH 21/27 qemurunner: Clean up serial_lock handling
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Avoid "RuntimeError: release unlocked lock" since the lock shouldn't be locked even in the error path. Add a try/finally path to ensure this.
--- meta/lib/oeqa/utils/qemurunner.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
meta/lib/oeqa/utils/qemurunner.py +6 -5
@@ -519,7 +519,6 @@ class QemuRunner: except Exception as e: self.logger.warning('Extra log data exception %s' % repr(e)) data = None - self.thread.serial_lock.release() return False with self.thread.serial_lock:
@@ -822,10 +821,12 @@ class LoggingThread(threading.Thread): self.logfunc(data, ".stdout") elif self.serialsock and self.serialsock.fileno() == fd: if self.serial_lock.acquire(blocking=False): - data = self.recv(1024, self.serialsock) - self.logger.debug("Data received serial thread %s" % data.decode('utf-8', 'replace')) - self.logfunc(data, ".2") - self.serial_lock.release() + try: + data = self.recv(1024, self.serialsock) + self.logger.debug("Data received serial thread %s" % data.decode('utf-8', 'replace')) + self.logfunc(data, ".2") + finally: + self.serial_lock.release() else: serial_registered = False poll.unregister(self.serialsock.fileno())
Signature · 1 line
2.34.1
PATCH 22/27 tcl: skip io-13.6 test case
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
---- Result was:
{abcdefghj
01234} 0
---- Result should have been (exact matching):
{abcdefghj
} 1 01234 0
==== io-13.6 FAILED
This test is documented as failing on slow machines, so just skip it.
[ YOCTO #15407 ]
--- meta/recipes-devtools/tcltk/tcl/run-ptest | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/tcltk/tcl/run-ptest +2 -0
@@ -15,6 +15,8 @@ SKIP="$SKIP cmdMZ-6.6" SKIP="$SKIP exit-1.\*" # 15407 15421 SKIP="$SKIP \*io-46.1" +# io-13.6 explicitly says it can fail on slow/loaded machines +SKIP="$SKIP io-13.6" # 14825 SKIP="$SKIP socket-\* socket_inet-\*"
Signature · 1 line
2.34.1
PATCH 23/27 groff: fix rare build race in hdtbl
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
It's possible to build the hdtbl examples before grn has been build:
groff: error: couldn't exec grn: No such file or directory
Backport a dependency fix from upstream.
[ YOCTO #15610 ]
--- ...l-Fix-Savannah-66316-missing-grn-dep.patch | 38 +++++++++++++++++++ meta/recipes-extended/groff/groff_1.23.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch
meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 12169aa269341753d491a69e9adb86c58dca039a Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" <[email protected]> +Date: Thu, 10 Oct 2024 18:17:08 -0500 +Subject: [PATCH] [hdtbl]: Fix Savannah #66316 (missing `grn` dep). + +* hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Declare dependency on `grn`; + because `-I` flags are used, it is dragged in even though not + explicitly needed. Resolves race against `grn`'s availability in the + build tree. + +Fixes <https://savannah.gnu.org/bugs/?66316>. Thanks to Ross Burton for +the report. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> +--- + contrib/hdtbl/ChangeLog | 10 ++++++++++ + contrib/hdtbl/hdtbl.am | 3 +-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am +index b6c334c18..3c37174f2 100644 +--- a/contrib/hdtbl/hdtbl.am ++++ b/contrib/hdtbl/hdtbl.am +@@ -119,9 +119,8 @@ SUFFIXES += .roff .in .ps + && sed -e "s|[@]fontdir[@]|$(fontdir)|" \ + -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ + +- + $(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \ +- grops font/devps/stamp contrib/hdtbl/examples/common.roff ++ grops grn font/devps/stamp contrib/hdtbl/examples/common.roff + + uninstall_groffdirs: uninstall-hdtbl-hook + uninstall-hdtbl-hook: +-- +2.34.1 +
meta/recipes-extended/groff/groff_1.23.0.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://0001-Make-manpages-mulitlib-identical.patch \ file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ file://0001-build-meintro_fr.ps-depends-on-tbl.patch \ + file://0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch \ " SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"
Signature · 1 line
2.34.1
PATCH 24/27 tune-cortexa32: set tune feature as armv8a
In reply to Steve SakomanFrom: Jagadeesh Krishnanjanappa <[email protected]>
Cortexa32 is a 32-bit armv8a architecture processor, so set the tune feature as armv8a instead of aarch64 which is 64-bit armv8a architecture.
It solves the following build error while compiling libgcc-initial
and libssp-nonshared.
-- snip --
aarch64-poky-linux-musl-gcc: error: unrecognized command-line option '-mfpu=neon' aarch64-poky-linux-musl-gcc: error: unrecognized command-line option '-mfloat-abi=hard' -- snip --
--- meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc +1 -1
@@ -10,7 +10,7 @@ AVAILTUNES += "cortexa32 cortexa32-crypto" ARMPKGARCH:tune-cortexa32 = "cortexa32" ARMPKGARCH:tune-cortexa32-crypto = "cortexa32" # We do not want -march since -mcpu is added above to cover for it -TUNE_FEATURES:tune-cortexa32 = "aarch64 cortexa32 crc callconvention-hard neon" +TUNE_FEATURES:tune-cortexa32 = "armv8a cortexa32 crc callconvention-hard neon" TUNE_FEATURES:tune-cortexa32-crypto = "${TUNE_FEATURES:tune-cortexa32} crypto" PACKAGE_EXTRA_ARCHS:tune-cortexa32 = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa32 cortexa32hf-neon" PACKAGE_EXTRA_ARCHS:tune-cortexa32-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa32 cortexa32hf-neon cortexa32hf-neon-crypto"
Signature · 1 line
2.34.1
PATCH 25/27 udev-extraconf: fix network.sh script did not configure hotplugged interfaces
In reply to Steve SakomanFrom: Regis Dargent <[email protected]>
Udev script network.sh is called when a new ethernet interface is plugged (eg. USB). Due to some (old) missing files, this script does nothing, instead of configuring the interfaces with ifup.
I just commented the corresponding lines to allow the script to reach the part where it calls ifup.
Fixes [YOCTO 15616]
network.sh relies on (long) missing files (eg. /etc/network/options, /etc/init.d/network) to decide if it should configure the new network interface (ifup) or put its name in /etc/udev_network_queue for future initialization by /etc/init.d/network service.
The actual result was that the new hotplugged interface was never automatically configured.
Removing the obsolete tests allows the script to do its intended job.
--- .../udev/udev-extraconf/network.sh | 32 ------------------- 1 file changed, 32 deletions(-)
meta/recipes-core/udev/udev-extraconf/network.sh +0 -32
@@ -6,38 +6,6 @@ echo "$INTERFACE" | grep -q wifi && exit 0 # udevd does clearenv(). Export shell PATH to children. export PATH -# Check if /etc/init.d/network has been run yet to see if we are -# called by starting /etc/rcS.d/S03udev and not by hotplugging a device -# -# At this stage, network interfaces should not be brought up -# automatically because: -# a) /etc/init.d/network has not been run yet (security issue) -# b) /var has not been populated yet so /etc/resolv,conf points to -# oblivion, making the network unusable -# - -spoofp="`grep ^spoofprotect /etc/network/options`" -if test -z "$spoofp" -then - # This is the default from /etc/init.d/network - spoofp_val=yes -else - spoofp_val=${spoofp#spoofprotect=} -fi - -test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0 - -# I think it is safe to assume that "lo" will always be there ;) -if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val" -then - echo "$INTERFACE" >> /dev/udev_network_queue - exit 0 -fi - -# -# Code taken from pcmcia-cs:/etc/pcmcia/network -# - # if this interface has an entry in /etc/network/interfaces, let ifupdown # handle it if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
Signature · 1 line
2.34.1
PATCH 26/27 webkitgtk: fix erroneous use of unsuported DEBUG_LEVELFLAG variable
In reply to Steve SakomanThe version bump to 2.44.3 mistakenly changed the recipe to use DEBUG_LEVELFLAG, which is unsupported in scarthgap.
Restore the original use of DEBUG_FLAGS
--- meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.44.3.bb +1 -1
@@ -93,7 +93,7 @@ EXTRA_OECMAKE = " \ # Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the # debug symbols (4.3GB to 700M at time of writing) -DEBUG_LEVELFLAG = "-g1" +DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" # Javascript JIT is not supported on ARC EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF "
Signature · 1 line
2.34.1
PATCH 27/27 llvm: reduce size of -dbg package
In reply to Steve SakomanUnless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the debug symbols
Level 1 produces minimal information, enough for making backtraces in parts of the program that you don't plan to debug. This includes descriptions of functions and external variables, and line number tables, but no information about local variables.
This makes the sstate objects a lot more manageable, and packaging faster.
--- meta/recipes-devtools/llvm/llvm_18.1.6.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/llvm/llvm_18.1.6.bb +2 -0
@@ -93,6 +93,8 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen${PV} \ -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config${PV} \ " +# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the debug symbols +DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" # patch out build host paths for reproducibility do_compile:prepend:class-target() {
Signature · 1 line
2.34.1