From patchwork Thu Nov 21 21:53:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13973E64024 for ; Thu, 21 Nov 2024 21:54:31 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.10671.1732226064959991331 for ; Thu, 21 Nov 2024 13:54:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=l8dzfnmx; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-724d8422f37so723023b3a.2 for ; Thu, 21 Nov 2024 13:54:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226064; x=1732830864; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9HTViZ8zlibF3Mm53HBCOzdE7aYAcKSWhNkxhAStw/4=; b=l8dzfnmxUe79/sGcLfRz/TE4C7jyMwtQ2k4L8+4dTONzuT8n1FNlZpZ4DzIf6eMmJw SuJguW6kWHOt4SvngkI8Fbky2faDTzlAfXoUOsAFgnm9PjhRf2oIuts9Bi+btcMjrrda +fxrcOX82P0PJ7oXASyBjy/n1prWTBn7oEOSxt3ODKC3HfgTbhGsdvC46zo4zYz3r9gB ujRguSYY9L6ILdnJyqmwit0TXAgq/aIh9yEooZoeTbWCJrxZf725WlUr8TmBSg6gtZch WJFBzmR7gh0mLi8KMjIM+3z1p9CgqxDzUxSoYAwH1SdXLGLovmGic6wTTzv3OnvcEGpy G6Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226064; x=1732830864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9HTViZ8zlibF3Mm53HBCOzdE7aYAcKSWhNkxhAStw/4=; b=k5RvrvGBQ87sTDn43n9uRz/05UKQOFthMwu9bPBpHAS8PGWK9Dna0QTRhYocWh5FbP PnK1fby+yAQcenneXYtJG6S0WpWiLqvkDAmqjWEQT3+N5llQzEKrS6m6dDDtVohTq5SM XencgUOlRF34jN5ytoFvJ6P8ShbEWJ/7Npg9k1WkYJRn4qeKwdnrp16HM49jKDCv7a8E jcAq2rN6biPbGgjeHkvKUfOmzNrTuuKeQ2TJ6mN2IH+tbxsYVhk/mWkLm1X9Cl+bpaSq RcitmKZ0VqyTDpHqTulq0VcJRuIj4vnPzg59+qgyRfujk4vaYYAsCL1YQn25qxEBbMtZ ETfg== X-Gm-Message-State: AOJu0YzhdN5IMJdu4spSiwhPa1TyTGYG/xxhPPdXwXg7owctlchBNHRS pFSKBRGA1MXGhU7vANqIIub5uOU33P5e2x3QUNJcQAj4ay8B/tylHEmiL23qUkABlqodJ/NPjop b X-Gm-Gg: ASbGncsU57ps+LGfOFbAEJ860gxw95XZwpRTpb+WxKagLRDFRE3k90+BM/gEl9gvLSm 9TY7/B86zYbtqhTD8HMFqXd2+Hhc17qs+cQbgfnwvIvu6NLKRqTim6zKMvaFfaKYQVjYmJmNj6O lMyTqrr8pAptLFkftCD08Rl3oWoZB5c4XaV3ixOKpAre/f73eRyPYUwDsZUAZ4cHeAU10f23Zyp oF2zu6Uk1PBDQ87/kyDN1e04hej2/Nm1bY38Zk= X-Google-Smtp-Source: AGHT+IH5yaMweKzf+I9YE7udtn0XhwWgptuT5Ih5PXIKAuGKccP7cU0CjXj5zX3aXoYhv7FeXu8MyA== X-Received: by 2002:a05:6a00:3ccc:b0:71e:79a8:1d84 with SMTP id d2e1a72fcca58-724df3c81e3mr750684b3a.3.1732226064020; Thu, 21 Nov 2024 13:54:24 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/27] libsoup: fix CVE-2024-52532 Date: Thu, 21 Nov 2024 13:53:51 -0800 Message-Id: <5a28744c74270905d4b29285589a399df4c9cb68.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207556 From: Hitendra Prajapati Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be && https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../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 diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0001.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0001.patch new file mode 100644 index 0000000000..272abb3abf --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0001.patch @@ -0,0 +1,42 @@ +From 29b96fab2512666d7241e46c98cc45b60b795c0c Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +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 +--- + 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 + diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0002.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0002.patch new file mode 100644 index 0000000000..a1690a9980 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2024-52532-0002.patch @@ -0,0 +1,36 @@ +From 6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +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 +--- + 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 + diff --git a/meta/recipes-support/libsoup/libsoup_3.4.4.bb b/meta/recipes-support/libsoup/libsoup_3.4.4.bb index 6f7cac4cf8..0e66715589 100644 --- a/meta/recipes-support/libsoup/libsoup_3.4.4.bb +++ b/meta/recipes-support/libsoup/libsoup_3.4.4.bb @@ -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" From patchwork Thu Nov 21 21:53:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52922 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EE5BE64027 for ; Thu, 21 Nov 2024 21:54:31 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web10.10468.1732226066046755067 for ; Thu, 21 Nov 2024 13:54:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ce62wZKj; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-724c50c832bso1138898b3a.2 for ; Thu, 21 Nov 2024 13:54:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226065; x=1732830865; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AcCPBv3GRg3FfHKVGIAKp2+AXMuJ7EQniFSm8PL0nk8=; b=Ce62wZKjaOBshil7FwHqJp/ybNAZyz10SHeuSL2RWBU+3/574i4AzGBWz4szooWZiu EkOnhJKiJKzNHo5TV4tJaF3DQN81rOPJDGYqGiLUoJ4K0zplAxbk05JZWBqgTU2ucZrG ky7zhF3Fcv0QscrRJLHlv/wVxNcDS6V5tIV6PRewuok2QGbNLGV7hyzNdXx/D2J0rOjW CUvLNBu1wrPW+GJXLvBy+POEENFOAcWMsonDxAGeiHv7wKPTqBQFe3OFxvgIEr7o74jJ MZZ3LsCN5aQIgHvLorAfWpl21i83eHu4mHn7xCew52dVRP46665SEZed5Kf+llsh2anh Z6Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226065; x=1732830865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AcCPBv3GRg3FfHKVGIAKp2+AXMuJ7EQniFSm8PL0nk8=; b=mQviTcd2dApid3yI1b7yHxFVC422oCvgu6MlSAAehc1B85sOtfw6P0yfCRSGyyskze i4+VxzNYhLXn82J4Zi4KjMBWu2oJu3hBsSiBBFIBadTnDuCS/ZEvrES122tRRoSHCC8r L6LQQP5lcWzOhphJ1w98uzZ3eppY2lYVYhqYDfwq3wtKXZ+t9d96A2pZfi0HjJH9KUc9 AweJQ/1TY0wi73wTaxNKyCcm6mNTTDE8uj4JJuFueGQ2vxzvRkDIJWbumSQZi101jqdx 9J92QWQ+xetPs0PmG6XuLF9F7TwCDsXeXT27/Bwyic3BDD76FveCyQoaAnrITpub8xV1 nBHQ== X-Gm-Message-State: AOJu0Ywa+jkHO5twOzq1+zjRsLSjd5S4QmGBQ8/q/fefzm2cEmQkYZ/7 kKBCo0FloyOCkyoyZBwPdTcohuz0TGlqS7934S+UTqJCIllC2auxZcPOOL36KKKLjdCIvWRZsjW Q X-Gm-Gg: ASbGncsqhEexMlUSecl0l0+OBZNYycRC8Zvsgy5Y4QMydkvfr3l5uPcR4h9fkmTBgok 1VFnYcbhtLMCxgjpmCfDL6N15rqqMCGr1fkWZcxDMk9eZhLE+PtrWXl7Xfl3LyneBMMmSorguI9 L2dEB7eTr//Ah6NS6n2q/GjDvJjgjzW7McAcI3sBCniLw0ULw1QfvJ/kMGZDsUNBkDCcGHDidaz QLfGrTt52pwIO5MP5UQi49y6GkjzbB3zaF2YYk= X-Google-Smtp-Source: AGHT+IFdC4jn3EDQoRdZl0rpvmZ7+7muT8km0Pu6fB2sdYYVsYb6tzW1j8G60/VC3tQvoTLZCnK6DA== X-Received: by 2002:a05:6a00:22d1:b0:71e:4ba:f389 with SMTP id d2e1a72fcca58-724df5d61e2mr765488b3a.10.1732226065350; Thu, 21 Nov 2024 13:54:25 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/27] glib-2.0: Backport fix for CVE-2024-52533 Date: Thu, 21 Nov 2024 13:53:52 -0800 Message-Id: <61e270156015be8c09d45a5065deed5f7b1fde96.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207557 From: Vijay Anusuri Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/glib/-/commit/ec0b708b981af77fef8e4bbb603cde4de4cd2e29 Reference: https://security-tracker.debian.org/tracker/CVE-2024-52533 Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- .../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 diff --git a/meta/recipes-core/glib-2.0/glib-2.0/CVE-2024-52533.patch b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2024-52533.patch new file mode 100644 index 0000000000..3a06a9d782 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2024-52533.patch @@ -0,0 +1,49 @@ +From ec0b708b981af77fef8e4bbb603cde4de4cd2e29 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +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 +--- + 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 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb index 1a4278b1bc..506e72bd4c 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb @@ -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 \ From patchwork Thu Nov 21 21:53:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22501E64025 for ; Thu, 21 Nov 2024 21:54:31 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.10673.1732226067458596973 for ; Thu, 21 Nov 2024 13:54:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Kyv1URrj; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7fbce800ee5so71585a12.2 for ; Thu, 21 Nov 2024 13:54:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226066; x=1732830866; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/7qc3o+vt/ujKsNQh0Uss1th8csMj8VZ1LFX7bXJnqM=; b=Kyv1URrjI6CkY/omOjSzKUXvhtOskmrIFAgxffGRTEZGFPlmCTqn4/0KGsc99WZlbd rNJJQGBYKXDprXQ84xh+IW0uZyrCjb6rbvwZ1O55TyRC9UQf57YNj4FgaGIDcYu5wgFw PPPSOoaKJLoqSRQieaNzgbiEjHKUDGfOgektphgH/OgcZr2jfMLbnSAbWpGRXZqNDT6E 36E+keP5FLjZLMBnh6//eGNURPTRCgG0Kp5U3yREFQ0So+nyknFmGZad+USwpt6B/LCT oKgawHNQ7mZ+951l+0XvzmOoozsBnJicj7kqYNtfumV9NtxNPvFsYrhMDC3XDH4WfwNY cc4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226066; x=1732830866; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/7qc3o+vt/ujKsNQh0Uss1th8csMj8VZ1LFX7bXJnqM=; b=SVyeOSZBNqsInMMbPLtFy6bYG25DoCn4RH5O+7Dpwn35/VrSnsdi88uBGgZAIQ0abG yG0wxobFCsd9IMhtENTV5CW7UuVDKHDejV+6YVjk1rHS8zXZpyJStipAi5vbucc3iUMT zROJyI1mV6QoV2+0/Z9IG7Lw5in694y1g8e0Xg+LdhNg86GA7nf+5mN1s+3VlLlbk2v0 5dWn56vDXFIT3FCGbIo/jhF55foclH9TMKJ0u2ulb9K6PUyo6YK4r55OVFL/S6ocjbMl cBoC9/WTpNzH2kLXNFbn70dhPr9XWSv1hE2OLEQn6aARaEC6aXRGUsM94ZHuPf1jmtbY pVdA== X-Gm-Message-State: AOJu0YzMktSRgR47sFC1GPGpRIiseoqwoY+KfpCtVX65+0ZAC1fDT8GB +ULk2ICQgbGniYaSWEnomMwt5rfoHtdkw43L3hyAWZ03EmLUAIbm0lvG7xQjouoJD+lpv73POZ9 9 X-Gm-Gg: ASbGncug0HqDUCMprky6duoAhTH6E73vl5S+L1lyXswrRvH7tzp2an9TOz8XK8hubTq nsX2XLLZezuLu+BOLxmpYNDA6VInxIZREqnlaoXEGi8eXJWbtDd7+Kh5wb3m2iQwQMnq5GcaM47 Uw5E+r3GfAToFo6ZDwwlJtRD9NCWg6s2YAwxUkuBtIBNQuyFeuKoDaRhTtmVTBCN0ydkKnkV3fX vkJJkRVZEzY8stQ0z54IoK6PIsgwVC8AaB8PaE= X-Google-Smtp-Source: AGHT+IG266zyt3iszbUYD/EIIvOHLlTgddoyRKP2Mj6/4m1x7CQJTV8iPXy3fLmtkhbbKQkojoRQ1g== X-Received: by 2002:a05:6a20:9149:b0:1d8:a9c0:8853 with SMTP id adf61e73a8af0-1e09e4b1b05mr800142637.23.1732226066582; Thu, 21 Nov 2024 13:54:26 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:26 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/27] ghostscript: upgrade 10.03.1 -> 10.04.0 Date: Thu, 21 Nov 2024 13:53:53 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207558 From: Hitendra Prajapati 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. Signed-off-by: Wang Mingyu Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../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%) diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch index 67f14bd368..0546fdf8f0 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch @@ -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 Date: Thu, 29 Mar 2018 16:02:05 +0800 Subject: [PATCH] avoid host contamination @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 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) diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.04.0.bb similarity index 97% rename from meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb rename to meta/recipes-extended/ghostscript/ghostscript_10.04.0.bb index 0504f5244f..546d734333 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.04.0.bb @@ -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" From patchwork Thu Nov 21 21:53:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52924 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 137A4E64023 for ; Thu, 21 Nov 2024 21:54:31 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.10675.1732226069700449926 for ; Thu, 21 Nov 2024 13:54:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=rnpYHX77; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea76a12c32so1073483a12.1 for ; Thu, 21 Nov 2024 13:54:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226069; x=1732830869; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fab5NtWncImicfvPvEHXXweDDrGxbjSaNpsSd1KA5yk=; b=rnpYHX77Qg8bvPE/MMJmia6ZRN2XrQfyguj6cyXZtcrIW+awR5crlopSNxTtvslH20 8D/0+8HNe3oCp1YjOdxVwr+27nPR9or36fjlO0Z/SZfTqSQ2uyg2VkV3TETPTa1/5k9m 2NvJ+sp594j5CtsxWcXKFkIACBPl3Vyo8PpGXJIJAXL7KoscwRhJTTVBTsAy9OZPQgm1 G+16ctipo7qxJxKiBnRuXYyDNlzQLYmkafscPClFJHqRVLdRJ9F3otJSUCYsrMFbmxVz D7SYz25qghhVjytg3XbReHVkq/u+CQA8ADHQMvfWLrQhGD+ChqJ22WCl4UUnhlNfq9pZ 4ytA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226069; x=1732830869; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fab5NtWncImicfvPvEHXXweDDrGxbjSaNpsSd1KA5yk=; b=boT6H4XYg5mls1LKH6h98jP47FaLqB9MA0mRv/kRTAnpWEPzkFFhl+oKVPD/+jtOXc 5cFFnIz5qYjo1KMte/4tm5KSL/XUk7fN4hTaFI3d5NBoP/sGtyxnI5cqJvX3+u7G2cow sRnUhcgtnDFtTAdud+DMEnhEqV6eTN0EIA9l9tYTLDxMmu/SG02qLL3Al34aY0CRhj5h de3X4CZCWC0wMVVdi1nsVWxOZft0Lfw0DF5HR51jCtq1GzfQqTalNwhq2tfDPVKgO8Dp d3lxvZRXOkOe/bzNBM1bFMeLawwqZ429HeVLZdCv8zMPNLlRVJbUfNMkscmoeOqYDF3U eUeQ== X-Gm-Message-State: AOJu0YyhGhK2B2TDyvzucYThjFFrX3vqRxOD3TH2vqB7tp95N36d9iWT QT5Y9x4cTqfij46+AD1Yhs/HwrbFyvSHWUFIe7elKa4ap1qEIjJ0I6FJohQ9LB0UpbOxP8scLiZ 1 X-Gm-Gg: ASbGncvhOfOtUdYbekhdsuTs27/qudC1gwRni0PsqxBuyYdAIIphZFSFfiUU2tb0q8u rikDWxVbpZ74aWyE56aKn1pMWoiGFaWBUZdZsW4QG4ji2s9my/rN+2ZMLhHGd9TCwuUlAhZYAnV CrUPjbHMgIBfBGgIyKW5UufhmR/rFlVJpE1lw1BkCbM/PykMdwp4cGRyA+8P3dnNtzwxyGwSiIH t7xOaBImLlKgojhHq441nEdffELEqV0NY7iPdM= X-Google-Smtp-Source: AGHT+IHN3v0ctwRWKaBCzmuz66lfUe0y9on6Nk8+cE2uaAcIYjBhegmfb4VkvKEfwXrnVxl321zbaQ== X-Received: by 2002:a05:6a21:99a5:b0:1db:e481:3274 with SMTP id adf61e73a8af0-1e09e632130mr732310637.31.1732226068112; Thu, 21 Nov 2024 13:54:28 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/27] systemd: stable update 255.4 -> 255.13 Date: Thu, 21 Nov 2024 13:53:54 -0800 Message-Id: <39eb4070503a96311e52f44ab1ea3cdbd6795182.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207559 From: Randy MacLeod 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. Signed-off-by: Randy MacLeod Signed-off-by: Steve Sakoman --- ...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%) diff --git a/meta/recipes-core/systemd/systemd-boot-native_255.4.bb b/meta/recipes-core/systemd/systemd-boot-native_255.13.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_255.4.bb rename to meta/recipes-core/systemd/systemd-boot-native_255.13.bb diff --git a/meta/recipes-core/systemd/systemd-boot_255.4.bb b/meta/recipes-core/systemd/systemd-boot_255.13.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_255.4.bb rename to meta/recipes-core/systemd/systemd-boot_255.13.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index a35db5091e..88f24f99c2 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -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}" diff --git a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch index 2aa5dee6b5..78a4bf5868 100644 --- a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +++ b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch index 900a931632..e19f7dc688 100644 --- a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch index be231cf6b2..aca30d5ffe 100644 --- a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch index 5595b5bc23..802002a1c3 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,7 +1,7 @@ -From 87f1d38f40c5fe9cadf2b2de442473e4e5605788 Mon Sep 17 00:00:00 2001 +From eca6019bbd793c8d8a99142677a548766a775153 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 03/22] src/basic/missing.h: check for missing strndupa +Subject: [PATCH] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -75,10 +75,10 @@ Signed-off-by: Chen Qi 51 files changed, 62 insertions(+) diff --git a/meson.build b/meson.build -index 01fd3ffc19..61a872b753 100644 +index b544a69aaa..90b07aeb14 100644 --- a/meson.build +++ b/meson.build -@@ -567,6 +567,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] +@@ -572,6 +572,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] endforeach foreach ident : [ @@ -87,7 +87,7 @@ index 01fd3ffc19..61a872b753 100644 ['gettid', '''#include #include '''], diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index 5ac9f904a9..99d5122dd7 100644 +index b2032adaa5..ee9201826d 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -20,6 +20,7 @@ @@ -99,7 +99,7 @@ index 5ac9f904a9..99d5122dd7 100644 #define PCI_CLASS_GRAPHICS_CARD 0x30000 diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 18b16ecc0e..d2be79622f 100644 +index 50224648d3..2eaa6e3307 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -111,7 +111,7 @@ index 18b16ecc0e..d2be79622f 100644 static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) { _cleanup_free_ char *fs = NULL; diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index d3bf73385f..16b17358ca 100644 +index a97651d7af..09fa601250 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -19,6 +19,7 @@ @@ -123,7 +123,7 @@ index d3bf73385f..16b17358ca 100644 /* We follow bash for the character set. Different shells have different rules. */ #define VALID_BASH_ENV_NAME_CHARS \ diff --git a/src/basic/log.c b/src/basic/log.c -index 1470611a75..9924ec2b9a 100644 +index ade6c8b089..0ba68b2119 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -40,6 +40,7 @@ @@ -167,7 +167,7 @@ index c770e5ed32..1fd8816cd0 100644 int mkdirat_safe_internal( int dir_fd, diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c -index bf67f7e01a..409f8d8a73 100644 +index 51fbe4ed84..26626c1499 100644 --- a/src/basic/mountpoint-util.c +++ b/src/basic/mountpoint-util.c @@ -18,6 +18,7 @@ @@ -191,7 +191,7 @@ index 0430e33e40..f3728de026 100644 int parse_boolean(const char *v) { if (!v) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 4e3d59fc56..726e240df0 100644 +index d76705bd4b..149fb249d0 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -16,6 +16,7 @@ @@ -251,7 +251,7 @@ index f9014dc560..1d7840a5b5 100644 static clockid_t map_clock_id(clockid_t c) { diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c -index 0c0b4f23c7..68fe5ca509 100644 +index 12dfdf76fa..e66332519a 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -22,6 +22,7 @@ @@ -263,7 +263,7 @@ index 0c0b4f23c7..68fe5ca509 100644 static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 4237e694c0..05f9d9d9a9 100644 +index 88198010ee..74d61bfaaf 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -25,6 +25,7 @@ @@ -275,7 +275,7 @@ index 4237e694c0..05f9d9d9a9 100644 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve); diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 4daa1cefd3..2c77901471 100644 +index 2d05ba7e1d..61a7de0037 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -42,6 +42,7 @@ @@ -287,10 +287,10 @@ index 4daa1cefd3..2c77901471 100644 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index d680a64268..e59f48103e 100644 +index 7bb026af48..a86128e40c 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" @@ -299,7 +299,7 @@ index d680a64268..e59f48103e 100644 int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c -index ef0bf88687..bd3da0c401 100644 +index 4d597bf8a6..7d27f80834 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -72,6 +72,7 @@ @@ -323,7 +323,7 @@ index b8e3f7aadd..8ce8ca68d8 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index b9eb40c555..268fe7573b 100644 +index 5f4859e0d3..a920154f55 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -45,6 +45,7 @@ @@ -359,7 +359,7 @@ index 016f3baa7f..b1def81313 100644 typedef enum MountPointFlags { MOUNT_NOAUTO = 1 << 0, diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index da0f20d3ce..f22ce41908 100644 +index 2d380bc7a7..d3f5612728 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -27,6 +27,7 @@ @@ -371,7 +371,7 @@ index da0f20d3ce..f22ce41908 100644 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 7f3dcd56a4..41b7cbaaf1 100644 +index 87e2f28841..58275f41f1 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -77,6 +77,7 @@ @@ -383,7 +383,7 @@ index 7f3dcd56a4..41b7cbaaf1 100644 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index ff0228081f..9066fcb133 100644 +index ab8b06896d..43f9131205 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -19,6 +19,7 @@ @@ -407,7 +407,7 @@ index c25c40ff37..57a5da704f 100644 static int node_vtable_get_userdata( sd_bus *bus, diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index 3c59d0d615..746922d46f 100644 +index 5ade8e99aa..7553cf319d 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -29,6 +29,7 @@ @@ -419,7 +419,7 @@ index 3c59d0d615..746922d46f 100644 #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c -index 4a0259f8bb..aaa90d2223 100644 +index 8befc97460..6ee4d4f595 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -46,6 +46,7 @@ @@ -443,7 +443,7 @@ index d988588de0..458df8df9a 100644 #define MAX_SIZE (2*1024*1024) diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c -index 6b9ff0a4ed..4a5027ad0f 100644 +index 7a1dd2569f..d187baad47 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -44,6 +44,7 @@ @@ -455,7 +455,7 @@ index 6b9ff0a4ed..4a5027ad0f 100644 #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index b8da266e27..4bb8dd9496 100644 +index bf45974ca5..2cb7e930c0 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -35,6 +35,7 @@ @@ -503,10 +503,10 @@ index c64e79bdff..eda26b0b9a 100644 static void setup_logging_once(void) { static pthread_once_t once = PTHREAD_ONCE_INIT; diff --git a/src/portable/portable.c b/src/portable/portable.c -index d4b448a627..bb26623565 100644 +index faeb97bd06..30768f728e 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c -@@ -40,6 +40,7 @@ +@@ -42,6 +42,7 @@ #include "strv.h" #include "tmpfile-util.h" #include "user-util.h" @@ -515,7 +515,7 @@ index d4b448a627..bb26623565 100644 /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was * dropped there by the portable service logic and b) for which image it was dropped there. */ diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c -index afa537f160..32ccee4ae5 100644 +index 64b829e5e6..3a06758848 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -48,6 +48,7 @@ @@ -551,7 +551,7 @@ index 8b462b5627..183ce1c18e 100644 struct CGroupInfo { char *cgroup_path; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index 4ee9706847..30c8084847 100644 +index 50de98941f..d47beccb0b 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -50,6 +50,7 @@ @@ -587,7 +587,7 @@ index b41c9b06ca..e69050a507 100644 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 83e9834bbf..74eaae6f5e 100644 +index bb0536e48a..11cc1315d8 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -16,6 +16,7 @@ @@ -599,7 +599,7 @@ index 83e9834bbf..74eaae6f5e 100644 enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index a5d04003bd..10392c132d 100644 +index 0a31be382f..92d629e7e0 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -683,7 +683,7 @@ index ed22c8b679..19ebe20237 100644 UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl, int log_level) { UdevEvent *event; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index 5f12002394..febe345b4c 100644 +index c242549654..e5b8df5c2d 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -41,6 +41,7 @@ @@ -694,6 +694,3 @@ index 5f12002394..febe345b4c 100644 #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d")) --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 15877bea88..ccfe8e6aa9 100644 --- a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +++ b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch index a1dfca22cd..a29aab8390 100644 --- a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch index 4be14b72ec..818b946886 100644 --- a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 8d6084239e..ad7cf90f1d 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch index c1a8bb19fe..4d6382810b 100644 --- a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch index acff18dc43..0909185dcf 100644 --- a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 3ff0177ae3..55a033ecec 100644 --- a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index cf59ac7d06..f3f3698e5a 100644 --- a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch index e481b2e2e4..a73c67efb1 100644 --- a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch index 66be79077e..c2defc7e1e 100644 --- a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch @@ -1,7 +1,7 @@ -From e4885a8e60f883d9217e26e1db3754c2906aca31 Mon Sep 17 00:00:00 2001 +From f3630404d25dd91e87e7aac09d5dee9b92655082 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 -Subject: [PATCH 12/22] do not disable buffer in writing files +Subject: [PATCH] do not disable buffer in writing files Do not disable buffer in writing files, otherwise we get failure at boot for musl like below. @@ -47,10 +47,10 @@ Signed-off-by: Chen Qi 22 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index d2be79622f..e65fecb68d 100644 +index 2eaa6e3307..5c2876b5c9 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) { +@@ -443,7 +443,7 @@ int cg_kill_kernel_sigkill(const char *path) { if (r < 0) return r; @@ -59,7 +59,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -869,7 +869,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -68,7 +68,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -887,7 +887,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -77,7 +77,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -914,7 +914,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -86,7 +86,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -924,7 +924,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -95,7 +95,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -1840,7 +1840,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -188,10 +188,10 @@ index d21f3f79ff..258607cc7e 100644 log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); else diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 61ac4df1a6..ea18970196 100644 +index 61539afdbf..77e2b35daf 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c -@@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { +@@ -4581,7 +4581,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { u->freezer_state = FREEZER_THAWING; } @@ -201,7 +201,7 @@ index 61ac4df1a6..ea18970196 100644 return r; diff --git a/src/core/main.c b/src/core/main.c -index 3f71cc0947..0e5aec3e9e 100644 +index 1c0030a75f..7108a87d46 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { @@ -240,7 +240,7 @@ index 7ea902b6f9..1aef2988d0 100644 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif diff --git a/src/home/homework.c b/src/home/homework.c -index 066483e342..5f92dd7064 100644 +index 500c310cfc..f9845ff9e7 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -278,7 +278,7 @@ static void drop_caches_now(void) { @@ -253,7 +253,7 @@ index 066483e342..5f92dd7064 100644 log_warning_errno(r, "Failed to drop caches, ignoring: %m"); else diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index 2fbc619a34..09d9591e37 100644 +index 01e66b4658..f3ea82ca1b 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, @@ -279,10 +279,10 @@ index a5002437c6..b12e6cd9c9 100644 log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 6ab604d3dc..bbec6b686c 100644 +index a229c70875..4ceb73e915 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { +@@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -291,7 +291,7 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -4141,7 +4141,7 @@ static int setup_uid_map( +@@ -4143,7 +4143,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); @@ -300,7 +300,7 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); -@@ -4151,7 +4151,7 @@ static int setup_uid_map( +@@ -4153,7 +4153,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); @@ -323,7 +323,7 @@ index a26175474b..1413a9c72c 100644 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c -index 934a16eaf3..c921ced861 100644 +index 1b8a86dc54..5ca14433c8 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c @@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { @@ -335,7 +335,7 @@ index 934a16eaf3..c921ced861 100644 if (r == -EOPNOTSUPP && cg_is_threaded(path) > 0) /* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */ return -EUCLEAN; -@@ -966,7 +966,7 @@ int cg_enable_everywhere( +@@ -969,7 +969,7 @@ int cg_enable_everywhere( return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); } @@ -367,10 +367,10 @@ index 805503f366..01a7ccb291 100644 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c -index 3eb13d48f6..d09b901be1 100644 +index ea1b024ab6..bb82f37580 100644 --- a/src/shared/hibernate-util.c +++ b/src/shared/hibernate-util.c -@@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ @@ -379,7 +379,7 @@ index 3eb13d48f6..d09b901be1 100644 if (r == -ENOENT) { if (offset != 0) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), -@@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", offset_str, device); @@ -402,7 +402,7 @@ index 1f88e724d0..feb18b320a 100644 return r; diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c -index 4c1a968718..6faf6806a5 100644 +index 99ccefb227..e4975018ab 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { @@ -412,10 +412,10 @@ index 4c1a968718..6faf6806a5 100644 - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); if (r < 0) - return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); + return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor); diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 21af3e9e52..6d4b84b5d5 100644 +index 21062b24e0..262dd71d72 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { @@ -437,7 +437,7 @@ index 21af3e9e52..6d4b84b5d5 100644 log_debug("Using sleep disk mode '%s'.", *mode); return 0; diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c -index ae63baaf79..82eeca479a 100644 +index 16d4fb07d4..aca7506463 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { @@ -533,7 +533,7 @@ index ae63baaf79..82eeca479a 100644 return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index febe345b4c..a90b610ba1 100644 +index e5b8df5c2d..63ca15628c 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( @@ -557,6 +557,3 @@ index 4d82c65f0a..3a3d861b83 100644 if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch index 43f75373a6..4982d6c7af 100644 --- a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +++ b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch index a751e1ba6f..ac74d1fab7 100644 --- a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch index e112766a9b..551d9f8037 100644 --- a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch index 0be817e62d..947833e92b 100644 --- a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +++ b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch index 4176522a1c..922a390cc3 100644 --- a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +++ b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch @@ -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 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 #include 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 #include --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch index 75f6b9094a..9e21222b99 100644 --- a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +++ b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch index e038b73678..a6f2fe1d0f 100644 --- a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch @@ -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 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 - diff --git a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch index b83fffe793..cc123b4dee 100644 --- a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +++ b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch @@ -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 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 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 - diff --git a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch index 7eff069bb7..5e03284507 100644 --- a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +++ b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch @@ -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 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 @@ -52,6 +52,3 @@ index 8e70e365dd..9e782caec9 100644 (void) memstream_dump(LOG_INFO, &m); break; } --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch index 24f3bf74a0..e4ed2002c4 100644 --- a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch @@ -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 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 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 #include #include @@ -38,6 +38,3 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd_255.4.bb b/meta/recipes-core/systemd/systemd_255.13.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_255.4.bb rename to meta/recipes-core/systemd/systemd_255.13.bb From patchwork Thu Nov 21 21:53:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01AA4E64020 for ; Thu, 21 Nov 2024 21:54:31 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web11.10677.1732226070668503041 for ; Thu, 21 Nov 2024 13:54:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=pdSZIVT1; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-7ea76a12c32so1073493a12.1 for ; Thu, 21 Nov 2024 13:54:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226070; x=1732830870; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gGAc7i2pAjaMrfpeifO2XKz2XBT9br56lNx4wmU3DgI=; b=pdSZIVT1HksbUFoaHM6L+QXTvU03v5tINDxYFweGjvKTQNptjdlBDpB3cbugZ/Q0Vr stLJEsN0Ytt6ChoaW47Ri91szx7fQWBekOYtICzk0kL3eH0/gZ0j0SSAu3KnkIZNdJM3 vLITgqaYDL3bjxXeLEyctvccdcY/D5orFQYU4nJ5QO3q/HOu40Br+qe8MhGZFeYiUOrs fs0NuWGUPy6jcecWtR+YjWk5l59cSJkXtgHTYqSCniDQ01pdtIYANNhTAu6h/zXlGY+4 k+Rry9bzJFCnsvAb32/xQyjHFgRiLQ2Im70lTTF8GKYXtZ1dK4Uaw/zooXOZ0c7giEzC JoRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226070; x=1732830870; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gGAc7i2pAjaMrfpeifO2XKz2XBT9br56lNx4wmU3DgI=; b=uEqtg0figBVcSp7Jks/+FTr0FtphpWl58UAOwwzLkRTbPq2rFnqpUgJA7PYzs9QD5g tkfz+jeQ2c98WZNsxd/hY2IfqkVcle1bNTgYVGDB7ZIOy+fhdeU4YYss8j4Wm2EkclsC lno3KIsngh1L7v1mGMpl1oT2rcjCgWF2kV/WIb3e5KczL/7vt3Wqtf1hRMXR3FSIWhbU 92URuKj1YMyn3+6UTJussbNIZuQocPZSE0WPqacWIPb+CXtDk19sWs/yn2xDyYy1xxlm xE3TY4BB2ibvBEODHnbwTPF4fEbmfi5Rt2tuDzlzCQOdEIcqEwoYbFdA4d7P2E6++OJg hvZQ== X-Gm-Message-State: AOJu0YxU3z8JpowCmInZjuTHlyDcf7WS00bZyykIHhPrSorVhn6AwUK5 EESRmG2xmlXQh1YZ4T3ZA3jENjrzykt/acnOGIaU1xxbYBfkLGSBGoKvfjej0h7wJ/eeUIdxVNa X X-Gm-Gg: ASbGncvA7kiOoC1bfPQMBUwwlhyIOi/jaXz7e5cYmbbIPyr2oGS/dKmyNLOhxAX4T8I ujnFZlPd5IcbYq1L1+mQNMwP1F/gGz1xqGZWSToLfXaIsg0fU8RTj/VfWA/7hQrJot0ea92NkUU hVOvIM9+WpkuVOc4zuN6IoHBnvJgKJh3PQFBDbcwP/68a/jx1C+nzwlyYoe81lmYCVdNKI6HWCu zfoqktQb0WjsQfnPJGasn6fy6OtCswjL5eE0Y0= X-Google-Smtp-Source: AGHT+IGZegXWRePKlZdLDnxTufPZLIbsrYPwBb+bxMmkOZFxmIY7jWD+qW256uacUSRQUqUWGoQYHg== X-Received: by 2002:a05:6a20:9147:b0:1dc:c433:144b with SMTP id adf61e73a8af0-1e09e4effd1mr722238637.27.1732226069890; Thu, 21 Nov 2024 13:54:29 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/27] binutils: stable 2.42 branch update Date: Thu, 21 Nov 2024 13:53:55 -0800 Message-Id: <312c522787e72fffb9eb1b49e97aeaf24db27d2d.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207560 From: Deepthi Hemraj 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 instructions caf72067a77 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-case fffb4fae823 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 Signed-off-by: Deepthi Hemraj Signed-off-by: Steve Sakoman --- meta/recipes-devtools/binutils/binutils-2.42.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc index 5d5ba3d6dc..bff97b50c3 100644 --- a/meta/recipes-devtools/binutils/binutils-2.42.inc +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc @@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\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} \ From patchwork Thu Nov 21 21:53:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25BFAE64025 for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web11.10679.1732226072264388338 for ; Thu, 21 Nov 2024 13:54:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JT4Z8wor; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-71e52582cf8so1099135b3a.2 for ; Thu, 21 Nov 2024 13:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226071; x=1732830871; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PYM3t1AZz0Q/rWsT46gID8CxDHLNQO7IsgP4cTRdZO4=; b=JT4Z8worhvNkqhjTEh+/3W/Zs8hZVu2V+lnc5ixnKgigI44RoMtniNh6ECwmeHANbl ijV3PxpboKV4Oyu8FFv6nh2NNYiz0UqSFUsExAG+bb99h9DzKph7oHHhJOYGYiKMdREN hWRnAEj7LJzE1SG9aUvNxwaYccogkAdWwpjSPQAV6pz195IgVOGOCjmJ+S16DxS2xpPi XAA3DmXeUq0gJFoTWsDp+AmLz8sdpLmklH3Z0AStX2BkZxLWxQ8OnT56tP72iy/bWH0i mQ4cHeQQZCs2H87ENXBoLK/doN4fNQ0rLsunxI3cJTxhXwsbwUMWCUgcFkCARBvgWOVp TbUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226071; x=1732830871; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PYM3t1AZz0Q/rWsT46gID8CxDHLNQO7IsgP4cTRdZO4=; b=D1RLvDcvq2KDkjjbZ5VyJknLGrqsoQ3UPPGmkcCYANeA4NsJ8XRAoWHw/r9Rqx+nMk cOhZhmoljI1W10E4DaPOL/7j1EO6hGCLmU9D7Mym6GA1J8l+jRdDazfytG7yABnxvMZq Izm4eH1cu6PzojJ84DWyn9zGFVHofJZ6B6+MVbetjGjmC8FLBn3VYGimxAatUXvNkPdG x6ddx6kJQKIlKUJdrXqzVeiuX4+37u8mi6WHmupYUeJQHlzvU1GfyBcpl5W8CsoPrS/N VcY11eQ+zfqhLL9e4cN5Imuabnz7mzvenUQwqFaIeBPsnhcW+/7rQ4gF9TLQrd1ysKUg Xc0g== X-Gm-Message-State: AOJu0Yyfqez4XJ3RTv5cZIVL46NY82CLZnHr9hup1HKW2DN+rcYsK5pQ At8Jl9CJFob850rS9ceKki0GdpKKKKMl1oY8zxAbQ6KN7I2wiZkCvwtB/A0JPXXY0+v/B065exP P X-Gm-Gg: ASbGncsbz94Zk/EzASFtW6Gy04Esu9F3WgX+ctlOEBrU84RljdHmzbW1AQoUI9rlVVA tbMRHtuMi3VSsx7VR/Wd8peVcifIO+Ec8EqIg5GQhDKDFnSLtn/OR/NOLqJoD0EnQUO03rbWp2c NQj9u54hX6Sq/ZmH2DzSXSznBf80nuJyhmsZFnoxPESNEu9Eos3RP9aTc9ZSQlDS/pxsxTd3QzP bFyQei/hnFK4QwNDq99slQZUV7GaouqpUfXjtQ= X-Google-Smtp-Source: AGHT+IHOPKPA233B8B31ZEPpUIzMK8fWUjT4JtT2jX/8ak2YdyRlS9WXUfBDGofcTUfrNldCBWE2eQ== X-Received: by 2002:aa7:88cb:0:b0:71d:f821:1981 with SMTP id d2e1a72fcca58-724df3c8232mr858434b3a.4.1732226071378; Thu, 21 Nov 2024 13:54:31 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/27] tzdata&tzcode-native: upgrade 2024a -> 2024b Date: Thu, 21 Nov 2024 13:53:56 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207561 From: Jinfeng Wang Signed-off-by: Jinfeng Wang Signed-off-by: Steve Sakoman (cherry picked from commit c8d3edb2562ea4d980186e78b4abb5a94b1d7b22) Signed-off-by: Steve Sakoman --- .../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 diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0001.patch b/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0001.patch new file mode 100644 index 0000000000..1997f88f12 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0001.patch @@ -0,0 +1,72 @@ +From 39af934b11ec7bb8f943ba963919816266a3316e Mon Sep 17 00:00:00 2001 +From: "Rebecca N. Palmer" +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 + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf] + +Signed-off-by: Jinfeng Wang +--- + 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 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0002.patch b/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0002.patch new file mode 100644 index 0000000000..b3d11b5076 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0002.patch @@ -0,0 +1,65 @@ +From 27eb6eb01d5752c201dd2ec02f656463d12ebee0 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 18 Oct 2024 11:03:19 +0100 +Subject: [PATCH 2/3] gdatetime test: Try to make PST8PDT test more obviously + correct + +Instead of using timestamp 0 as a magic number (in this case interpreted +as 1970-01-01T00:00:00-08:00), calculate a timestamp from a recent +year/month/day in winter, in this case 2024-01-01T00:00:00-08:00. + +Similarly, instead of using a timestamp 15 million seconds later +(1970-06-23T15:40:00-07:00), calculate a timestamp from a recent +year/month/day in summer, in this case 2024-07-01T00:00:00-07:00. + +Signed-off-by: Simon McVittie + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/30e9cfa5733003cd1079e0e9e8a4bff1a191171a] + +Signed-off-by: Jinfeng Wang +--- + glib/tests/gdatetime.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c +index cfe00906d..22aa5112a 100644 +--- a/glib/tests/gdatetime.c ++++ b/glib/tests/gdatetime.c +@@ -2649,19 +2649,16 @@ 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"); + /* 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); ++ gdt1 = g_date_time_new (tz, 2024, 1, 1, 0, 0, 0); ++ i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, g_date_time_to_unix (gdt1)); ++ /* a date in summer = DST */ ++ gdt2 = g_date_time_new (tz, 2024, 7, 1, 0, 0, 0); ++ i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, g_date_time_to_unix (gdt2)); + 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)); +@@ -2669,6 +2666,8 @@ test_posix_parse (void) + 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); ++ g_date_time_unref (gdt1); ++ g_date_time_unref (gdt2); + + tz = g_time_zone_new_identifier ("PST8PDT6:32:15"); + #ifdef G_OS_WIN32 +-- +2.34.1 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0003.patch b/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0003.patch new file mode 100644 index 0000000000..b9afad15c5 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/gdatetime-test-fail-0003.patch @@ -0,0 +1,63 @@ +From 9dd5e9f49620f13a3eaf2b862b7aa3c680953f01 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 18 Oct 2024 11:23:42 +0100 +Subject: [PATCH 3/3] gdatetime test: Fall back if legacy System V PST8PDT is + not available + +On recent versions of Debian, PST8PDT is part of the tzdata-legacy +package, which is not always installed and might disappear in future. +Successfully tested with and without tzdata-legacy on Debian unstable. + +Signed-off-by: Simon McVittie + +Upstream-Status: Backport +[https://github.com/GNOME/glib/commit/fe2699369f79981dcf913af4cfd98b342b84a9c1] + +Signed-off-by: Jinfeng Wang +--- + glib/tests/gdatetime.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c +index 22aa5112a..4e963b171 100644 +--- a/glib/tests/gdatetime.c ++++ b/glib/tests/gdatetime.c +@@ -2626,6 +2626,7 @@ test_posix_parse (void) + GTimeZone *tz; + GDateTime *gdt1, *gdt2; + gint i1, i2; ++ const char *expect_id; + + /* Check that an unknown zone name falls back to UTC. */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +@@ -2648,11 +2649,25 @@ test_posix_parse (void) + g_time_zone_unref (tz); + + /* This fails rules_from_identifier on Unix (though not on Windows) +- * but passes anyway because PST8PDT is a zone name. ++ * but can pass anyway because PST8PDT is a legacy System V zone name. + */ + tz = g_time_zone_new_identifier ("PST8PDT"); ++ expect_id = "PST8PDT"; ++ ++#ifndef G_OS_WIN32 ++ /* PST8PDT is in tzdata's "backward" set, packaged as tzdata-legacy and ++ * not always present in some OSs; fall back to the equivalent geographical ++ * name if the "backward" time zones are absent. */ ++ if (tz == NULL) ++ { ++ g_test_message ("Legacy PST8PDT time zone not available, falling back"); ++ tz = g_time_zone_new_identifier ("America/Los_Angeles"); ++ expect_id = "America/Los_Angeles"; ++ } ++#endif ++ + g_assert_nonnull (tz); +- g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT"); ++ g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, expect_id); + /* a date in winter = non-DST */ + gdt1 = g_date_time_new (tz, 2024, 1, 1, 0, 0, 0); + i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, g_date_time_to_unix (gdt1)); +-- +2.34.1 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb index 506e72bd4c..ce7c57df9a 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb @@ -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 \ diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 4734adcc08..adf095280f 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -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" From patchwork Thu Nov 21 21:53:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B371E64029 for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.10474.1732226073531180587 for ; Thu, 21 Nov 2024 13:54:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jh7vap2F; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-7e6cbf6cd1dso1089368a12.3 for ; Thu, 21 Nov 2024 13:54:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226073; x=1732830873; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ncn9TxYFGAZMD/iCV3ZNcaYuq9YHmBSzS4e22wiX23s=; b=jh7vap2FHzQtPwhWxLeCJgfO0JNEPRm1ObYxBDorFFzUfxc/LCrxmjHB1zcqRPBdFz BbCJVOd3aMkP+UYrDAx5BmqxAgPgvW89oLzdH0HX/TSY0MN51RnM3wD1pQ+WbA6uyl5g At0162RMOY08CmgzrpEkn1Eg8JEZkP8QaKPO1E/N/fXoY4PDycCjBJDh1tBai6u7oWrp WtuOj9LyNU4CAVdgYaxCihJZkZV1monHU5VjluUFH1e7x0r9Z4uchOxrfviULpvHoKCS bFujTN6b88T2X3KaU3NBoGLriJycf1MCf3FS+7VoaYmuLxuKPn/lU2JN9Z6KjNKEMSG2 EeHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226073; x=1732830873; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ncn9TxYFGAZMD/iCV3ZNcaYuq9YHmBSzS4e22wiX23s=; b=h4TS8kXbv04qp9hB6r0X1Q294RKy4889VWx2d7lyEd0nwgLpJ3Ery4U9ZATEC/0MtW fnz2iMwgq7rh/vukWOfStMo5bQT+1us331N218DRK6Pf8LQzertz39r+KEAB0m+oaNnz 6OfXb6Dn5dPnpdN8wfOPsmgGs1U5tmXNQ+N5wGZI0daUtxonUvlfK/Z4nWKyeluPTpx5 hzOK/ngaJ9nkiRkKiTBTx3d6kaxRvaURWjhwvrPDq/f7+BAN46bni7aaEMmd2C/lu7R0 OVtwf29MgY9V2J25ipZMIwEf+wRZCBXQwf4BInvVFwKhjJVnrhxGB9K9tHWicrCQA1JR 6RPw== X-Gm-Message-State: AOJu0Yyab2l2+iVwm2OwBmbVCqYlTnigaihbSgluAx83lvjLyj2Oarn0 /M3WUd5uu3tnPQ9NPmW7Xpsqn7rdyoIKlFIE+Z36mxqGl9OIcdFgw9NbTLwevjJx4olN4eWkDRx 4 X-Gm-Gg: ASbGncvPdKPeMNRdrhhHXLl4Vyqs/ETvch6L4kAwpYwc5IWIS97FTCNVgH/DUMs8I/d X+Wo59bCxzoXxvVOxaXJ6KIK3Gf00kvkB2UEFyad/PhGokIPl/yuFuAO0HdFlOZ69A6lbrnmWsa r4wvh1qHRfMiqnr9QWraS/mogFSUDQD7bsH1vdtxo427WwQVp7MxyX/0ythn0MG6YjafkGDbraT n2N8AHOF6Ji73FkwGpTyJnFW4ljEb6K9gNF5xs= X-Google-Smtp-Source: AGHT+IGX0HxEjpPptPZ2K30vCSmuqv3jKwUQHVFZuo+iAcmF8/RIMvqOTcLHsPoZ3+R7E9Njp35+cg== X-Received: by 2002:a05:6a21:3399:b0:1d9:78c:dcf2 with SMTP id adf61e73a8af0-1e09e5ff718mr549597637.43.1732226072677; Thu, 21 Nov 2024 13:54:32 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/27] wireless-regdb: upgrade 2024.07.04 -> 2024.10.07 Date: Thu, 21 Nov 2024 13:53:57 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207562 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit f124bb09a798d94eca5e93387bc361b147ce53f9) Signed-off-by: Steve Sakoman --- ...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%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb index daf5e6dfcd..0e4100fba7 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb @@ -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 From patchwork Thu Nov 21 21:53:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BF6AE6402F for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web10.10476.1732226074736983157 for ; Thu, 21 Nov 2024 13:54:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Qaq6GVxI; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7ee7e87f6e4so1264624a12.2 for ; Thu, 21 Nov 2024 13:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226074; x=1732830874; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AmTbQUgFd1YxfIFgU+MPCIeyjMubcm3aDZstOocEug8=; b=Qaq6GVxIt1IJwKykA4N3SkFYqPemnz5Wq2FW8e5FmfrPNei5Cmo3jZqjOtziXgZlsC t9dF5uoyMPZz7/zKwrNuO7cwZeRmyryyjDJ5Nm6vAdsTtdGxYX6kIgvv7SURLtsANGKK t4DiSrzcCM4KrrJ9LXIc7MHVrln4teJZuuedmAuo+p9LSgWXwvmk7m+3rvQEYjNp2dHC kqnERFx5HAb2UJ9axnM8f5VjdlW7xMtDGAPKj6WnS6hXn5WmIubhgm8VpvlZx9C6Mzxo cCqpF1ew4YRi5hYlkSDs1JamaLuwRkHZ+YSZb4UTnBIkRS524/xafvtdBG1FXaiznWi3 5+MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226074; x=1732830874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AmTbQUgFd1YxfIFgU+MPCIeyjMubcm3aDZstOocEug8=; b=YoKPsmpBcBIHMQyuIFSpTwsGcuee0+8MVtmOZlb9wUKWLqbHUOAqU2sb5+eaTXkxJd k61PvUfP5gUoWdQpWGwD1P15YnCWARJgvI28OoTHyMF0DXfnnfF44wZfSitixz0CgTY6 zupzJPPTwEvI6WU+jCdY/XQGvbL+EGGk1Gf9ciJ++KYCzDwySAHxSwFv2IIbcspdgY/q nCkXVqu89TbZyNYtwGy79lQ5fPPfx7tLqKzXz3austkddrFdsV1UMp7jkphchuYWC+BY 2ECG6BH9UnaZn/lDQAvPnwCyPR6ZnSwGzhZh3j2X3piEiXfAW12VTJ6YvxZ3eEVOJATh 6K0A== X-Gm-Message-State: AOJu0YxpVBWECU1B7XcIZg+WKWbsyPDX3t8T/DvBnVNcCS/EVx2OsvaU I5/LkTdUM0VT3Cs/RuKQ+picLDO9WccxCVBoukq831wSWxVJ3GYE5xKMcoD51KuxtVRdBJtPeT9 i X-Gm-Gg: ASbGnctHyx7tGh7BhK+7RAOko56gkVue1dcGxUO/k3NdGPgDRZpqf3iG6N5vvgXkWs1 71/XUWp5BqhpHOgeiG5InpKkzdM9ioUN9RlxCia4VLJQrpQEyjBIu/tmMHU2TIiyodGih262a0r 9vFSafzbW/ew1K6kIsvLPvE37S1VzwVokizz2wgs/L7HD08dNSyhsBW+Bc9FrB2rd59J6JZepJG FwmEFziO+efsY4HiEFOWlbsTMggVnjJwLrZjZM= X-Google-Smtp-Source: AGHT+IG9JqDTGeUJuzRHw8UYFNBAOTg4CUhoGFfzQ9uHmbGS0OPuQVS59ZxSyFAw5/uZ0PScxn0aqw== X-Received: by 2002:a05:6a20:2591:b0:1db:ebe4:326c with SMTP id adf61e73a8af0-1e09e3cb551mr599070637.8.1732226073957; Thu, 21 Nov 2024 13:54:33 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/27] uboot-sign: fix concat_dtb arguments Date: Thu, 21 Nov 2024 13:53:58 -0800 Message-Id: <184fbbe6910491bd26eefc2230069abb11333444.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207563 From: Clayton Casciato Fixes [YOCTO #15642] Ensure empty argument passed from do_uboot_assemble_fitimage is passed to concat_dtb Signed-off-by: Clayton Casciato Signed-off-by: Richard Purdie (cherry picked from commit b3c473785e5ceef677ff2b77c5fc17f5704c622f) Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-sign.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index 3e5f5dcf66..a17be745ce 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass @@ -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 From patchwork Thu Nov 21 21:53:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E5F1E64030 for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.10683.1732226076326990523 for ; Thu, 21 Nov 2024 13:54:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JAXBAtl8; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7fbc29b3145so661984a12.0 for ; Thu, 21 Nov 2024 13:54:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226075; x=1732830875; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=645diNR3TXGU6KmTjhia7d3ws9h9vmr+urLdBUdSmjs=; b=JAXBAtl8Z4JRHagjwxA03JcYir1+cxRQ0FMnyn4K5kPOqApvPJh6jPRUPnLdpg+aEd NRIGprwilvMOGqA7J2Kh/m/JZcY1GDtj1LBdcfYY02E77KUxvPkdhitRyTSW6wk7TJwZ kaeW551MnTFtCVNMFdCYdiDMXlcyRMVb0jbm8ExOS692v5A0zMm4fqErEV0CAUSCkmbl m6+AK3b3KAuziw+oacefehFQolSLm1ZQ4bAiFwaKrRj9jFsZhHS9IubL0tSGDM0yl8jG hNi8uWBP/lX/4+2wtBsG9SP2YFVggOwpJ0EK4AzbI9+S/IcK1cBj/LFp82i6N5M+5r1n Ap4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226075; x=1732830875; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=645diNR3TXGU6KmTjhia7d3ws9h9vmr+urLdBUdSmjs=; b=JuKUZdxiG3qRiOU4c/DvkG/xUv9kbgg01FKKqfUyctNDCLe6z1fugO2d/L8lsB1uhN I1w633dpcNZUVwkQkCEGS5D9XDP38gftMFGmJ6GltUIhsfPRFjCUh7b4MzmsDy+izL5w dj+fQB3aXkFH4Igoyid3o9Qr5wn1y8rlzsdwPITdejnRcwqOLG+chRGAM+EktTSi1olA M0HcV2K3iYtUxASvwPNVlHPnEAl/4i1zuQ2ve4Ao5ccE2PUaS9bCpDSSRzX7zTUhI+h3 Ij3pmJv+TxwAgZOdqhGOTfUU/7VPUiP9QmMNH4/TwIEl3tg5fAY1rUcKNtrNe/NJR6ao USfA== X-Gm-Message-State: AOJu0YydFbqw8flrE0J0qArLb54Y+/6HFfbAewHW+5+LRKLk/iG46MH8 j6I1wRQuZ0Ml6TEE4DLjCKqq23a7MP8x9CktyJIXDWL/eaXBQI4PgdSj23iHRHMfubzdU021QyL p X-Gm-Gg: ASbGnctrHw6E00Y6az09hRw0uJbAMS+p+pCnfPqUbN7fJca4Q3Gh7uOQoC2btN5AOe9 ckCgRvutAxu/XEtq0yqEeHBgbO7yReq0+e9uX13o2MMsUJIqY476t3qrt20mncFr5Nt2nvsr/b/ tzQIYnLsL7BDIPTUf9ep7zLUaNn/WOwSzDcyV/IG3ADa4L5upCjWeO0YbaBOeX0DKiZsvROB98n Xs3C8Aw0KcYBwb5PL9XMdJ5FeQtRf5e5C7x3nI= X-Google-Smtp-Source: AGHT+IFXtHKukmHcnuMGZdpePDEmVoQNgm7gVzmKerjiTMFWxrDYka2bfHaO1ULXNtDYgpaJPtSSvw== X-Received: by 2002:a05:6a20:a109:b0:1db:d6e4:d1d9 with SMTP id adf61e73a8af0-1e09d5af343mr1256256637.1.1732226075296; Thu, 21 Nov 2024 13:54:35 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/27] lttng-ust: backport patch to fix cmake-multiple-shared-libraries build error Date: Thu, 21 Nov 2024 13:53:59 -0800 Message-Id: <7de4292f119a4f43dc739b15f0a2d966c05d9b71.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207564 From: Bin Lan 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. Signed-off-by: Bin Lan Signed-off-by: Richard Purdie (cherry picked from commit 89394da1cbe98652e1d0bd59c762ff7da2d6a113) Signed-off-by: Steve Sakoman --- ...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 diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch new file mode 100644 index 0000000000..6da675fa31 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-Fix-Build-examples-when-rpath-is-stripped-from-in-bu.patch @@ -0,0 +1,161 @@ +From 5d10459b6b5182fcbc98240d9dace026c87a5037 Mon Sep 17 00:00:00 2001 +From: Kienan Stewart +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 +Signed-off-by: Mathieu Desnoyers + +Upstream-Status: Backport [https://github.com/lttng/lttng-ust/commit/5d10459b6b5182fcbc98240d9dace026c87a5037] +Signed-off-by: Bin Lan + +--- + 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 + diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch deleted file mode 100644 index 6aca8f85fa..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7d053804ab3823d40ae10d90f4efc49dbfb4cb66 Mon Sep 17 00:00:00 2001 -From: Changqing Li -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 - ---- - 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)" \ diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb index dddd3a5004..bf2524bdc0 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb @@ -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" From patchwork Thu Nov 21 21:54:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34A43E6402B for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.10684.1732226077456386990 for ; Thu, 21 Nov 2024 13:54:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wTgfhzHT; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-7ea7e2ff5ceso1154052a12.2 for ; Thu, 21 Nov 2024 13:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226077; x=1732830877; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZbKafYvSqWztvcyKY92BV3nwvsmqtdhRnLChRR6oEUU=; b=wTgfhzHT2edR4kvjWdyMdrKIJPmu4GrKoprVOV0AM4rapC9K574O6iZSeRzptXJxSm vpn2n/PoWFFWGHoiWFeWvbwSbVhfWP1Emnpwt44IMFpmEt8uT2UpIWLQgTzlrp6d8e0k Sei8TSMgFKs/uvLeat/0gAapk4L1PrGPtNqh8bPEcQvr6S+Shpdi7fUwJwNQ9Scc2KaV 3Mjfs0HE5EPdJtileX3MzNsemVSmCV38+eJHDoMD3CXS69WzoefVT+iK65IfYjSY8RYp Hra0z0/eXT2QJpWOWGYtzvSHeje1dFjp8ispdyD0zsQsoC6v1lfVmO+VkMziQA85oUUp CQHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226077; x=1732830877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZbKafYvSqWztvcyKY92BV3nwvsmqtdhRnLChRR6oEUU=; b=RINNLiHLtHECnZVRP19AsUwp1kOdDpLi+25+Y6tGylljSs0ifOc1z2BLuDwGVl51JJ QyGXST1vAYxUMtvtTn/wVi1HRpJrvKOiz/T0qhaHMDrRi9Ea0upIw/SVJOnNNnZBHzNU +4O4lTs/maKqvGL1fnjlKP9MQyiBadl3LzZxhKKhpOiwBHVi5Q6kd5WxUW6WvGTd8UIK 84uj953bHMTrel/FQQ3j+vCijSa+aoKn44bTJQMq8uU5ouFpTCX+uUmG0WHB4bWJkE4S iaLQ8kpesGNw99FqdE5xLAhQR9hbUdckftZYLZ7bq9PPcSHdnTNWwqBvJZ3l6nzqp4Rx I3gw== X-Gm-Message-State: AOJu0YzAsfdcsIQMadWn8Wsmz2DDVraGqHU1/LIWQHtDVguGjtxQkmwY pi46tHaGBb9q693nZskq2JU6DVW6Mfh5wxM8cWdCo2woifMrkBkviye2Ke04+MACabyQS/3Ibuj U X-Gm-Gg: ASbGnctk3fKu0BAlFecr0xw0Cs3lzMOBJ+e4bwUd3pYJNxp/KcjnX6nvAsCXCmD8gaZ ONSgevtsFSKDqDHIBO8rhi2hT+pl4OakJruVeECj71dmgmmx1wqa6mdN73ErcNYxihs5LJ+dCAF TS/JrFGf5gzepsyF7csBGGFUOwbLo48aEyBGjdvBYiRslG/deDjB1RekWqEB6ajXIVgKrCx+rWK 0kg9Sw05of6i0RddlxWsfqF3sDyV0TpAk5/F1Q= X-Google-Smtp-Source: AGHT+IGdcyow4l/agGeaRD8hnjuH98wcv6jyhCTCQNVVETWcZ1orPXuCKIegnSeOthpULeSCwfyGfA== X-Received: by 2002:a05:6a20:394b:b0:1d9:386d:9441 with SMTP id adf61e73a8af0-1e09e3ee1efmr623061637.10.1732226076714; Thu, 21 Nov 2024 13:54:36 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:36 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/27] shared-mime-info: drop itstool-native from DEPENDS Date: Thu, 21 Nov 2024 13:54:00 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207565 From: Guðni Már Gilbert itstool was dropped as a dependency in shared-mime-info release v2.2 (2022-03-27) Signed-off-by: Guðni Már Gilbert Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb index ef5df44ad6..b8a377e2b2 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb @@ -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 \ From patchwork Thu Nov 21 21:54:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B538E64020 for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.10685.1732226079102300185 for ; Thu, 21 Nov 2024 13:54:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ByFHUgZR; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-724e1742d0dso12902b3a.0 for ; Thu, 21 Nov 2024 13:54:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226078; x=1732830878; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dVvcH3Wx1YGzB9XZ/Tb0q+svkrIYLIroIwn0Wnq/BRQ=; b=ByFHUgZRGYXnNog75XZ/D4TqVxrmHG5m0xv8UDnchUPWlyd7bbxsCgth2ASBK0U0qm uWoO6UllsERIZjozrwfooY2OiTOtu/hR03HPDthDyKGtpwLGULyLidzoiofrjInylkju dtnasGZQ43N7qgGsLKQC8UXSVqKx6QNv7ujTp22RlFmRCQQUeeJG+dmjVfu8gC/5yNLR /zmeTu7XerCFpcF413zMHVpw2PENAABYYd1JaKLDVMXXq4t/F4oWgDEbTiynTXW5/U3Y NBUVRntW+hO25SVO0ba52z3y3wKuHTpfMBRb0WGZ/K+QFuECZ1TuPgBBcq/6uefdxqn1 hJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226078; x=1732830878; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dVvcH3Wx1YGzB9XZ/Tb0q+svkrIYLIroIwn0Wnq/BRQ=; b=bh/SR9xXyfv9JB7tcthwDqpfzYPuCir2EboS4Bl3TOuIhTAX1fd8FntF87kHSJKvMr DWad4nRWBR3YcM1NlTxbyQEuPkhBEh9o+cUSk8Sg5VKmMPM37erxnWhRDFaCKxqnKAhM Jub9lz1uI3fXldNjLRVfqcyJkRLIgCHxbonSVqtiuYRChClhcs/aU/sPgLT1Ucd1XVfZ zguRkmUmMqWnFhvhr/zcunriCDtBuzyiwJOfAP55FMXL+vw0iNLxrwA+oJxDvSz7Nuuf loQv4X/AVcXaZwEqVjNPJAchhgiGvSeyPHoqe2/XIOLXWiWTw/MfHMmSGtOMdJjl2GMJ b7qg== X-Gm-Message-State: AOJu0Yxh3jn2jcR2/qwI2udbGY0PE1T5HslqY85KuS3Q2aasM7QuqTZ7 yTKF/7WB2AdDhOQvpJpWYx3+oZ4KgxKQK2w3eGbUjY2qPwYfr2TyujOypvCCeQIjSPLwaL03iRd Y X-Gm-Gg: ASbGncsFxGHiSgEBAlqXE66T0sdJH84iW35A1inLYsgHikQda7xZLy0I14lKFXL4kjx ohNyrcgtW5WQFMyHZQYPXZnzMVgr3e9HUtjefYDK6gna63YSYqsvqUb8vjVboDT6H+J5qmPoCTk fAqwQnabU8lOfx/L67N7wXWftAEth87DSyV4nl5qZiW6HR3vNV0ecYb4tzZqoaltbBwCi1shgMb 7OkBcm/n8TdNHygYe02Upb4rP5dxE3etUrPwjQ= X-Google-Smtp-Source: AGHT+IHRcEpiPmXefnZi5D5QuM+s20RY3PQNMKT5FN3c2UG5teLoEPYiONuHJOEmdteoytBszUY38g== X-Received: by 2002:a05:6a00:1950:b0:71e:a3:935b with SMTP id d2e1a72fcca58-724df6aadb6mr656030b3a.25.1732226078258; Thu, 21 Nov 2024 13:54:38 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/27] libpam: drop cracklib from DEPENDS Date: Thu, 21 Nov 2024 13:54:01 -0800 Message-Id: <65ac88fd4e371712c9140fc0192725fd09774e67.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207566 From: Guðni Már Gilbert 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 Signed-off-by: Guðni Már Gilbert Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Steve Sakoman --- meta/recipes-extended/pam/libpam_1.5.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/pam/libpam_1.5.3.bb b/meta/recipes-extended/pam/libpam_1.5.3.bb index bcaa84c9a5..f05272652d 100644 --- a/meta/recipes-extended/pam/libpam_1.5.3.bb +++ b/meta/recipes-extended/pam/libpam_1.5.3.bb @@ -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} \ From patchwork Thu Nov 21 21:54:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25C32E64027 for ; Thu, 21 Nov 2024 21:54:41 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.10481.1732226080442268113 for ; Thu, 21 Nov 2024 13:54:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=W04v0lrS; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2ea4c5b8fbcso1069292a91.0 for ; Thu, 21 Nov 2024 13:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226080; x=1732830880; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0drf6D2TyTKiiyJjppM1ATPEZXg5vJPkFEnetA4eUK8=; b=W04v0lrSTsS8evJPHzC8of28L0F5iNL0qANOHxF/BI9PI+m7y4uMgYVxgz+MlaJX69 3v1rvs/LsYmKdV6VtqTFR3SKTb+XVfv/eyJNujiJnV318h2x4VnFpbuzp4nIFBhv6gBr kj7xOZN+JUBNI0dfu2q6nLkcqavod0Jo9iGEv54swcogPRd3kX8L5vbS26Rd9QwPbEUg s3tiZcw+Hz/DNTgIOSUXtlBxk4lQND7lk5OmqnEHm+VMJSgzXnElXobVHTaUQFhocJZE 7b58rr2zEXL0PFo5cKqB4B5hilqCcYmHmuLZvGwASopJ5yqlEnFxhU7LMT22mgGikYGu JpTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226080; x=1732830880; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0drf6D2TyTKiiyJjppM1ATPEZXg5vJPkFEnetA4eUK8=; b=ciLPstZoXyPQUABm5c/hvLB+dRJ3o+KO/i1Qlyq00E2hMPuKx29xC2VKpjthP3QJ5Y JRaPHHBh61pFDn8F0dOBUCZhWmlSQBGk7LJJg3NzDnCFBPm4Ve9+5KWeVZ03TiCKEDNY bvALBa8dEW+dAA1KdU1GHXWkUdw4jsxSfH5EKccL2WjoVf2eGJc8MVQAq8y2Z+9eDJKc 57u09LfagrQpAysO+WiCzMX8v60TksexXCQLS8iUFqIn7sn+W3Jc73HR7ENCXqBKIebR CArN7pm0Q5LAmAL3fLg73yi2aWsfSj3TihZKi63+0ZXT3qcIPuuaRo9Gel3vueoDFHVr DCCw== X-Gm-Message-State: AOJu0YwDxBtqcExktUkyGRyFnk9JSzdArqyAbE10kHyUYNy195IGxK89 FyvoICQnkL5XY8lPl/Itwnu6Nk4CgONmDtn6Zsltej/3jSOneVfSLyurHioSyBperprZrwx82oJ l X-Gm-Gg: ASbGncuyAP7ztytC0ip39ukarn9ihcD3wWKpSSAU9vNvo7N4rCThon7Q0Jo5Vp7yd2m NodcjE57j9lK+bySKYdwHOs9Xhzd/O7GMFsV+MstujBywAMMY5voODse3xjwk1xyq++h56ELZsr 5UqXpOuou6BlFSmkHrE3n+zsMmrpMWkxxAxh1NUF5phXAvSREss16YXyCAImp1PiZrAaBaWpmRx +3CsG4V9wkOK2K/cGIZRa9Ij11C3fOoHNap9jQ= X-Google-Smtp-Source: AGHT+IFItV2jwz4s/pzCuOCObtfKBthEmNBQAk3XHoFFViHnibem6N6aLRHuCcPKvWyg4re2irKuvQ== X-Received: by 2002:a17:90a:d807:b0:2d8:85fc:464c with SMTP id 98e67ed59e1d1-2eaebf06631mr7804304a91.11.1732226079624; Thu, 21 Nov 2024 13:54:39 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/27] sysvinit: backport patch for fixing one issue of pidof Date: Thu, 21 Nov 2024 13:54:02 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207567 From: Changqing Li 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.apache2 `pidof /usr/sbin/httpd` cannot get pid of the process httpd Backport the patch to fix above issue. Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- ...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 diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch b/meta/recipes-core/sysvinit/sysvinit/0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch new file mode 100644 index 0000000000..33c9f62eac --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit/0001-Accepted-patch-from-Mark-Hindley-which-avoids-cleari.patch @@ -0,0 +1,31 @@ +From 5be52641a10ad6cd89bc7cdb80318e32be7e6662 Mon Sep 17 00:00:00 2001 +From: Jesse +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 + +--- + 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 + diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb index 1dd5f575d2..d3f77d8150 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb @@ -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" From patchwork Thu Nov 21 21:54:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A087E6402E for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.10482.1732226081752053587 for ; Thu, 21 Nov 2024 13:54:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=sMxUv/7i; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7ea7e2ff5ceso1154085a12.2 for ; Thu, 21 Nov 2024 13:54:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226081; x=1732830881; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UFqPA8iQabHJfu8ZiG6+BBo6gmR7U6cVUM3KSAJiadI=; b=sMxUv/7ibmZQM2/6FCyYn/pRzliEmbTcnWB3KFB5eX45aAbokz1sIx6IgGZYRyOI2B nT2uXxL7Cr+yFcFM4UzIlg7a0x6zDnebnboJuMz2H2JedY1Q6vArCKbJmsafHJ+s57Yt /EUy0euCDlHdw3wPHdAPHq/NycKiHQFkhAZmZC1nax8oVLYPqDOK/tBPLJNBXAOgfCu5 eD+uwkp65e61LDaRBet4P//KNtj08giRKG5aYWxm21Ff95ifFkn54roRorTo4W4y7sQz hb5NjWH921dtHoW02mp/NPLCiUJtXaCEpnlLDC7BK3fCH2uvRLW1VTBX/mG4agOSEaJ9 VOYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226081; x=1732830881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UFqPA8iQabHJfu8ZiG6+BBo6gmR7U6cVUM3KSAJiadI=; b=uHivKQfymZwiGnC87iRXOQAqBpluF2E64yUFSpLILEHeoIcl2F7aPShTf7ViWm/sgS 4q06Bdej+UWV0bHZHCR2nWf/IJrdihfirlpKMVJCOHupaRAHyF6P6l+aN3FhRCZObAFx St/bJfPCdFFUtxkNoysSF6p7aFm6rUSyp3sQMAnsUGMulnvg2MUBaO7XFSv4ZeWtlKiN iiHr9rxN9XVS9IOUTsM5umvSH6VDi4XMFER3OtVWljzUsifOFWyrnq/CDIwBgiFuOHIz ba/mmARIdG2YEtmpYmUMbPWhzvETldnABriWl25ZTUOjHAjzCipZgHpNSK+zT9Ok6OM2 hVKw== X-Gm-Message-State: AOJu0YxK/kPAABBsLbE9crOEPQWWGb1johVeb1WN1O2VL9/hGYwsv+Qv MtX/C4mAXafkvLtPEqnr5Q2U67mMedP3b+qNZJRquM+zdTOPl7aEZSRVyhB7PvV4LJwaA5SKxdC a X-Gm-Gg: ASbGncu8r3olmDiOdrk79uX+S7hIT6XcBz6G4oHH/fUz8nsKWhFdV3gAF720sKGh/AF DNhPpYgP5Otjsnh67mT63XfXgSJWxB6Vmm4aDqXKl4tIITo3hLK5Kh9vOgdDke7X7QUFy0yFUgq uAWwYdMEPnY3CxUeKqqwGMT5CDs41MJoWpGqv3pQgtD3a8Nq3YDVHscFIlaVybRrqthJafPw7EA 1dza1HUUJJfFP4rWOPsF2QnEDJ/tngxzUGCqWI= X-Google-Smtp-Source: AGHT+IFGRRtYr8g7WB5gl/d115cVXyRJxyfX/CXid67txNhSUWwfPwQ6LyJNPOnR8YXO7YNyzD3DOQ== X-Received: by 2002:a05:6a21:339f:b0:1db:db2f:f3a5 with SMTP id adf61e73a8af0-1e09e44ab69mr587342637.21.1732226080964; Thu, 21 Nov 2024 13:54:40 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/27] package_rpm: use zstd's default compression level Date: Thu, 21 Nov 2024 13:54:03 -0800 Message-Id: <27395ae862a1beed067a944cbf8622fba31f8566.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207568 From: Alexander Kanavin 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. Signed-off-by: Alexander Kanavin Signed-off-by: Steve Sakoman --- meta/classes-global/package_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 2e3e4e8c79..9a5d04c472 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -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" From patchwork Thu Nov 21 21:54:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B3FDE64030 for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web11.10687.1732226083055642206 for ; Thu, 21 Nov 2024 13:54:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=U+SEpY+g; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-720d5ada03cso1426236b3a.1 for ; Thu, 21 Nov 2024 13:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226082; x=1732830882; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4q/ifew6boFRtv/YlUG+sdLt9dG2cRxsNJy7QwA49sY=; b=U+SEpY+g0AwDGHtuPjd4wkF4TBBhZ5Tra46gOwEVQ8LR7n/jfryy62XhwQl0A5opxs T4uBxnhcAIFWj1lQD+jufhKbuRCC/RXzr+MhI2Wq4hRFrfN5VbHBTkIfq1K+83czPD2c A/QsAp0zrZqhFDxj0D17gSkUKEMa7/yYduexMVoriS/xkkvd7RyO5ROCDzYe/bLwfSLA PthT595ZkmP8Z3FdEgRmh0SASXV4aEWXwjuksHlgpUxVv2KX32TTxYLK0fEle8clWNap kxfXRnzL4O4aeL1L+mghreiGtKo2YOIH81iHvNDyIUMaeVuxt+ieF1Xbvv3C2a5JcVNF vEHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226082; x=1732830882; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4q/ifew6boFRtv/YlUG+sdLt9dG2cRxsNJy7QwA49sY=; b=tT3u7XRPaSw+tF49mXhYNr8ip19RU2bjt/yBbavMQW3+IvLSluszOGWfaOa7RilxGy +9RKEFQxE0FzO0cZhOp0BtBz1X9UooEI1bJoSFT+LXRUpOAZBDHGioHwqbFHoGA5yEHy jqiGhF4VV8kydVlkqaGM+PtYFjb96QeGfKipmTYD6P+z4nGouP5GE/+IIEiN10JM9jqV UvQx1B6ORU4CHMJh9xlK1AZ62lI4Y/DSNpQRahY3DQ9J+FGiV2rmugvb6xky0eS4L9N5 djJwztqVeMo0goP33LfHHDTQ0NyLlFka2WLQgiFKlloF+XJDkGbRDZaay3sb3dtf/es2 ZM9g== X-Gm-Message-State: AOJu0YzC8G/xf7MBybLM3jmsJiVewJK63mUPDU1F1LODjWdtGJ/B3gl4 BVQCl2gPZP4o6zV7Nn1YqgvRvrQ1oJatsXtg/UTD8JuG9bK/Filcf2WPC2TS6NqdFoaZzvWKhHV X X-Gm-Gg: ASbGnctiWAGjdFNtrsnW56bEcIBh4LSoGtgHUqonhxUG6hO5O/E0MN4JtCZPk9v+xOa YGPWdQhryr/hUfDXDbGrF9nO8ddcUkI6b9p5ZIskjZSGmRO9pA1Q7djo9rZt8rFlD5/IL38lUIf 3U7+lYILv8FCPv8wI5RiCgi2gZdMPh//6UbhbEqUBW2/Wd8bsQ2DM8OZxCRRUf7QxQRTaeLBK0d ZMxMsn4igJecBcNRUqflLKDSCMzlv8T7Dww71A= X-Google-Smtp-Source: AGHT+IEZgPln74HjRJA5p0moFptlTtx9wKkmp6m7D0dj/nvEM6NjexGbv/Sslvw1dloIj9WQiKI4Ng== X-Received: by 2002:a05:6a00:92aa:b0:71e:60fc:ad11 with SMTP id d2e1a72fcca58-724df65b9e2mr554651b3a.16.1732226082210; Thu, 21 Nov 2024 13:54:42 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 14/27] package_rpm: restrict rpm to 4 threads Date: Thu, 21 Nov 2024 13:54:04 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207569 From: Alexander Kanavin 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. Signed-off-by: Alexander Kanavin Signed-off-by: Steve Sakoman --- meta/classes-global/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 9a5d04c472..6d1519a272 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -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'" From patchwork Thu Nov 21 21:54:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62CB2E64035 for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.10689.1732226084739485638 for ; Thu, 21 Nov 2024 13:54:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JbcG+qtD; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-724d23df764so861457b3a.1 for ; Thu, 21 Nov 2024 13:54:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226084; x=1732830884; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MTz4oUJ9zCGmo/XT4lG1lJ0MweYd6Z3tlgZ2irakZdM=; b=JbcG+qtDc5Kvahk1yyIlKMYBYJJ9mbKFvbiXcplOymr6SBGLlf/1Jb/MHiPY99NfMu Kws3Ta8gYVEPJOMqshG1+JYagcpqNe8C8VkDPoRqGa2NiAwH0bAMmd/bu820jL4bUhMw +pEyr2iaXFy2JVrx8p5fKTwuGa+OhdzTF2sYIDeaCCTxshhhojNmUpmAa8e+ADTD8qlg zqGOArI1PlZwp5Fexs9bCDulhABc3xjiUxI9WOJ0l8WBcus4f+b/aSswjM9SfVbxi2EQ GZZzBWPQgMg9bCD0rehhTGuzdJyBNFdyw3Ky0pHraLeblvlBeUAB8GRBKUMKhsS+TuNu avbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226084; x=1732830884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MTz4oUJ9zCGmo/XT4lG1lJ0MweYd6Z3tlgZ2irakZdM=; b=CNYinwhHm9YGujkSJ1DBmEnVNoHbXeWGsdTFHjUCZQm+WAsCuRHY2SDjrjzNY2JHft kQ74Ykh7A7CQFbKJvbiY3X5BoOVvR2wpmQ33iG3qANCnwivJ234R3kdvvpw9OvBSDP/e jkBmnV7ZDbeqJlkQejz7oEcHBOH/QQhrQ8IHb7JSMrfmDsOlmhbTMpsDhB51OtRroOyB 7+e3Z6ioxeLpVT713ZiVmxKWoYKDpmaLeqRyZlLiy550Sfir6fXCOVgTdKe6YbeZ+1vW iPCh4u4j9zuPPvET1YI8q1YEt9LDqrqZD5OEIU4kYbsF3jR4JgpQpmxGfSA2SISc6gBI ExqA== X-Gm-Message-State: AOJu0YwjGmByGxoG/yPH3XP4xbYjdy0A6GUU8mOMubfEHcIdYTzlp+Wm 9D4gAXAzPWlw5B+i2MeqnwMM0rznd9aYdwpX+jCRh75wOV/RBQXKKNXRwuq5BC0wZpihWDddvhY p X-Gm-Gg: ASbGncvPdZuVr08maaernb4kqPIjaCN8KkAswsRn3y7IK6kWuHyd22BfEIeqnIddgFR GSl36X1yZlM5q2vErEP1+fx8UIoOpVy/Ozv4MurqJHIYpP1NoGjZYvmVyKZlFigIoRffJ8wIzNo TOCygrA0ZDo5yF+zMvOvJHsHdbGB/xeDuwrOaM6/GoaQ1NYbAMs+OewmJn5qVQUdXvPKbWOhNr5 DiLEuwgI0elvx7ojtT3Ws5/Wfy39P+/QI3uLfg= X-Google-Smtp-Source: AGHT+IGO+NXJ98LpnbMBMbicw+qe35kDuxxoKQvDWia+QRWFTaeq+wvTP4WEOKoU3MjjD43rk+YWiA== X-Received: by 2002:a05:6a00:92a6:b0:71e:cf8:d6fa with SMTP id d2e1a72fcca58-724df62e225mr638056b3a.15.1732226083664; Thu, 21 Nov 2024 13:54:43 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 15/27] strace: download release tarballs from GitHub Date: Thu, 21 Nov 2024 13:54:05 -0800 Message-Id: <6525ee380140779bed100cb0eaa70915677e885d.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207570 From: Ross Burton 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit bbdbd6d943a64e5b0dae4c2ee705d017fb7ef80e) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/strace/strace_6.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/strace/strace_6.7.bb b/meta/recipes-devtools/strace/strace_6.7.bb index f365477ccd..c8c83cdf7c 100644 --- a/meta/recipes-devtools/strace/strace_6.7.bb +++ b/meta/recipes-devtools/strace/strace_6.7.bb @@ -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" From patchwork Thu Nov 21 21:54:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52938 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7025DE64037 for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.10486.1732226087466811722 for ; Thu, 21 Nov 2024 13:54:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=AJByqzrT; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7245a9d0e92so1554964b3a.0 for ; Thu, 21 Nov 2024 13:54:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226087; x=1732830887; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xikLmiroHNHs9rHyNY1Pd2Lk1hzLmdNLLVa4lx2knPA=; b=AJByqzrTRHvTNazHatGB8JCr/hoRA3VTQGnSMDKtRK4F9vqRO8L5yOfVxQ4BTixS6H dxUeqV3wRSM++uS24sXoSPspwePRJN5GKFCu2z8VmQAzZDLKRtaIwbrx7DMP0TP16sjo 3QXr09MG5Advx6+k7a5EZXxzsvPqyifnQAsHaM+52CTZGEMetxWmmlis68X/Cf3rl048 QfcKA6beklfGe+I0xbj+l0GvdeKpFZcR0rV57XqPkqC+K3wUDDRISWnmVOEo/2/fSwER +uo7VHMVL2mEZnSVoZRQrdNXOsLoVo9S6kbFccNArrhrwmfgyjjjZ8pFTg5wA11BouMC 9zUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226087; x=1732830887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xikLmiroHNHs9rHyNY1Pd2Lk1hzLmdNLLVa4lx2knPA=; b=tEhnVSlI2prHfXQOrHTDg4FGp2ONYrG5Xa2R/KebYpjYxlifqI0kPslPYGaJKeGdb2 5IZU9Wf9ltwRAlLIGZ8TjXeBxnRV/UZD4+nFvq22DlSEy4Ub2U0bG7du+ACK4q1tLyGg O9fbxwbxX+8jO+WxB+xkqfbxR+HGOGMaO0aYmtXZsjiazIIyZ/kFgasNUE3xVcLmmK2k J1r3pZ2xIhEZLVkJe6pn4YRTKo4cmfXeIpFvd+ZzxlPl3fbdBvoTIUPcglIdR8BzbmuX b75Z/h0JQ3i81aOfOfBeGupGAJEs+805vE8OjT1y9xKwNpo1ztzd886z0XHWuHg9673i L2Ew== X-Gm-Message-State: AOJu0YxnngjcYxLqCJgaHwtCSVn8Qdgpe7zn1a2k4i9R4qLVXtJaJ6nr jQxnbwtcGfR8PXx/2d2dZdASQB1CMljWrwrvGZivVzCjZ5jhWJurel55MQKZIeCJbxwzYYfYW2o H X-Gm-Gg: ASbGncvecDo55cfGeAfZdPz/j9ApJzZUt/lD7GJeuLujZquavn39o5lT0iVZN0ShTJF z/fviKOVX7p9KmEjjKb5SwJuKjqp8ez658keTmU25oNEdD4tGGUMfVGkazjKMGmn83gGcAurxpG Ad9EfwqbxeKOFnTTHr3q2fjHWDpcCoH+5o4HaReKCQAHW9oKFeqz2uVeLKeMRaSr7F7cXbbaV0D DBrsB1Imctj8GBFrTOGKN/aHvAuYU0Cg15n93c= X-Google-Smtp-Source: AGHT+IHA1dwn0IiNM8PNud3kaH40FcFTmdTcxhGLIVZZOEv3yPutQ9Sa9+HGPI6DXf3gw3NeHdRBpw== X-Received: by 2002:a05:6a00:9297:b0:71e:82b4:6e6e with SMTP id d2e1a72fcca58-724df3c27d8mr715471b3a.4.1732226085214; Thu, 21 Nov 2024 13:54:45 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:44 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 16/27] toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails Date: Thu, 21 Nov 2024 13:54:06 -0800 Message-Id: <69049104db497e5b01a78e93d83d7e6cd4b2e9e9.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207571 From: Chen Qi 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] Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit c8e2dcc1f71aa33cc6e56dfdebebbe7ef010c944) Signed-off-by: Steve Sakoman --- meta/files/toolchain-shar-extract.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 89d30005fd..3b4647fca7 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -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 From patchwork Thu Nov 21 21:54:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 565E7E64032 for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.10487.1732226088552476567 for ; Thu, 21 Nov 2024 13:54:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=qmD+QMC2; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-720d01caa66so1413093b3a.2 for ; Thu, 21 Nov 2024 13:54:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226088; x=1732830888; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cC56nw6kMVWH56xnm79/HVpJuEyzniQEHrzwswpKdUo=; b=qmD+QMC2ri4ArFe0XM+mQsyoJfneaYrgrnGkmcCHDf8TXlAOPnXFSKbA10HVH3Rv1N zjd5DWisaJcjGVouZtLiMDTC4gt0o3UTmUOw6zksjH1WzSXHbMxldEuiiZx/2sNfL/uZ plHImzSyy95EGXrb3S7KpyiygGmn9HE2mgTph0Jaqan6L+xfwH4J/0C0JNzfpmzkphQ2 2NeodFBgwRfvXA7QlziH7RS4HdxQf4MmO09dxySPxjyBuH1HpNjI+hjcLj3CLx1YUaeb K8v3M3JiSvp8w6aVmWM4C7Fp63zCBtYHFr5DM3cbu5L1/mV8d2TqV/BkEBZjWU6d0YAf HwTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226088; x=1732830888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cC56nw6kMVWH56xnm79/HVpJuEyzniQEHrzwswpKdUo=; b=T7u3FvZ1RlzZ/wzBVQHpzUQ9zCdgoqY7+KdJioaiFxjzdpx5KD94aKG/+13tPoszy/ oRij7AWH5oWfaCgHPLdLYaxAvha4OgTYgqtQI/aOfIq73HYUtEpxMJvBAQh/QjTjxnOc NAHSgNvXaCl/BxGaHgy2oEaRLO2P7HYJc72/ARE6vwDdt65uNXEh/o3wTGUW3NEHJz70 kZJqq3os0GV5Go3GOKtY1YfvQArvnNiirq4sPKlR3xQ4QnMvlEKSg1Ok2I/naFNFJUf3 6Ahmnc96KAXQVa51YthhxzLeqpmTFXMfdGj6ddV5CKztMT4kDjeX1r0U0hwXr+azBi0x lXIg== X-Gm-Message-State: AOJu0YzjeE/vknQ1NTM6VQHLpRxdKqujxWpZJMLkjaiq6K1SIrAI7YlQ /iR7985fxjxTOhiQKAfsxM8D7QesniF8WL5B+tNRai+5OEX8/7SllvLZeu1Gy8CQoUKCmvCyhEC / X-Gm-Gg: ASbGncu9yAmpnnC9nvDZUF2duXCJyK77QOVTvLAek8fycz4tZkili57WvMSPURzc6Xj 1ZgP59Rcsr/KxN/qctVwhR0HLtCwpbkt4pdBwg5CLJ3rOnxirwJGmjYJbdG9RiYv+63+RyajUCA w0CfAB3xXK7h0aHC3sOZnEykhduIpx7bU8QOIVW6dGZHUtkVkxgiYWbrwmgw07PXa2GbIMdcirK fTgX4UINdFu0Itu0L85+/UxRAzwRe+9wFW6xZs= X-Google-Smtp-Source: AGHT+IH7/JVyKpzoVQh9ypapcJtrjcLQatA6muaJUdtzXFqCzHLUMFsFPTIAu3Gt51s9UT9Pssqz1w== X-Received: by 2002:a05:6a00:13a8:b0:71e:795f:92f0 with SMTP id d2e1a72fcca58-724df3c81cdmr861341b3a.3.1732226086524; Thu, 21 Nov 2024 13:54:46 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 17/27] oeqa/runtime/ssh: Rework ssh timeout Date: Thu, 21 Nov 2024 13:54:07 -0800 Message-Id: <0387107538d0528e09ef3c92d7ee969f80781770.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207572 From: Richard Purdie 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. Signed-off-by: Richard Purdie (cherry picked from commit ba64ccf3ad6e40461219b72d60eb0fe5cb38fddd) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index b86428002f..f5b76edff4 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -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)) From patchwork Thu Nov 21 21:54:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49FC6E6402B for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.10693.1732226089048162575 for ; Thu, 21 Nov 2024 13:54:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=EP3Fg95+; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-72483f6e2fbso1316659b3a.2 for ; Thu, 21 Nov 2024 13:54:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226088; x=1732830888; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NC6ZejAYjq4zzs89Ie3/1zeIkqzDxLx+DF3EOIoe5U8=; b=EP3Fg95+RsEDmZTlVnKZwKNQc/An6oh8HZOt40xvr0Vd5Z+FzdJDZHfQhNSDqDBWzC XZUccc7linyQWexB036ziDtrNnadKfTePlNiVfaXEUH3Bn2ZoybVx2t5bdWGU3EIb2C5 wMM1Oh+ae/m8EEY8YjeZoxi7CoiEjmGHIN0FfqPgJ2Dn2hvhA5bSMzkO8o+oIX7atAmq d5VAanBdvnX2eQPLtNDRh8GctDa39cR8mNjeTy0IXh4GqJWIKZ+BOVTkUqXVaFI36dfM Gl1IPu0MINQwUzeyFhdiEV2Mm3dpYu0B6q1tj4XdlfVKpHQHf4ylKwISw3n9GdQ2TJKQ 7LPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226088; x=1732830888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NC6ZejAYjq4zzs89Ie3/1zeIkqzDxLx+DF3EOIoe5U8=; b=BG3MwltkeA4QxFPyeubGKR0ajZ0zHDZWlhcxjlViRrQ6Dsz8Vku+KI+MFMZIjNPmig Fk87ALIUop2peqlku7tiXFkWEUmqzI1aJ6LZqLISLNvpS1GwLsdF66p1e37TEDFjoppc h+DDVmRx7vMM3pEcEaL+cPKz1C8K1wUH6lS0LOEF2teZdSXUtKbZNZiLnkbcKiDf6FyL VLGxCw8fy3LUXxlzLuUPbuSBCABIcR5hzVzrzyY1s//XiwTG50BCFUDqBAfh6HmSDMxs VZAYC0GIy1P5KiBG4vAGEBOBGnoUMfHRrzg83yRWLg7r5GHmqYJCasiyQH3N3TIC3YWs YBYg== X-Gm-Message-State: AOJu0YzQimeqz79O5lFE98L3cQBMfEA/MXlm86ohpYWkZvdysoe9afSY 4M94Gv2zwT89j86fUGEt4+s+HjQyye562DfZ79mgV9etxzfuZqn79XiVTYD62v3kJ/73sNiV0xG 2 X-Gm-Gg: ASbGncuhXNa8nN/NwpFHw6cCm9+eaTrJwiEfXh2Fln4R/LNzn6+GwmJy41YdUiovAPx c2Iiu3qnTrMlxDMJbVJSKINNZlp8v6ourStPKN/dLi/dzLpLIC1qAxITSRKdBQpWFxkz02k7gcK p8uYsAkTAYqcOHVNskxA3lkhF22U8GwFOafpofvg7Q0uDzNJJhnGQVpH8GrUShLTcsz6PpFROlR zqhGXjOC62ESW9pGi92u4QuTwj5H1iEHtM1L1Y= X-Google-Smtp-Source: AGHT+IFt8yB82R3WlH7vopBF+GNEj3Odi92mE1r2lAlHDaTtyJoEC8rrt4/LhqCnI0yzWNzEfkZ2Cw== X-Received: by 2002:a05:6a00:2e89:b0:71e:8046:2728 with SMTP id d2e1a72fcca58-724df66b91bmr884897b3a.17.1732226087944; Thu, 21 Nov 2024 13:54:47 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 18/27] oeqa/runtime/ssh: Fix incorrect timeout fix Date: Thu, 21 Nov 2024 13:54:08 -0800 Message-Id: <2d3b826b09014ff27a3d00706f37b7623dfed76e.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207573 From: Richard Purdie I'd meant to change the command timeout in the previous change, fix the correct one. Signed-off-by: Richard Purdie (cherry picked from commit bb991988cb23be2c8947171726ada321f27e6eed) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index f5b76edff4..89d64430e5 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -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)) From patchwork Thu Nov 21 21:54:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CAB0E64025 for ; Thu, 21 Nov 2024 21:54:51 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.10488.1732226090734348566 for ; Thu, 21 Nov 2024 13:54:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=OFBbPJp5; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-724d23df764so861519b3a.1 for ; Thu, 21 Nov 2024 13:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226090; x=1732830890; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QIJxgV/5p9GcdzEVlE33eqafzL6l5SEnMn9lwQcjIbw=; b=OFBbPJp5WTsgdKGlMswWWqlFewQHI8mvh3evFJ8KOEF/iNLP5rxmzNtrTOcA5KTiLv 2/hFMHJ7ardF1q59D/n8Sug5ecBmiJsb0u+APkg9DTAfYWnKYAt9aIjuf0RlX4KCRI50 l8k8GA6345vdehfAkN/lDv1RX4ZIpkLMnSU+Uy6J81sjaoJyeGZWn2xPhCGrD9nkgFh9 9gmLN/5MtwxI1C3KU7bAg7xhWwGFJIf0qEMpoQ4xQ7N8OQ/CArGR2fijW0nlG0Htn6c5 zYHFZegHuYO39kjCnEp1x7/48HcwPm9jKudHdqtwG4QemEFtK64AcwQ8Vd+G2tS4WUH0 ZbfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226090; x=1732830890; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QIJxgV/5p9GcdzEVlE33eqafzL6l5SEnMn9lwQcjIbw=; b=lWza4wx/4Wy8DPDa4gazK94qzDKDM3F1l4xIcF0wz27gWEMR/gnNusLS1sgXt2hT0j neIDqXqEAdU+Yso5hAkUoFX0zMES6SV2cmYq9KQjxOWMyYQobdxCu7W+uaDuhUd1VCKW mYsG6xr1xP9acFiUuaRtNB2pWxhVmO94YtrCWzZpa/eflLD1zDXwin3ylO+tlAV0xDiW Bu/TFp6ZY7+1sFJPEuX8Be1IpPM9Pr/e9wNWMrwGmRaYc7QbhDrgF6OstxsSeP+7NJhi N2+bNY1azN5NlFwbauzT3vnMTVjBvhrhAyVa51mtBBpdYCOcgNoyuxZaFTUr1WEKkZHF VN6w== X-Gm-Message-State: AOJu0Yx5p61GN+qvXMLWwdPryg/ajVFICjVNskSbRRKkJt/MsYnGpDrr puZSuVxbB8LaP5+xbdMN4UEqhc+ZcNvuvqXcoqna/iYp9Y43sBwnRyy4n++111Au0a326XGx12v d X-Gm-Gg: ASbGnctIiskgmoTZUUd/xtk0psP2peBgqi12u9uP+2kEFEnw4K24FbkERnR2RJ8WtOd SUPDyGLc0SSLc0YX6wmrY6tnOf4/Zk6bzKXa5EAnzYCr1KJGkh+7KNcIR7s3CvuZ3CnIj9jE5ZY XgvPYjXnktmebDuAv5Jopsq4vaSv+U96pAcxI3c7Ps3knLKr8R8Rja3343vS1UGUoRQoXrJBGI4 X2ClwwuDcejWP2C0eEjL4HXpTG5XSsJEfHbLN0= X-Google-Smtp-Source: AGHT+IFBr1WOOTLFekW2MQ35HC81RXs8vLQo5E+SaIiILQgYsrDDdJ+1FrtUPRVHSymmUT0XD5itjQ== X-Received: by 2002:a05:6a00:21d0:b0:71e:7ab6:8ea6 with SMTP id d2e1a72fcca58-724df6a9129mr645445b3a.25.1732226089957; Thu, 21 Nov 2024 13:54:49 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:49 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 19/27] cml1.bbclass: do_diffconfig: Don't override .config with .config.orig Date: Thu, 21 Nov 2024 13:54:09 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:54:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207574 From: Robert Yang 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. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie (cherry picked from commit 6cccf6b02f92dad514e65fd779ff659b19eb6be7) Signed-off-by: Steve Sakoman --- meta/classes-recipe/cml1.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index 03e5fe6f47..456305a315 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -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: From patchwork Thu Nov 21 21:54:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52940 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C291E64030 for ; Thu, 21 Nov 2024 21:55:01 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.10490.1732226092266061671 for ; Thu, 21 Nov 2024 13:54:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=m/JU1nuE; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-723f37dd76cso1454265b3a.0 for ; Thu, 21 Nov 2024 13:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226091; x=1732830891; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=h7OdZiHyaYU9qNLb/zG5/Urx/dltNxSUap4SPRQKUlQ=; b=m/JU1nuE2/Ue50bjRS7UumCWBfhRUjCTMI+42PhRdw2Ae+a7+gTf1oNE24oIOh9a1T dpMLl7uaUNXYBvOtzc5D7jci3BMUWNK0IrwL7eK3ukterVNXI54u9Dx0lSXEWQZ25l8z k+aHUsf9ibMLrUtZCchyzxYSzIB+Fg+Y8qKa/V/REx35coCXLWGBrfqzIrbLXJmMSV36 ln21wl4Bk1OgJo6prJgI+PCZPNTiLjP+YRv/oehfJ51cpzhhUy2dP5b4bNVfv1nsr+/Z ZhTOy+H6P/Coa7JhuPWCIL4pfeTzE5R2fIA/tTYbwS96nbAtmtmMqUXuOf3y2WXNAzrY /whA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226091; x=1732830891; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h7OdZiHyaYU9qNLb/zG5/Urx/dltNxSUap4SPRQKUlQ=; b=bIcWTpiEDAsk+fGVs1Y7JIDSnBf1KSWnQIFBU+dcIHCOm5tPFmoxd8S77DAUB+iIKO uFFZu/9DCIGUX8JIgw4AIDMV3gzwck9egaCqJid8/HLkTc/RShKKsU9a/KVwPf8Qjd71 5IWZyspc4voTPhj6EjPxiu19+PBKDJi69TnOmRuJVIAFEEPWLMjyf2ZiG45gE38ZzMb8 lSAfAaEP0sH3NFApojV1FRbwsUnE/D4RgXdvdiap2W4b3YzhUNxTQ1k+DaPn3nXHQwXH 4fWGm2kI7usndB9BDSuiNqVmwq1oil+rsf+EcTeZNTX2wOhRe0GFZyjta6Utax3dsk0l 4lDw== X-Gm-Message-State: AOJu0YwYUPWI2csDfJR/QTl/Wgce22RqDhitQJQEUSJKK/W6qp3vZalZ kFDkDs2hej9Zevxwul1dJzFaO+C9cg2sM9oa5F44Dossl/mOQRQ7EgBOKmF/9SbaUACRhNmSRx+ w X-Gm-Gg: ASbGncspFCjcS3HKw7fFmlyN37jxpBiIMR6n6UaLSgEqlYCWyPNCt24l1nZ9h+lMFrN tXVI7aPuL4RXDJ6a8qva8D2GsCMbOXozDYSiCAsUEhvmgXJ5IjAdwCg/AsYsVWdfzhdeaAZmqh3 Y975xJk2oxmy6/8e/X7nHF/0u4AOsz+BnGh+VugS1Eoql1jPZyx/6ll0lOeaJ8uvBDc8s895PjX Hmnn0qdqoDgsPMC/KaXNqMTrxbjx/hsCDrKgDE= X-Google-Smtp-Source: AGHT+IH5CqZKE5fERWJSOGohm5OQXz1HnEJiLuVEl4/r6c0eI7QwwZB8UpCkNqRtghTN5cRgCIFZ4Q== X-Received: by 2002:a05:6a00:23cc:b0:71e:6c3f:2fb6 with SMTP id d2e1a72fcca58-724df5de0demr903047b3a.8.1732226091440; Thu, 21 Nov 2024 13:54:51 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 20/27] package_rpm: Check if file exists before open() Date: Thu, 21 Nov 2024 13:54:10 -0800 Message-Id: <2cf4c9179ac67c64f66813a2cf526cf5c49f79ab.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207575 From: Pavel Zhukov 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' Signed-off-by: Pavel Zhukov Signed-off-by: Richard Purdie (cherry picked from commit 4ad9a0e0b11eb7bc5a3dd45fc8945e094ea949e9) Signed-off-by: Steve Sakoman --- meta/classes-global/package_rpm.bbclass | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 6d1519a272..4a700ec124 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -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) From patchwork Thu Nov 21 21:54:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A731E64039 for ; Thu, 21 Nov 2024 21:55:01 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web11.10700.1732226093746799818 for ; Thu, 21 Nov 2024 13:54:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=KmWbwb5C; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7ea9739647bso1188709a12.0 for ; Thu, 21 Nov 2024 13:54:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226093; x=1732830893; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2frCu3S0iPIxXvlmiloiv1PEdz3W+5T/tBYyTavbGb8=; b=KmWbwb5CidPDe52LniQKUgT9Tzt4s9SNNTbsxN2FO/cP+KtRFJTE2nvoXKwPykDHyR hMxJTj5mukN/JNymB4wT8W1tLsVSwJpUP/OmgCFXc3M20Ned7hRN162KjENn93kX50Ww SDxh0haiOyvtYRC8Cbm3dGo7COyfV4HoQUmTB4j+fCYWiY/4FYoFppk66l3r+dzNukh5 RCURPcQ7LEpUzwzjyz2UC67JEFrLBYXlkcEvXw1zd8OBzmoCbFIcUjxY/IB0k4Lj6wSf 8xTjCZ0hni0OznACLmk+E8wiSoO7WOwdR5NJVtv8TO0FG8TE6FP4Thex+8aKeQZ7O2wQ K0RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226093; x=1732830893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2frCu3S0iPIxXvlmiloiv1PEdz3W+5T/tBYyTavbGb8=; b=XDqbxR7gNNFL+J3Y02gEHhR0LAxCiWaFfv91rvHLGAFxBZf6LX8Kpm/+6nSrxPGCEv rPqjnz65xZye7dzkfeEoy1TiegJt9w7U+ywLld27DTI+yfW0+YUD5sLX2Eny6gg5DYyg pmxwPQnzPpwZ15zq39RIqq/2FIC1EiBzuCYTmDoe/7g/ZhRKDz6RmiPhGMXw/ESqYI2m J/toYb+f6hHAZwXNi/r0/onHYOlyMhLrox7/GFPudFjK+Dkah1UzWHuthiAajAXaHeLS IACC8JBFVbZeKWEpAB7aGqHBb3N5AQJCmEQ8h3e8pLpP7GunhkbACcCU7BzYdYhMRZeX KOtw== X-Gm-Message-State: AOJu0YzMJ/P+gW6QNFG5cDDGfSOMTsIOOBSxIsrGKwgobwNLfu0QBG3X OwZQKYo9BxLkmDi6BVstVUGqmajt7+14hIrQsnW0dksoMd+vU8WByECYjvSajTXJgUzSv7+RrnN 8 X-Gm-Gg: ASbGncvADYaU7E4Nl9f0RI7VrT7MLN2blApskx7QT6w9kEDAGFrUh0Ov0lkdSZ3JU1P YWrKW1oyMLSBYQ1hb+b/t2F7vHsr43jsx4z4jWaJ0wH8824ZSHu0iPe9fIVH331E+DOQ/HSS3s3 qbN1yL6o/z1PejIIMUGUnCWzQnLYHXHJwp0hk8EDhnoba+d8GtMC+6F1TaXIMe+GbKwAM3fDMeD LMDNrwSAZJ/r2Gc/5uarBd4PqFXJ1uE5ej1RZM= X-Google-Smtp-Source: AGHT+IHP833maJvGrc8WB+q9lLQc+XORFUIGXhUS2hdrYrOg54KerBVJhqwSbgakitK81uVfVWlkfA== X-Received: by 2002:a05:6a21:2797:b0:1db:f7dc:f10c with SMTP id adf61e73a8af0-1e09e584e77mr479329637.28.1732226092911; Thu, 21 Nov 2024 13:54:52 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 21/27] qemurunner: Clean up serial_lock handling Date: Thu, 21 Nov 2024 13:54:11 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207576 From: Richard Purdie 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. Signed-off-by: Richard Purdie (cherry picked from commit b0732ee009ca47580d1d2ad75334f4aa50e6efd5) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index cda43aad8c..f1c2d2b5c9 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -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()) From patchwork Thu Nov 21 21:54:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F5BEE64037 for ; Thu, 21 Nov 2024 21:55:01 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web10.10491.1732226095188869780 for ; Thu, 21 Nov 2024 13:54:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=RKbK5fqd; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-724d23df764so861564b3a.1 for ; Thu, 21 Nov 2024 13:54:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226094; x=1732830894; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SLmXigqoI58DgK7XiIz0/VNXT9LZFROAqvxI19JHSb8=; b=RKbK5fqdESgsPy7oMb8wjmEg+YJcJ1leRcK3AY0mkx3YUVSv8ggkxzKKHE92s/eNtc 6CBC2oj7K1i+lWTclXD72Twn7Yc7RqP2IMRc8gMMFR7L+DLoK56wEjN5fC5rNK0yeOJR GbpZbYfk5ueWo6etQQ0nh/t0ycSGDwmGNn3X3MFSYxzO0wqeXSdPksooBHiq2rw+o/r7 MbZHS2ijl3AEUMVAlektshWMdpSni3G+9JumwJAr68nDHA9k+RYPZPVrfUjkMDWVAB+A 5NtA7lOqeB5f/RAzzZu94f/+IBX4rRAgyrmjifsFidGc+51l3MvOBIFhrmy6v84Arhb2 /iMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226094; x=1732830894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SLmXigqoI58DgK7XiIz0/VNXT9LZFROAqvxI19JHSb8=; b=uMlz8rgGTn+D7MCVzxtEwjnrH6QoaPr1r7ZwZJpgCEhDh6doVtWAsdLCurSkl7khrv 0YPvOcjwqrHwZZe/DoeWLqhc1YNav/GG7OWuis8oSiR7FqkkZp22OH4zRj+PDOxonOAx HeCSQcRF+zffjMr9gpgYvZ7A9POhg1ULQf2TCLXS1h32tf1OBmL4NeTkIWE8lJPBbfXK 0bkFBwNbNgXLKM9lGcjCWfX8TALG1DmaTrn4GjhTpiwe4saN1z7tLNKLroTw05DtJjW2 OZBTiRa2+c6AxNPIPDvv3SD5r5nkY8NXSjy2fGM+ST0L9Jxmlu4FOw8yNfE9wH0RT0Kj k4fA== X-Gm-Message-State: AOJu0YzrmZ0Wx7mrLT8qcTUxH0AwtUP5SGj9aN38hTNiVePLjHu6kwfK MfzA0l0KPZCDU+p6X+rlAlsuf4BuuWgYtKIMu/wLKx7Qb/KQGHD1bAqsmM6/MM/cfJzvQkm6dRk L X-Gm-Gg: ASbGnctcWNBNh3e/s3Aw1pdQAOSjnFUwN6ECTpcxGDtztGT2869Z+EQJ/Tc3ClV8jxq SfyDmbFN4m6OTwodFCS9xq0uU+0tF68iF+ygVJq0asyFA5nwbf6flKzzpOji0RTR3Ro36AA5rmW tv/MnJAmmHitYnOzdQU/XWquki+xUSgV/uqR0M/g/fpiMv+qdLxzis2urmEEz3WBZi0I2V4R+lK 5seZ7WTuAOhbTrGDAAqZ+51q9fUCRROikF1ZZs= X-Google-Smtp-Source: AGHT+IFMzqorGOiaV9AVRMOPt045qQ/KJtjuMhlNBZVeJYUeW7sFp4GRbekSmSITgb1yNvEkWBI3tw== X-Received: by 2002:a05:6a00:23cc:b0:71e:76ac:4fc4 with SMTP id d2e1a72fcca58-724df6a2926mr722423b3a.21.1732226094293; Thu, 21 Nov 2024 13:54:54 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 22/27] tcl: skip io-13.6 test case Date: Thu, 21 Nov 2024 13:54:12 -0800 Message-Id: <12e7c110d14156cd1e6284a79a9d16feac3b4059.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207577 From: Ross Burton ---- 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 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit f69183586655294c9aed6687cebe57767c2f3eb8) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/tcltk/tcl/run-ptest | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest index a403a74bb6..c485e535c7 100644 --- a/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -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-\*" From patchwork Thu Nov 21 21:54:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8943BE6403C for ; Thu, 21 Nov 2024 21:55:01 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web11.10703.1732226096526782908 for ; Thu, 21 Nov 2024 13:54:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YXsA/v8O; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-72467c35ddeso1958818b3a.0 for ; Thu, 21 Nov 2024 13:54:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226096; x=1732830896; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xR3XzQwId3B78T0KDvXSYIVDvrN6ffT3J6X+udF+pTA=; b=YXsA/v8OlKsPOgABUA52CCatl4St7g+2rCf4prFJPwNHJlrm4EohUtEiZbJPaKTmOV P+78mhm6edRdNgY4LHimbvVRr1949VgmBj0YcE6gDeRoh6aPZRDT8Z+DAC8XgWDuMxNO ekaCpo9XGmQ87AFK1dbmlHKJDHvFhjukuwL30IZpfWN20+Uxo8nl3jhBKfO5cf5RMgRS 8B6q71veE/3vjIZKY3IPxQdttzHbSz6Gy2kjlTQ5DYcBXJQ3zQ3wylP8X2r0wV9d6JB3 Nj2F76bsbe1gao6xKrEEEnNQfqCaNmkNwLr+tcG50AuzCh7vfalL02Q9+Y5yKpFZZvJI AzyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226096; x=1732830896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xR3XzQwId3B78T0KDvXSYIVDvrN6ffT3J6X+udF+pTA=; b=P3i+FeT9p1DPaA+w9KWRVDKVuCf6wbUTJCQbqURX4/pe/A2dUg8pOJG+E1keQ85L2R w0DtZk3HOrXhO5hkpqKeLnWF16cVhAhv0cvXApT/Q5nHRK2/wekmWvTDHLb2SuXhJT/s qzEvtk8t+kPwfLUxE3ci86JwmZacwWAgJp8mKOo+vQmgkI+ZNnGyom+2xSchDO8Mk5h5 QshqwbyrZGhKUp2oXbdyH0nVP6Jdyn/et96+y5SSUl+/UFCtdSG5rMVlDSR/v6jnn84X euQXB0xxlVdEsESLjBy2NHLFFlKncpTA0BsoFRrgD/NkqmlVawd6BXNQnvID9vJtHgKQ PwVg== X-Gm-Message-State: AOJu0YzWsjL5oVE6cPPEcdG5dHqRiC9PdyjkJAD9Mgd1npFkiMF47fi0 fqUqoh92xKH8h73MoPRwkkbp7huU6NQLpNy1VErrRLUPVDFMB5yZg1QdOxVvK40AVhKeIE5ahZK o X-Gm-Gg: ASbGncve9FlJpXD12ffT7qcW5Dui9cRPtzY2/MQ0h4L/YWacQ6BWYiqlMCM0zlPVDW+ E2O99wXnchMYFyoWUlXVLxxi2h2uOynseDdeID8WFichjrrwBtRN8OK4nnXCyrfBjTm79ZkO9Fe u/Fat3ZgmBXtBxNspaSfuIfmuNFGBGieLW6uVFzyKhvsaCTAG/avMPXJS2IrM7FELSlV2303E9s mfjCbHc9AEChGWOJwuMGvlY0Bh/DMOs0ZmYW70= X-Google-Smtp-Source: AGHT+IFroI2mk5wNZo52nwZy9QUWfrw5MjCsmqPMe30EzDOJx1+ZMXrLRD8+7U1VPm3zdCfQlFWLow== X-Received: by 2002:aa7:91cc:0:b0:724:d05e:3845 with SMTP id d2e1a72fcca58-724d05e39b0mr5601901b3a.4.1732226095728; Thu, 21 Nov 2024 13:54:55 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:55 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 23/27] groff: fix rare build race in hdtbl Date: Thu, 21 Nov 2024 13:54:13 -0800 Message-Id: <135667502437b1b805711b77276466663b17fed3.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207578 From: Ross Burton 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 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit d590a32423d05cefc4e7282f971f633b3fa0b941) Signed-off-by: Steve Sakoman --- ...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 diff --git a/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch b/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch new file mode 100644 index 0000000000..d9455af2ac --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch @@ -0,0 +1,38 @@ +From 12169aa269341753d491a69e9adb86c58dca039a Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" +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 . Thanks to Ross Burton for +the report. + +Upstream-Status: Backport +Signed-off-by: Ross Burton +--- + 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 + diff --git a/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb index 0fc4f831d8..8a16321479 100644 --- a/meta/recipes-extended/groff/groff_1.23.0.bb +++ b/meta/recipes-extended/groff/groff_1.23.0.bb @@ -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" From patchwork Thu Nov 21 21:54:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52939 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70EF3E64025 for ; Thu, 21 Nov 2024 21:55:01 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web11.10704.1732226098226298172 for ; Thu, 21 Nov 2024 13:54:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=O253mTtX; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7ea9739647bso1188759a12.0 for ; Thu, 21 Nov 2024 13:54:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226097; x=1732830897; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=m5oOFCFpI6IwA+PzzonMbGpqWHBJ9FCgmFPEOsPEqoM=; b=O253mTtXyMmxz7n7uHPX1AO7QbVFAK9eHwk9GFxbLUft9RS99WrzHexpC3ZS3kEZYe RMRfT9OtIx2UMWGmtASpiPXxabWAfmpUQ/gIv+swTQO34z6HkdYNexUZmagvKvzUtSeK 5keygJGIlx5APwCveZot7gyEAvJVKgcmXdgoFOwldgjfonhbZfQPOIk5452wMvveBLbY TdClafllu49aGteMT3OuroIWPgZETXbxPJXJzB38wbCrvVTA+m2wX0ctgYCYNl9Kn8nG tD30ysAKuAFxOoo+yxzOuWCXMiWzDE+vKyAdmszxNFEsMa17CBKwCbI13mCqoHIdBceE On0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226097; x=1732830897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m5oOFCFpI6IwA+PzzonMbGpqWHBJ9FCgmFPEOsPEqoM=; b=UH22Qvgyi3ZT3BY4/a1er9SwpONtoQ5nixjxHYoNF6cieKGlDDqBAK3cudgxrNA6tB oNdfVe5jYZYYVn8MVHXCjDRleeoGpcYfNIiXu0TTGRvg2t99qNqqohdMcxUtDXXFbqQl 6ol8NkIujuhNPj3C5bVMQqv9r9wpDDvP/ac75Sbho+TI7lTHGhfhrJfoveB2gJHUAaM0 hRfgt+ncbQXN2aqrnNcgcWIupcaevTA9QbRAeEmzhRq+BKeHjhKHgWQX8+o4vuLl9NR4 wANZwX+bF8SHuyYx4L/GOw18PH7hn2NCXiqjYYyO56H2GAiO1iZwdU8G3smIBQMA0Zwb 5l5Q== X-Gm-Message-State: AOJu0YwowHfYpMo91KlG7BWtmJVZzBJeYulFsNbEXw9+nrlzMqz5d/UM ccyIzy0oN3CymNptR2TRaERVWzEiXAlw8GaOFKh7VfzR49sDMXCLHqB76HkIGFKIlJhJ+aB+uGC n X-Gm-Gg: ASbGnctAfe4PaBv+50ThAP8JFCfXCKvJDLbU6eiyD1j6Fnf5IfKeq56ITro6p0P+/yC w3EAXbzyXPFNcOl2CP3IXk4O+RE2Jy6nC0vKNzigKfo868pujPb6e8ZrnK8YGvvMj9/KfP3Jv7F fAf1IvSCR0+8AQZXuIo2/nbPzP7ca7ma+rgPzouFpf39YhFNCEXrHy7OdwtKncgE0ZCLeeKJqpq ul0emRJGgarwT0bR8N/MRVBU5l4RnanUPUTC1o= X-Google-Smtp-Source: AGHT+IEaVUOkQ3AupD3tHSSdxwU/cabjWDXKbWgGhRfUJXHgeF/1wcjUzuf4bRQHkLy7wm1lu5jLJg== X-Received: by 2002:a05:6a20:4313:b0:1dc:37a:8dc0 with SMTP id adf61e73a8af0-1e09e4a7b38mr644272637.21.1732226097252; Thu, 21 Nov 2024 13:54:57 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 24/27] tune-cortexa32: set tune feature as armv8a Date: Thu, 21 Nov 2024 13:54:14 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207579 From: Jagadeesh Krishnanjanappa 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 -- Signed-off-by: Jagadeesh Krishnanjanappa Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 3b898270aca62559dfa42ed71d296fe8a8b46a41) Signed-off-by: Steve Sakoman --- meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc b/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc index 25bdf12b18..0eb938a240 100644 --- a/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc +++ b/meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc @@ -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" From patchwork Thu Nov 21 21:54:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52944 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C33AE64035 for ; Thu, 21 Nov 2024 21:55:01 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web11.10705.1732226100302293970 for ; Thu, 21 Nov 2024 13:55:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=T/nGUlub; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-7ea8de14848so1302627a12.2 for ; Thu, 21 Nov 2024 13:55:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226099; x=1732830899; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=r3kBA5DkGas62gUhUUtByt8cuvsHEqu2EMaLijKXcTc=; b=T/nGUlub9fAb8idyXim/kjelLxfabff+H2HXBMHbEQb3pQEcaPNf/GO0HfSIiTVfqu 4XY7+QkStFaDW/am9Ukpp42Z7oW3JukpP2OGM7ZVuieJ/4dvRGyZRdlQ10Gtbe/HY5ji SzSERUiPYRTszY9bEVqA3QlJ9b1o2kPqNhoz8+nggAMYtbMSe8CxacgxkbGOMA/kwUW9 DK/nsXmCtFKKoKxqMKhVFWZvU2ABI2CH3mcCnhLdxRWt/jOWDaAyZID8Fk9h0eQ33Kej WMoICHtWxqwupbpcH0D5NT5oqCC+ESDNMUcwE50zzRseZ3Ks39jhdHvXav0LMgOxzD0m cn6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226099; x=1732830899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r3kBA5DkGas62gUhUUtByt8cuvsHEqu2EMaLijKXcTc=; b=m7k/URfLG+5AxUOkwXMPQnevs708akYKc33vLH5Wr1Cdjj3jLYn8Bluix6GictivxP NfWwiibfrr+0L2xSUOqvzKza+OfMXQBID+7FpCT6AR4rC3md3cdYlu8qZztXAXuTD6DK kuL8qUIXwaufr6LBU/plod88ocYE9jsnFxYL/tpGB/yRYwf/Ula+AqvJFv5bNCoCbzuX TyUQy0MA9xtageZ7fLMhn1ucb5vSo+8KqZl+Qj592SsuQbcRrVjPEEB3J5PkqS/mIGH7 9nj22YgGX9IV9B014NqA/qskNvp9LeqbSDct58gGlWIhirHNPFZHgjssodRH2EmmM3tX BpCQ== X-Gm-Message-State: AOJu0YyaAK/RC13sQY/kpJuDxXYcqZDBVCubH9VhiWfn3hNtnVh6Ourp J6/RdJdO7TXDw8cLWp7l216tfMhiy9ZECGH/J06mt1yPfqJenQ70GfdIpvvH95ijHCOOxLMFJXa j X-Gm-Gg: ASbGncvzq5fNpaPVVnacGkTtCki0KKySA4exsidyK8hxvhsij1eVipbiqAvYyiLTOqU SBOClyCeuzRC5MISI/B2PmrYGFR0fGEtmzFJOAoo24Hv9egemf2z4MBrdeTG3dNXqyM7X9Ivf7b gRcBYdhu3yiGtCFLfmStdMKcgasVSvzBBVw7PyMttmxm1i8IqatHZ8/DvHaZiuZ+HnfZ9b/s1k+ QJM3kphXsJUD8P8mL2GnylNBkoI2tWBl2dDUoM= X-Google-Smtp-Source: AGHT+IGK2/vU2beNMnyi/FY5gqQyEHnTnAEL8bHfuFy4KYiPqKQ+p7+iT8Lb+AwinILTIcThc8kMaA== X-Received: by 2002:a05:6a20:4303:b0:1db:d84f:c7d8 with SMTP id adf61e73a8af0-1e09e3b6c96mr648872637.2.1732226099349; Thu, 21 Nov 2024 13:54:59 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.54.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:54:59 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 25/27] udev-extraconf: fix network.sh script did not configure hotplugged interfaces Date: Thu, 21 Nov 2024 13:54:15 -0800 Message-Id: <16c74f06c2573045698827321928702eff6c3843.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207580 From: Regis Dargent 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. Signed-off-by: Regis Dargent 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. Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie (cherry picked from commit 160f7139172ffdf510a0d7d4e85f7fbaac7fd000) Signed-off-by: Steve Sakoman --- .../udev/udev-extraconf/network.sh | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/meta/recipes-core/udev/udev-extraconf/network.sh b/meta/recipes-core/udev/udev-extraconf/network.sh index 3ee92714af..ace38808cd 100644 --- a/meta/recipes-core/udev/udev-extraconf/network.sh +++ b/meta/recipes-core/udev/udev-extraconf/network.sh @@ -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 From patchwork Thu Nov 21 21:54:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A8E9E64025 for ; Thu, 21 Nov 2024 21:55:11 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.10499.1732226102407745681 for ; Thu, 21 Nov 2024 13:55:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=R3ZxTrpl; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7f8cc29aaf2so1114612a12.3 for ; Thu, 21 Nov 2024 13:55:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226102; x=1732830902; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2adbw+gKSp180Hz+msll9gYej7+3qi0wvJxkBBiLkoI=; b=R3ZxTrplriI/MDYf6ldflrQ5gjmCBC83zautqLJmPoDWqnSNYTKeuX9XJkmJTK+uBc 1RSgBvFo1ug5kjux52hEkpcmIThlfEl0t5GUH6w/qQ3wy1ujTjt3wk5aIq6ysDE2yIxK rdGRLT1r2uacOYXxz5++D0XigdxmrsNVCm0fv7VPEqJCQgvi70c9zLrgQNDEm7J+AbqC ghJaroBzOUUokTk7mu7tbyp+IVt7CwTRKZjUsTRhqJG3JPvf25oUuFJe7p6Q5JEQLtDH KSf9nWDK3pv3FemqVjTZN3QPUB1oZdJbaG6PijzwFsA4YCwngmbIBVgkkUjlaGq70nIc Qrqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226102; x=1732830902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2adbw+gKSp180Hz+msll9gYej7+3qi0wvJxkBBiLkoI=; b=dcm1cYxLrgq9TebDtRjRWjKvDaLXuTLatO3i6HeaGyHWrPPBG3K8hbSUeU5kco1t6O ZBM9CRycuo1Ywavr8vX8eRJBlaVR4CWTS40BXxRy+C3yQCpWt5jgG9OLRZkHRufO4aTS 98v9WTTC78CUXHgZfdVrO6DAtLhzujEShQCDW0ME/oCtxG8pImhnC0D3w1KOUqRcDRl5 HU9qEa9/Rh2/WESHkABuNH8QfzfQLmP3g7eY6LcwcCTTDNFQF7W4aixiiDRukBdFSzgA gYAo1FXymgUbSGHvZFd4VOH82+pP5X6zhKE/cFXuITtALDILRJCyui7CX9qDWdBA0eNX eMHA== X-Gm-Message-State: AOJu0YxWFx7UPkVoxXnaC9Vbx9NbsGQox4wafPOQ2HfX3uRCMhkFCKAf tZhv3+sVTOXGyuRp74uO18QDee6SvgzXNeT6x+/taiX/IV2FTxlofPwkCoE3SSkyyBBlAUeCil2 N X-Gm-Gg: ASbGncvEgK5D0Hzy5Ucq0t/eVb7i9/XmAvpQmd1rZS41WXOcWN5TmM2u6ZznQz9Hlzd vgRIK7+0hwlPuNtp+vLrcMQw6O9lw4zBpA2Np3wlhwfHcii6sa1FlJTUMsxl+AL2lPd6vhb/kWS RgWz9+kqG0VmHR7MGiNJXKinp9UYerRSLsQGnk3ihNwpAH1wqJzjfyEcXleVw7AIoxKg1zELlQC EmAsq53E52TSvwr9Uh6Sp7QkgHqxamN20CCeCM= X-Google-Smtp-Source: AGHT+IEWCQ9GwM9kCWHdDL6BnVH6gx6LVEp0kiwGZkCcBv+7F5CA/69YvYbra1a3pGKLGvmAzYeTig== X-Received: by 2002:a05:6a21:998f:b0:1d9:2b51:3ccd with SMTP id adf61e73a8af0-1e09e3f5399mr863526637.7.1732226101675; Thu, 21 Nov 2024 13:55:01 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.55.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:55:01 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 26/27] webkitgtk: fix erroneous use of unsuported DEBUG_LEVELFLAG variable Date: Thu, 21 Nov 2024 13:54:16 -0800 Message-Id: <274319d476d7b4e83c6cfc27e8cd87ab019b66e6.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207581 The 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 Signed-off-by: Steve Sakoman --- meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb index 90fb7a1d42..a8f825e164 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb @@ -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 " From patchwork Thu Nov 21 21:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 52946 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 801A4E64035 for ; Thu, 21 Nov 2024 21:55:11 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.10504.1732226104364467339 for ; Thu, 21 Nov 2024 13:55:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=RBlx1XhU; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7ea8c4ce232so1441062a12.0 for ; Thu, 21 Nov 2024 13:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1732226104; x=1732830904; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lOB+ffjFydejYmYkZfwbK2xSH+ptntCfbvV9wwzVTXY=; b=RBlx1XhU3sPZvkGdbnGY29GpGM/hnllFtsisF7HcK6Qy6n8Rc+DrKCWG0LRC2pt9v2 UAvCg5qopoL6hhw7uA8VmX5yy2KXhCrhW3w67FA0umJP8hRSfFAeQHRi7+u9GIkrtrg3 Huuh2foB2m21nv57dqiSNljMRDjEpSv78KfkoMYcvUj+KngxK3y4WcQTZcF/fBtLXWsU AxWF+8lZcq+hDrUjXANiQWbwsNqEvTU38V0z0O80UqfNrKXkg07dLVhqnf8e23/JzPDH nsRf6AlWqSdrTsL1VoWsrfKmfO5Xfuls3njJJxhvWjHan6FmGQ6Em8shQGWHXUgj1tGP bYWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732226104; x=1732830904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lOB+ffjFydejYmYkZfwbK2xSH+ptntCfbvV9wwzVTXY=; b=gtaGH7EHdSJdJ1y073kfTChOrtackhbSC2ThxQ15FgWvqz7/S0Yh2Rjs9g3sPvOgTp XE9ovbrXYZT7MIjN+PCS2g773IzmvErg3TFAGHLnqX/v5j/biCg+T488fXdKSITZAFiP IRn8TrxIZ6Qt1fkzsMC9TD67DvHxOTztkGsPYE/sCHibGMEGTiDcJxgur5HeW4Fl8ZqK 6AD1DycJ1Rsfil/yS0p1eKnWW8X6UlahzS4/u3GX4v4hCHR4/hAnxN4k/Pa+CLLm+abH +hG7XpsyvV1XkfixBZAC2/i5GLKWB16QW63f9cr02c1NosZaJ7tKWE0ezbllEGZV9Z1s QEIQ== X-Gm-Message-State: AOJu0Yy/TVOuiN+6hgNOCZ3ac6UgDoWbXwXzzYAVF4LhZsJPXsqk1Pj/ M01ZIXeQAn1K/H6OkRXdtQ6fjU2T9xmxP4msbdWFDigDjSGI5Y2jQH8vel71OXpS3yx5jz3BZ1+ 6 X-Gm-Gg: ASbGncuN0vIz+xEHrBEteiYwJgcf9GX+o8zospQACmTyT+O8gNjps+3smEXRLtwrc2u R/fcoJUjHL6+OSpwLotWof5FM2WHJOvd/D25214P+UyqiEBSHX8S2GAkHnB3ObIopUjYc2KR0Va 1YLHIQ64qc/oobkwJH1zhooGTXYcsEZmTIH+GIb/UgqEnZPwdtB0xTv0fK4yvdCQ3BfrLxehKEe g/FGKOjG4swb+RbDEOsit16M+TUwKY/fFAM6DU= X-Google-Smtp-Source: AGHT+IFAZ+5HptGUiUDGLmvJMu6DovfwYUfEmRPdsz7w5zqp337f5EDaC7Nw1vCRvtFinReQiK+inw== X-Received: by 2002:a05:6a21:790:b0:1db:f0e0:cfd with SMTP id adf61e73a8af0-1e09e5fecd0mr550077637.44.1732226103580; Thu, 21 Nov 2024 13:55:03 -0800 (PST) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724de47eb05sm249710b3a.75.2024.11.21.13.55.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2024 13:55:03 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 27/27] llvm: reduce size of -dbg package Date: Thu, 21 Nov 2024 13:54:17 -0800 Message-Id: <194e0e6909687d996f2303ce26baabe109126952.1732225943.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Nov 2024 21:55:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207582 Unless 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. Signed-off-by: Steve Sakoman --- meta/recipes-devtools/llvm/llvm_18.1.6.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/llvm/llvm_18.1.6.bb b/meta/recipes-devtools/llvm/llvm_18.1.6.bb index 0496b8ed14..caad611d7a 100644 --- a/meta/recipes-devtools/llvm/llvm_18.1.6.bb +++ b/meta/recipes-devtools/llvm/llvm_18.1.6.bb @@ -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() {