From patchwork Fri May 9 15:23:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62678 X-Patchwork-Delegate: steve@sakoman.com 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 66168C3ABCC for ; Fri, 9 May 2025 15:24:03 +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.web10.1400.1746804233955980483 for ; Fri, 09 May 2025 08:23:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NQsKEIzV; 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-7423df563d6so940842b3a.0 for ; Fri, 09 May 2025 08:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804233; x=1747409033; 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=HOdwbOWcFO7GOGg0ZlYtVhdYXAs64kigmMp4BrgwHjs=; b=NQsKEIzVOmhNrHiCBynf2iJ9vhOq4wENd2g3smeiql4kDVOnBtq5KI9ImXW9b6GzXI tJvqFLj2g1RIIwpsg1X75oOkL3aY3wK5CEnxBsI+Qf3M7BfAQ0J78Y3PP2urvlgAmrt8 YiDuTZTQfO1cpHHHCuVz95wWfIIdsRzjoLY2mdNBkEjrbMlDZL3H2ZczORk0O6LOL/Y2 slXghHnjfmwlebCL5xChNQ80f5f/WRAXyQPdJtds+bbLFQShZs648lYl3BhnM7JmEKRf TuNQZwBtSJmAFLoQ0T61SZ6lBPKAC498rhNf4fhlQDpmT261ev9XSIs5BYA5qgV2NayQ nWnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804233; x=1747409033; 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=HOdwbOWcFO7GOGg0ZlYtVhdYXAs64kigmMp4BrgwHjs=; b=wsYqIfCWWy7C9TQKzOWtRxB0ramouN+5evT8VeYuQYsdtuSGzkbZLmaclI6txQICX6 MZJpk8BrNfcLYXPn+7DXArsZyziT6aLnS8bUCLtRfKe+UhVJPPLwjiVZLNkP+ZObUyqa 5giQuePHvWL+XZIkTqgQH79LPMaCZnvgA71symaW9bQsFe6L7quVC7liDwKCUKc8jLMi SzBrYP3kY/odgK7QzdEh2KwiJZFOr/cTwP41zf/tW5YCsB1reoYnZNFnB7tRIB6DR++7 oeiHAv8YYK228+qdbdY/+UvEBFgORwQyBPqmN23dCBIttyqbsVFxw93Q4qn6ZBBPW2m8 Kbdw== X-Gm-Message-State: AOJu0YxQ/Tz5QOZiSgaC/Bh5Rz7KHVFCkrjf+4OLvtK5d0xYZQjGfE3s AuCT6AWmENBiJ4ZTpjqU23vsmlfKGXUr3YyEql9sd3IHxkByckm3Nih6rLV/i0/i9S7dDquPJaP / X-Gm-Gg: ASbGnct07Ak7rrwW6IF3vAW/HcRlqy8/yUBTncY0nFVEjAEsNlqsLnlBIbWaM0+muKx Tf2+H/8uVzUdtRlah/nHrzkYP9cPwRN4nlZ6dpsdP8ZrKMyBiFbKNz22ROzjNjsOUa9OdZ0K6O2 EGCtR/aWdqmC4to2bPIjBQS92Q+sP/WT9RBKxu4xpDyzSkJojuCwju9rqNbnUR8VJzzK/h16nHH wXFsSxeactFk5i+xFU3JaPFu8F2vyOV+S9pRFuuFg0LgPjYFRaLGs4i94NZq+mC80KnAxNZqthp y6/2v1gJC/V9Yn0UpIZVX9DokIYfAX6F X-Google-Smtp-Source: AGHT+IFWqni3iK/1Yrb7bh0JAcZMJfDY5slQnGi4BSnWhZ0OQfFszHV8aMchrG+zlWen2vUvnyAwgA== X-Received: by 2002:a05:6a20:cfa9:b0:1f5:80a3:b003 with SMTP id adf61e73a8af0-215abcbb528mr6228135637.37.1746804233108; Fri, 09 May 2025 08:23:53 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.23.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:23:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 01/17] qemu 8.2.7: ignore CVE-2023-1386 Date: Fri, 9 May 2025 08:23:17 -0700 Message-ID: <962cf064df6db243c182c6b53d06a4fd087cd3f2.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216209 From: Madhu Marri Upstream Repository: https://gitlab.com/qemu-project/qemu.git Bug Details: https://nvd.nist.gov/vuln/detail/CVE-2023-1386 Type: Security Advisory CVE: CVE-2023-1386 Score: 3.3 Analysis: - According to redhat[1] this CVE has closed as not a bug. Reference: [1] https://bugzilla.redhat.com/show_bug.cgi?id=2223985 Signed-off-by: Madhu Marri Signed-off-by: Steve Sakoman (cherry picked from commit 6a5d9e3821246c39ec57fa483802e1bb74fca724) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 53f48375e4..80316af88d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -52,6 +52,8 @@ CVE_STATUS[CVE-2023-2680] = "not-applicable-platform: RHEL specific issue." # NVD DB has this CVE as version-less (with "-") CVE_STATUS[CVE-2024-6505] = "fixed-version: this CVE is fixed since 9.1.0" +CVE_STATUS[CVE-2023-1386] = "disputed: not an issue as per https://bugzilla.redhat.com/show_bug.cgi?id=2223985" + COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" COMPATIBLE_HOST:riscv32 = "null" From patchwork Fri May 9 15:23:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62682 X-Patchwork-Delegate: steve@sakoman.com 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 862ECC3ABCE for ; Fri, 9 May 2025 15:24:03 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.1412.1746804235598954828 for ; Fri, 09 May 2025 08:23:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=XFveUe/H; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-74019695377so1761017b3a.3 for ; Fri, 09 May 2025 08:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804235; x=1747409035; 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=9jGeDqAmI1ekiVOswGA8/1Gbgcyen4/yzIm6aSsib1U=; b=XFveUe/HO0eG6KRjxYERfwh4UgSY9OHpsNb7IdagX6R1gYkAY045irQEUhme+lN2Gm yg3FTmdZ+kk1mCrWFIhnqscUVO98lWWEMhyRpFzUf94LwfhUyVQuvBZHa28RtU4cTEGB GMgZmVVrSQOQ3x+GG285CJsggdEwiz5U7GhUi7Ld3IO1uxg21DH/efWpFQJmqgS2L/q4 ZP4xeVynvPzF4Xtk5j5IdCiaTwtickpb1DBv68iYb19Y+STK4mMJtBtGmjO1r6b15MSh 8NlSrCXs1T4DfTy99ZjaMvhQeak7guWGndp99TQR7uIsNOjFBeA52TdPc5LS3fStjN+a kWkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804235; x=1747409035; 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=9jGeDqAmI1ekiVOswGA8/1Gbgcyen4/yzIm6aSsib1U=; b=OJUww8F9YYX0bTyBe3VoHOdVp8WlfnQ6izC45ZtuAnRcI4SxBFNiFrb6mhI5zOJOGw 0XbVdtgGGFPSuiAiaFVTskHu1SWSRqElEoC+lLaoJLEImf0vQIzWhyk/BEF228/N9caP ZoV4Mrf7IUlNjHSO35zbkar2fuwjC4BW4gKe1jRD2eKQaK+uukPHN9S+IqMGKUHd1EFS BhZ5fhjLyRVMtTp4ergBTaExMey1J/EUSZNLdcwnq4w6K7MH1hX57mY1YlBVK2haYaBa d6N22gpvVEyIUfwFtMOtJRUhg/q6iea83hdbzU+KYu7F1P5klZhuawggnusY6RqIu7P/ LZ3A== X-Gm-Message-State: AOJu0Yw8vp6vrmNaQSZaKi0C4ojB4IJ6c3NFjHbsdqha+e5LO9h0mmo0 6zfb8h7Qyl+Sm8spgeY/CHH12Y+j0XL2BB+hGU+Fd+Igevpcv+Is3K5NYqSimRxSv17hJrQ47R2 Q X-Gm-Gg: ASbGncuLT0noZYN8z6UlgYyu47R8oHOpxf+Rc4wuuYcF4S8uXZG6e8AVkSPJuKEDfgB BYz0IBiw6GbFcDNCI/13y1Gl2Zw6F6fBuG/GJAK8Uq4VmMRPC5EFfHe7HPQVDbkNJR5GuxWgF97 no55WtpBwyD9Ha2TGieeDMd5mcc8gdhTVABiULDVRzrvQ3dkdGNS0j+OIadmt1vrmDIKuO2d0wG TZ9kkFnUEm2NhAvqBUQzE+KEt4sYmdTnlOFx7eP3ovkh/rACMZYAD3mm1z7nDgptWKKfHLzEro3 qzVALfdcjGeqdMfcNKGwFlxI4i5Mw92m X-Google-Smtp-Source: AGHT+IFTudoevm27Sp7KCQJ5ARNCUUhYPLOWD04OfntODtlBwJ88LUHiQxeWAM8dgSXbGws6bLgA/w== X-Received: by 2002:a05:6a00:b4a:b0:736:ab49:d56 with SMTP id d2e1a72fcca58-7423bc03870mr4732193b3a.1.1746804234749; Fri, 09 May 2025 08:23:54 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.23.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:23:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 02/17] libsoup-2.4: fix CVE-2025-32911 Date: Fri, 9 May 2025 08:23:18 -0700 Message-ID: <75f1c57a5171859d1bfc58d69b3923d017b14303.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216210 From: Changqing Li CVE-2025-32911: A use-after-free type vulnerability was found in libsoup, in the soup_message_headers_get_content_disposition() function. This flaw allows a malicious HTTP client to cause memory corruption in the libsoup server. Backport patches to fix it [1] https://nvd.nist.gov/vuln/detail/CVE-2025-32911 [2] https://gitlab.gnome.org/GNOME/libsoup/-/issues/433 Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- .../libsoup-2.4/0001-CVE-2025-32911.patch | 74 +++++++++++++++++++ .../libsoup/libsoup-2.4_2.74.3.bb | 3 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch new file mode 100644 index 0000000000..9ef0643837 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch @@ -0,0 +1,74 @@ +From 52c5859b82fe79f2c32d883e048d218e0d7f2182 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 30 Apr 2025 14:59:55 +0800 +Subject: [PATCH] CVE-2025-32911 + +CVE: CVE-2025-32911 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/422/commits] + +Signed-off-by: Changqing Li +--- + libsoup/soup-message-headers.c | 13 +++++++++---- + tests/header-parsing-test.c | 15 +++++++++++++++ + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c +index 39ad14a..78b2455 100644 +--- a/libsoup/soup-message-headers.c ++++ b/libsoup/soup-message-headers.c +@@ -1454,10 +1454,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs, + */ + if (params && g_hash_table_lookup_extended (*params, "filename", + &orig_key, &orig_value)) { +- char *filename = strrchr (orig_value, '/'); +- +- if (filename) +- g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); ++ if (orig_value) { ++ char *filename = strrchr (orig_value, '/'); ++ ++ if (filename) ++ g_hash_table_insert (*params, g_strdup (orig_key), g_strdup(filename + 1)); ++ } else { ++ /* filename with no value isn't valid. */ ++ g_hash_table_remove (*params, "filename"); ++ } + } + return TRUE; + } +diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c +index 946f118..752196e 100644 +--- a/tests/header-parsing-test.c ++++ b/tests/header-parsing-test.c +@@ -1034,6 +1034,7 @@ do_param_list_tests (void) + #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\"" + #define RFC5987_TEST_HEADER_NO_TYPE "filename=\"test.txt\"" + #define RFC5987_TEST_HEADER_NO_TYPE_2 "filename=\"test.txt\"; foo=bar" ++#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename" + + static void + do_content_disposition_tests (void) +@@ -1133,6 +1134,20 @@ do_content_disposition_tests (void) + g_assert_cmpstr (filename, ==, RFC5987_TEST_FALLBACK_FILENAME); + parameter2 = g_hash_table_lookup (params, "foo"); + g_assert_cmpstr (parameter2, ==, "bar"); ++ g_hash_table_destroy (params); ++ ++ /* Empty filename */ ++ soup_message_headers_clear (hdrs); ++ soup_message_headers_append (hdrs, "Content-Disposition", ++ RFC5987_TEST_HEADER_EMPTY_FILENAME); ++ if (!soup_message_headers_get_content_disposition (hdrs, ++ &disposition, ++ ¶ms)) { ++ soup_test_assert (FALSE, "empty filename decoding FAILED"); ++ return; ++ } ++ g_free (disposition); ++ g_assert_false (g_hash_table_contains (params, "filename")); + g_hash_table_destroy (params); + + soup_message_headers_free (hdrs); +-- +2.34.1 + diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index ee20530b64..25e0d7dcbc 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb @@ -12,7 +12,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ - file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch" + file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \ + file://0001-CVE-2025-32911.patch" SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" CVE_PRODUCT = "libsoup" From patchwork Fri May 9 15:23:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62680 X-Patchwork-Delegate: steve@sakoman.com 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 79DE8C3ABCD for ; Fri, 9 May 2025 15:24:03 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.1413.1746804237247472497 for ; Fri, 09 May 2025 08:23:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=rICCzjC6; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso2374231b3a.0 for ; Fri, 09 May 2025 08:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804236; x=1747409036; 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=5bvSkR9RUjVJvpNfsXfD4VPlqogOvNzYKASdb8t2lm0=; b=rICCzjC6jeLGGtQohzQFYEYEyhqt5YSCre4T2NtxZ3OqzkSv0tOWMnB9b79qSR7MP7 N80JqWyo9qScImUHlNov2Li2Kf3aKY2EcEUGiBpATSP1ET6TxPkw6eWGQRpppqqT5OaG +lZalXJErd8n7T8y/xw9p++oclQj2/S5jFZxUznBvpY9yhWGQi49+k4iNWXmji2pFNR1 mMA7guUSpMY5oiJk2HC7QKTg4Fh+tnS3W0ArpCOHs7CHZJMtpLWhb9H5sEeUYEEHS1UU s/JWJlfv9FB7jJ/35bpENAnmvwBMyiySCD5aPE3+p8dTkTBjiqpDzv8A4yD9yNP1sSqD Bvpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804236; x=1747409036; 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=5bvSkR9RUjVJvpNfsXfD4VPlqogOvNzYKASdb8t2lm0=; b=e6lAaiGLnkh5SOBMAGcjSBimFOyKW0brcZznpi1EXchCZOpQ9d4bC1QCKvXbwRMt4/ SwoTwUrTDST6RnM7cvE9TF3FZGF1Zu6F0kXS2mqDYSKJPyfgzqAP0UDCcZTkOH21r+Qd xL36xF5ADymC+mWOfzeXUz1iBZvTegzSbdIs1OGDA7LkC6pFXAOsak1AZz2wPfE2o4bJ LI4q8q7+hWRROqD9vfPLMvTP4hQs7hz/EOPNTWrRXGZCnwExwG+IZnlspxH0YA0zhvER GNRWd0RdRlJmV8Oh3YY/LMdTXnKUwVSEMRT207idYxOLeuNmMhUfG4Dy+xfNQl/bwlWy zfvw== X-Gm-Message-State: AOJu0YzckVMHgzDNpHLqqX1CIEMpr6W2W6zViJM2pzNbMhlxLEkMx1v0 MdT5OCFeYxDecib7YMewZXcG0lVPVYXUXFv6TRacMTgo9TQ32carJguB3tM+GkI0u3EFVob1IFL c X-Gm-Gg: ASbGncvorvIoYEnEjbMqtQD71JFef287rUmjnj75CMzUOYF8bJg6ApxdXLdZQs6SXmC wmbOd67Bs5Jyl85jfK4qVfyrippdURgmhB2yv+Fs6MnxIWX4fSE7m+xpOIY7BIlJnqHJmBm94kk zpCWrlJ0uJHQrMUWAd3enoX1/dnEhok09Tb+bGjDabVkZs8drpJG6axjdCxDeI7oGungeGlHfyc WHTmd+iIlSYyNYdxlxdbvPHGuvZGP1kuDzHrXLeTwqtLIU4ds0YIJGRfKGICKchPcCfTLAQmNgl qSVJINxYsaXUZ+GHBrt/doTIKt6BCMUf X-Google-Smtp-Source: AGHT+IH91oJkzCKAqy1KJwj2cE+NkjMm70CUa/+a4ucw3gckmxAARHK8+GUyyV+hk4ud0HhYL9Xa7g== X-Received: by 2002:a05:6a00:17a7:b0:740:6f86:a0e6 with SMTP id d2e1a72fcca58-7423bc5ba52mr4912032b3a.6.1746804236415; Fri, 09 May 2025 08:23:56 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.23.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:23:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 03/17] connman :fix CVE-2025-32743 Date: Fri, 9 May 2025 08:23:19 -0700 Message-ID: <61610f57c6b9ee2b6002decc037db049e9ddfe51.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216211 From: Praveen Kumar In ConnMan through 1.44, the lookup string in ns_resolv in dnsproxy.c can be NULL or an empty string when the TC (Truncated) bit is set in a DNS response. This allows attackers to cause a denial of service (application crash) or possibly execute arbitrary code, because those lookup values lead to incorrect length calculations and incorrect memcpy operations. Reference: https://nvd.nist.gov/vuln/detail/CVE-2025-32743 Upstream-patch: https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d90b911f6760959bdf1393c39fe8d1118315490f Signed-off-by: Praveen Kumar Signed-off-by: Steve Sakoman --- .../connman/connman/CVE-2025-32743.patch | 48 +++++++++++++++++++ .../connman/connman_1.43.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch diff --git a/meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch b/meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch new file mode 100644 index 0000000000..c114589679 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch @@ -0,0 +1,48 @@ +From d90b911f6760959bdf1393c39fe8d1118315490f Mon Sep 17 00:00:00 2001 +From: Praveen Kumar +Date: Thu, 24 Apr 2025 11:39:29 +0000 +Subject: [PATCH] dnsproxy: Fix NULL/empty lookup causing potential crash + +In ConnMan through 1.44, the lookup string in ns_resolv in dnsproxy.c +can be NULL or an empty string when the TC (Truncated) bit is set in +a DNS response. This allows attackers to cause a denial of service +(application crash) or possibly execute arbitrary code, because those +lookup values lead to incorrect length calculations and incorrect +memcpy operations. + +This patch includes a check to make sure loookup value is valid before +using it. This helps avoid unexpected value when the input is empty or +incorrect. + +Fixes: CVE-2025-32743 + +CVE: CVE-2025-32743 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d90b911f6760959bdf1393c39fe8d1118315490f] + +Signed-off-by: Praveen Kumar +--- + src/dnsproxy.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/dnsproxy.c b/src/dnsproxy.c +index f28a5d7..7ee26d9 100644 +--- a/src/dnsproxy.c ++++ b/src/dnsproxy.c +@@ -1685,8 +1685,13 @@ static int ns_resolv(struct server_data *server, struct request_data *req, + gpointer request, gpointer name) + { + int sk = -1; ++ int err; + const char *lookup = (const char *)name; +- int err = ns_try_resolv_from_cache(req, request, lookup); ++ ++ if (!lookup || strlen(lookup) == 0) ++ return -EINVAL; ++ ++ err = ns_try_resolv_from_cache(req, request, lookup); + + if (err > 0) + /* cache hit */ +-- +2.40.0 diff --git a/meta/recipes-connectivity/connman/connman_1.43.bb b/meta/recipes-connectivity/connman/connman_1.43.bb index 1100599490..02abda568f 100644 --- a/meta/recipes-connectivity/connman/connman_1.43.bb +++ b/meta/recipes-connectivity/connman/connman_1.43.bb @@ -6,6 +6,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://connman \ file://no-version-scripts.patch \ file://0002-resolve-musl-does-not-implement-res_ninit.patch \ + file://CVE-2025-32743.patch \ " From patchwork Fri May 9 15:23:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62677 X-Patchwork-Delegate: steve@sakoman.com 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 651B5C3ABC3 for ; Fri, 9 May 2025 15:24:03 +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.1403.1746804238755698864 for ; Fri, 09 May 2025 08:23:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yWV4KSTs; 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-7423df563d6so940928b3a.0 for ; Fri, 09 May 2025 08:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804238; x=1747409038; 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=fftexCtShvRdY6gOjgwErttl0exaiWtU7tye0IbRrWk=; b=yWV4KSTs6VpLurw2YLjvYTl2kgCMeuSNNGMICBzwNtla8dAWHI6O9fU4BU/1GKc1xm ec/fXe0Th7LkHU/+V06/1dYt6kzOaiVHqvyWmCnowlcwqIlHhIyJT6KM64phnRXx7vOd jMsoNHmneREQ/6sL752bBaGodRDnfcQSl1jJha5OT/sTwVwc6rxP9+7xlAeltAgH+sPz q2v7kZqo3g97Sj4zVNroChTx6N3GkX63EB5rSVZe/qlGB5ZyJKkoQHFVMjtuI3oKSRD2 x19v8UmiRBtZRW59wNgi2ge9vS5TgVWRC4dw+VH+5T4QY5y9Jd04CZRYlh+gCSCF5xhx uxzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804238; x=1747409038; 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=fftexCtShvRdY6gOjgwErttl0exaiWtU7tye0IbRrWk=; b=WPB+j9qDv2RjeG/oqB+k8GQRcOPPzblPSCIIkQqiS7/jcIAh2qsWh+XMW1QxiH6x5E Aez5HoLW4HICOzOAAS8R4bhDI78Tqp9BIYzi3Nv3d6j+XcrECyivW8uBlg98hBgWZrVS 4Vt+KW+FTn7WpKF6dmtbC7S3n+pzwVburIBFdg6oXNl+rOd082ZxzYV/Rlrd0Pk2EZbh CeBhOPSBVQ23kpOwWssTFfkOHseNtO+CuYv3fj1OQH7M6LAEtbftA01zX3Qq9RMA58KS rtGsoyPFETOnno7b26l3FWb3FxkFrIDfWDf3biMyFJT5MVwAXWLFrJhXQU8AilZh1OMv Un5w== X-Gm-Message-State: AOJu0Yz7bJf/cByJMfpXtVHwZjLeoa5naOkXjItjKzzAgGlC7dRWW99u x8BVRsBCFH0EbTtb1o3FNau2m8J3a6jvTtM0iqFv+ko5DUJCOdJLguxvoydyuD9DtXkiCCuQMIn o X-Gm-Gg: ASbGncsLbGudiWgAp7VDFMikFERPlq4B+qhKLBiT5zB1X/7EZXpqVgqimjRnzMoJVcz opoSpNBM2Cj+7Asa8DRUZlVWej5uWL0W1vI/Z/HljGrhx+iIHbSR64A0f7DOpDZuxkNRV8bLctp cxiAfgnO/5Kfp2Vktg8jLYLPgKvh2ZfFJcPaUWAJmNcA7dGUPIJ6Yar8dv7NY6y/7b1k9UOcgqV S06n2V/9el5F9PS3MPpTIEHnjx4BICnruS28f0Q/tGr1uMByoRFAsAZLKIUxQP9MFetBs1PwrDp nL3vL52sWb9o/vn09aTyXyhQclA1op3O X-Google-Smtp-Source: AGHT+IE9hySR4U5FHk5oFro6fbV8jnPWyu2AIe88/GnQV34TiYuAiepLfxjrU6btI9WcOYsElug5dQ== X-Received: by 2002:a05:6a00:181b:b0:732:2923:b70f with SMTP id d2e1a72fcca58-7423bc478ccmr5086685b3a.11.1746804237889; Fri, 09 May 2025 08:23:57 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.23.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:23:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 04/17] tzdata/tzcode-native: upgrade 2025a -> 2025b Date: Fri, 9 May 2025 08:23:20 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216212 From: Priyal Doshi Signed-off-by: Priyal Doshi Signed-off-by: Richard Purdie (cherry picked from commit b1ff8b45da27b533477cf6d9ace7a47f7f3a28b1) Signed-off-by: Steve Sakoman --- meta/recipes-extended/timezone/timezone.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index ca9e29f72d..8f7868f098 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 = "2025a" +PV = "2025b" 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] = "119679d59f76481eb5e03d3d2a47d7870d592f3999549af189dbd31f2ebf5061" -SRC_URI[tzdata.sha256sum] = "4d5fcbc72c7c450ebfe0b659bd0f1c02fbf52fd7f517a9ea13fe71c21eb5f0d0" +SRC_URI[tzcode.sha256sum] = "05f8fedb3525ee70d49c87d3fae78a8a0dbae4fe87aa565c65cda9948ae135ec" +SRC_URI[tzdata.sha256sum] = "11810413345fc7805017e27ea9fa4885fd74cd61b2911711ad038f5d28d71474" From patchwork Fri May 9 15:23:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62681 X-Patchwork-Delegate: steve@sakoman.com 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 6BC1BC3DA4A for ; Fri, 9 May 2025 15:24:03 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.1415.1746804240323475915 for ; Fri, 09 May 2025 08:24:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=IlqQVbHH; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7394945d37eso2071947b3a.3 for ; Fri, 09 May 2025 08:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804239; x=1747409039; 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=A5oYjdjFvboaYGSfx9sfQ9JiKG2ZmLAcaULEOcakGCc=; b=IlqQVbHH1Kek+MecKnmkJDzJ3lb8oc/8aFyQcPInZxAZ7E2hlL1L/AAQMpsqsW35ht nMf/swqmbyrT5DnK/+A4wx1ITrxYnghWYtqier3FGU8tQjQk3ogmZyczE36cvBz3NmGo 7cLl+r2KTTs+BUDhn/W64GxqFL4ha+CNHSZ9YHEco8385V+N2ge2kubwPAMoDs9gLpnw fMuntT/W7Awv5afl7ZiXHmyxbaX41yV92oHDuZ6vGpNQcNWj5F7o5PFSlOhOK4ZwfFgi 4fWRplkNYLmIfl8xoZ9ya6p6C9dVaZucr+EsEDS5qbguecujzYZbv89j9WJhwk0JHnLX dLrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804239; x=1747409039; 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=A5oYjdjFvboaYGSfx9sfQ9JiKG2ZmLAcaULEOcakGCc=; b=lhGbj+I8RuaiU2nSaG0nJq985B9N+HpityC11p9sSdxWf2ZaZ25sLLHHmqbJjmbDy5 pAk5gkNOyfyZ1Iy4pxT2gG+qmC71FqS5pRck5vJi9a3W1JYb80/0ZpJ26HKAdTu5Q7k3 0m2Q3gi4xAxEAyIaODbvmVy5GIhqUeVN6scOISj4HNSdSvxFOpAHCyob7ybY9/V2PAbe uabUAi3S/HGab33Z4+AfWeHfD1HyPw5S8ckq+prQiflQqtZiKDFayC6rYeVOAdTx9YHJ HzCie/+xZp9d24nI5scZbDOtUYukDtlLoLlJ8ei30O6z26djOaQ3T6VEfWLl6P6dAb9Z L74g== X-Gm-Message-State: AOJu0YwLefroo4V/6fKKCNZ8HX3Z3uU7TaSZE8ZEep0kbPwke2OJmH7V gDskWKXoiIPdZoINE5UvoK2JU56pAwkCEF8dnZG7xp+ZuOtYqMrN3UDpFDcM0nBJu2niYEmQiJD H X-Gm-Gg: ASbGncvvNJuttMZGNc+HVBgIg5FZv3ZGQoH42j2YJPTn4ppYmXId1G51pMsNrm9Qtoh yTSuwDodD7A7vg28Sf9Oaa5V5fXLHL1rr4iHT5wdwmku02Fn5O2IYLw1ncEbcUEAhtH9VhMbj6p zfZ5X0/js9YnjRTZnwjc0E+kFC81CAZgJ+YD5Vanwu1W3kKJHWBWiz1dCllYifsZI6TLFSBFoyr 2nKScshEc2nmPs5ldnzR2U/D9BOyFbjfcgax/xcxXrcczT2/hrWkVRs63bbNfSfjcy8YUpfGbIw tY9Dq0WXqF2SGz6r0QMe/sAyottCdyBn X-Google-Smtp-Source: AGHT+IGYHN/0323HVqHUdfgiWOQX0py0fPDOsxRTVAawMGsHtUGKMZWuhTpjYF6PixiJVPY8CZt02w== X-Received: by 2002:a05:6a00:985:b0:736:ff65:3fcc with SMTP id d2e1a72fcca58-7423c05b1d6mr5150925b3a.16.1746804239568; Fri, 09 May 2025 08:23:59 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.23.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:23:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 05/17] glibc: Add single-threaded fast path to rand() Date: Fri, 9 May 2025 08:23:21 -0700 Message-ID: <09e2d663246d7335a9e33dd1a86dfe4630e4489a.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216213 From: Haixiao Yan Backport a patch [1] to improve performance of rand() and __random()[2] by adding a single-threaded fast path. [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=be0cfd848d9ad7378800d6302bc11467cf2b514f [2] https://sourceware.org/bugzilla/show_bug.cgi?id=32777 Signed-off-by: Haixiao Yan Signed-off-by: Richard Purdie (cherry picked from commit b0ded4df5f2d3bb3319978d1a549c72f5daf238e) Signed-off-by: Steve Sakoman --- ...dd-single-threaded-fast-path-to-rand.patch | 47 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.41.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch diff --git a/meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch b/meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch new file mode 100644 index 0000000000..736fc51f38 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch @@ -0,0 +1,47 @@ +From 4f54b0dfc16dbe0df86afccb90e447df5f7f571e Mon Sep 17 00:00:00 2001 +From: Wilco Dijkstra +Date: Mon, 18 Mar 2024 15:18:20 +0000 +Subject: [PATCH] stdlib: Add single-threaded fast path to rand() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Improve performance of rand() and __random() by adding a single-threaded +fast path. Bench-random-lock shows about 5x speedup on Neoverse V1. + +Upstream-Status: Backport [be0cfd848d9ad7378800d6302bc11467cf2b514f] + +Reviewed-by: Adhemerval Zanella  +Signed-off-by: Haixiao Yan +--- + stdlib/random.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/stdlib/random.c b/stdlib/random.c +index 17cc61ba8f55..5d482a857065 100644 +--- a/stdlib/random.c ++++ b/stdlib/random.c +@@ -51,6 +51,7 @@ + SUCH DAMAGE.*/ + + #include ++#include + #include + #include + #include +@@ -288,6 +289,12 @@ __random (void) + { + int32_t retval; + ++ if (SINGLE_THREAD_P) ++ { ++ (void) __random_r (&unsafe_state, &retval); ++ return retval; ++ } ++ + __libc_lock_lock (lock); + + (void) __random_r (&unsafe_state, &retval); +-- +2.34.1 + diff --git a/meta/recipes-core/glibc/glibc_2.41.bb b/meta/recipes-core/glibc/glibc_2.41.bb index 71b89ac9ff..d707e1a677 100644 --- a/meta/recipes-core/glibc/glibc_2.41.bb +++ b/meta/recipes-core/glibc/glibc_2.41.bb @@ -53,6 +53,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ file://0023-tests-Skip-2-qemu-tests-that-can-hang-in-oe-selftest.patch \ + file://0001-stdlib-Add-single-threaded-fast-path-to-rand.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" From patchwork Fri May 9 15:23:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62679 X-Patchwork-Delegate: steve@sakoman.com 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 7429AC3ABBC for ; Fri, 9 May 2025 15:24:03 +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.1416.1746804241742625499 for ; Fri, 09 May 2025 08:24:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=pPBfTSOE; 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-7415d28381dso1626725b3a.1 for ; Fri, 09 May 2025 08:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804241; x=1747409041; 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=ameF1VdPJIpcOhQ/1IShD9a5SoQdzlwawdedMrqHCx4=; b=pPBfTSOEgAYSboDBZqFSckzlbVf9oG86ZEdksRE2yWUafKJ939GV7pMo/BkmzWl3n2 MsSK4dttQfCgMcd0ZYmO2eEoDUFQAFNX0hXiMMZZ2sj9HlrE3SJLnMbyIDGRKgiAYLqs LmK4a1VxOTCU9HS3kbVq2vNljacnxOey0iH+Y1n8nveCvlOW62vinXjP2QozBQbPiXNG FJF90TKywoI8tksZNmh+1QyWT6E3U+suQEE2Jed++sepmgbqb7AXsaimKx/UU/VpWKcM ReE9IJshuP7l/fT8VMMknmQoY1pt7qx800DmXKy9nAGq7O6xGMTfgteGrucv7yvoSUYf t2QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804241; x=1747409041; 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=ameF1VdPJIpcOhQ/1IShD9a5SoQdzlwawdedMrqHCx4=; b=N5rz9KAEtCY8g6oMqH7wY2DG6NF7vR4PxJvZn+FS2F6HeISfzib610A+YITAN2hx0P zUoG21G+XQTw1fYL0oszEyiZys6Jrea+OV9ijGp/KVO5pGHjNEUYvFKaWHSe89kdIpQt OZ4P46G31kn+giIqTpqpeL9OFIgtm2rRG7KMmE4TOsEdYX3+6ZrBnrC/a8IkuiccEDIk S17qKdz/IabWsd6aK+H4/4fWFDczwMn15wtr1kjRhLT4PpismQJjPmIK2Pep6thbYOGO RKLGnvELU1Jt4oYdmD/ef0L/U4Uw6etFXajj+qrX7OLLLnJLbVlXYh0mwCiymYb7ejFt gkCg== X-Gm-Message-State: AOJu0Yzojg3D/aLQG4dQafNSSWNAmwu40FSdjXB+9sFlK/8T5Ta7aXeq 6h87KiZX96i5am2bxpWkfWoBLSwgE0bY9SWV/eGKF6wz8ESMu1jRILTMM++UBiJ/yrZGe/luFeW a X-Gm-Gg: ASbGncs3QG2oHFrAJ3gcECHiRfIRLO3Ewp/uvh4rKfUVTC5fhrw50pE6NmlsccoB8Mi lTyQ9SDUMAC9almQBWM7PnTi7n+28rtgjhxt5JUVmhuZ4wEc2LP9Zhee0H0hGj2khgfOkiiaP9k ubyk9hhFZ9pSS2HchRbbV9LHKiG62+6072nLW26E3bqBNM4fzsvJ6exIbkKyEigCX1dJ+8KMJhr b3+JzjaGYLIFaHO6OxR0CTsZPMYsO7nI/aRXyA3Usim2yPPC1DtOxY2IR3RW3hxPL7tmx8yQPrF Y1NswpmNG+l9mamVha6kMNrnPlZN5Mtd X-Google-Smtp-Source: AGHT+IEPme0ChAHSZ4SGh14Q4exo+tn/NGEHMNYKsWmDOQMYgkE0pBYQv+2UCswOx8ri0u5TjLhCzg== X-Received: by 2002:a05:6a00:138c:b0:736:b101:aed3 with SMTP id d2e1a72fcca58-7423bc1d5f4mr4920601b3a.1.1746804240890; Fri, 09 May 2025 08:24:00 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 06/17] bluez5: add missing tools to noinst-tools package Date: Fri, 9 May 2025 08:23:22 -0700 Message-ID: <5f7c43913812bcb80d6dba67da3fc62a8efecfb8.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216214 From: Guðni Már Gilbert This change will prevent these tools from being installed if the image doesn't install bluez5-noinst-tools package. BlueZ 5.66: tools/mesh-tester BlueZ 5.66: tools/ioctl-tester BlueZ 5.65: tools/iso-tester BlueZ 5.56: tools/btpclientctl BlueZ 5.51: tools/bcmfw BlueZ 5.49: tools/rtlfw BlueZ 5.47: tools/btconfig (not a new tool, but it was moved from bin_PROGRAMS to noinst_PROGRAMS) Signed-off-by: Guðni Már Gilbert Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/bluez5/bluez5_5.79.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.79.bb b/meta/recipes-connectivity/bluez5/bluez5_5.79.bb index 30ea6d317b..330b30884f 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.79.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.79.bb @@ -32,6 +32,9 @@ NOINST_TOOLS_TESTING ?= " \ tools/rfcomm-tester \ tools/bnep-tester \ tools/userchan-tester \ + tools/iso-tester \ + tools/mesh-tester \ + tools/ioctl-tester \ " # noinst programs in Makefile.tools that are conditional on TOOLS @@ -46,6 +49,7 @@ NOINST_TOOLS_BT ?= " \ tools/hcieventmask \ tools/hcisecfilter \ tools/btinfo \ + tools/btconfig \ tools/btsnoop \ tools/btproxy \ tools/btiotest \ @@ -56,6 +60,8 @@ NOINST_TOOLS_BT ?= " \ tools/advtest \ tools/seq2bseq \ tools/nokfw \ + tools/rtlfw \ + tools/bcmfw \ tools/create-image \ tools/eddystone \ tools/ibeacon \ @@ -65,5 +71,5 @@ NOINST_TOOLS_BT ?= " \ tools/check-selftest \ tools/gatt-service \ profiles/iap/iapd \ - ${@bb.utils.contains('PACKAGECONFIG', 'btpclient', 'tools/btpclient', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'btpclient', 'tools/btpclient tools/btpclientctl', '', d)} \ " From patchwork Fri May 9 15:23:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62683 X-Patchwork-Delegate: steve@sakoman.com 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 7FF0AC3ABBC for ; Fri, 9 May 2025 15:24:13 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.1405.1746804243523191304 for ; Fri, 09 May 2025 08:24:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=SeBoeD4p; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-739b3fe7ce8so2294542b3a.0 for ; Fri, 09 May 2025 08:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804242; x=1747409042; 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=uBFUgMI3CMXidd0bDfXxsK4EibVzW+KUvzXEr8r4NKU=; b=SeBoeD4psk5HhK0Im2L8U1dtjMPZvD0KbKSRhwXpRwewZ5YJHG0gpDbuV6vH7RcGgn FjPNJ0rKGGGmKO2U1rmlBoggm5xjjRSYCwuHl5ejWlWnpR7XnKuzr6PxKa2hG8CDQcJG OxVerUGd52Ja+cxe6+pW0tFFD/4fnjAhOaFAHv93MOqR+/CWdCU5ybPJ9aUyduvG1WqF QrAkDmklA70NbrCx1pjAMEOR2EMjcgt/VL6Ja423DXFxh2648MSZPdNRK3c8xERLXYxM XY18iwZ/C1UjubNhW95SfAmRSAGU4OOuSijv2XhAhhgFMvt9JL9QC/h3Jh56v5J9jdAT GeJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804242; x=1747409042; 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=uBFUgMI3CMXidd0bDfXxsK4EibVzW+KUvzXEr8r4NKU=; b=dmFTtOwKCOu4bifvB0FC4+8CmfW6jX9LTvJSGyD3ji1oAnYnYezUMC9XFI/qcxnl23 Ay8nbcliGLtq41NowShlz4pwEtvS1p7i24R7wFSJcIYhxgdXZUH8RITrzJTrXymd/6ug BswHUbPm/lAc112RthfJ9bSl9+rTXdj4flRHQxqMNM6p/j7GUOAwfjmpGe6h8idmNCHH iJn4tnY6wRgmtiqyt7Rc5GC3XW1TuxcLmXQ3VkU/oMenv8HUyCE0624Xd8lpUW+cd7UO 5w8nFpsB4YVEI3Ru6Ei8Ts5Vjg2hfXsDlFasxUVkt0DGrrJb0HDtVSGPXuazfHVJwCid eF8w== X-Gm-Message-State: AOJu0Yxp4ka5DprG+bgRIuZcGFmHx57mXeW//WzENA9OnF+X1EaMRHj9 jh+3hISZmcWxM2dPq0SA09n/b2iBdyvLiMWgM+PxPiKYMKHj5CyU4XsDicdpU/tgnWhMPFaXL7X o X-Gm-Gg: ASbGncuvrlKvleXkbu/KLP2Z00jzi6K4IA5xz1jmPT+IxmT2cLFdwxFCwI/y+YPcimX IPdEeQWc/elfZI2nezSTU6vahGFP6ErF/D6tCwnq9uV4eRWZeYWffneWTKv/RcsKHJPkKB2D74h RLgbFoLJLv9Y6UyOtNIEZrfhdPaDFpsWZwYaULAYaASyJ/RHbSdDNWM8eRJxHAbbnQvBnUQHEhZ wae3sP3L23riMZ5k8wXi8nekWrz8/V5Ic1nUyuomU1oBoej4hpVbh2OJWjtijoWj815WWVRSg6/ NRLDAbkJT6FAnSPg+oPOxNKLEo9HWNa+ X-Google-Smtp-Source: AGHT+IEIpffr1wP9uAqiwYJmUKblttyLd5wAsJ9DmCjWvi4U/yyoF+/rJwYlHlLdZH3UJBnY/Kh+Aw== X-Received: by 2002:a05:6a00:c81:b0:730:9801:d3e2 with SMTP id d2e1a72fcca58-7423be6f965mr6202258b3a.8.1746804242341; Fri, 09 May 2025 08:24:02 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 07/17] insane.bbclass: Move test for invalid PACKAGECONFIGs to do_recipe_qa Date: Fri, 9 May 2025 08:23:23 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216215 From: Peter Kjellerstedt This makes sure invalid PACKAGECONFIGs are reported also for recipes that have no do_configure task, e.g., packagegroups. Signed-off-by: Peter Kjellerstedt Signed-off-by: Steve Sakoman --- meta/classes-global/insane.bbclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index fc4ca84b35..748de050e0 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1418,16 +1418,6 @@ Rerun configure task after fixing this.""" except subprocess.CalledProcessError: pass - # Check invalid PACKAGECONFIG - pkgconfig = (d.getVar("PACKAGECONFIG") or "").split() - if pkgconfig: - pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} - for pconfig in pkgconfig: - if pconfig not in pkgconfigflags: - pn = d.getVar('PN') - error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pconfig) - oe.qa.handle_error("invalid-packageconfig", error_msg, d) - oe.qa.exit_if_errors(d) } @@ -1475,10 +1465,20 @@ python do_recipe_qa() { if re.search(r"git(hu|la)b\.com/.+/.+/archive/.+", url) or "//codeload.github.com/" in url: oe.qa.handle_error("src-uri-bad", "%s: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol" % pn, d) + def test_packageconfig(pn, d): + pkgconfigs = (d.getVar("PACKAGECONFIG") or "").split() + if pkgconfigs: + pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} + for pkgconfig in pkgconfigs: + if pkgconfig not in pkgconfigflags: + error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pkgconfig) + oe.qa.handle_error("invalid-packageconfig", error_msg, d) + pn = d.getVar('PN') test_missing_metadata(pn, d) test_missing_maintainer(pn, d) test_srcuri(pn, d) + test_packageconfig(pn, d) oe.qa.exit_if_errors(d) } From patchwork Fri May 9 15:23:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62687 X-Patchwork-Delegate: steve@sakoman.com 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 9E7EDC3ABCF for ; Fri, 9 May 2025 15:24:13 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.1422.1746804244433656949 for ; Fri, 09 May 2025 08:24:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=x2LiZPfX; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso3193382b3a.2 for ; Fri, 09 May 2025 08:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804244; x=1747409044; 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=IFY1JKfV40ePZ7BNGWJZN/ncD8gPJzMqvq1UW+mwqBs=; b=x2LiZPfXVCLv2KuPmCvHwwIve9mEUNsFUi2pQsAPdYhbDZybQsKarGM4WDIadBtL5J iJQilRk0zDWMWlhKSRsk+tk1BvwtIWKNy6Ppn52cT6eVDK9dEvcrAzBXdg2/lDJDjghs +RKq7mts21ztjp11S2enc3FbNpJ3lH+yIyJdKPmFtzJv0AxGoaOiG1o/9UtDg1Qo+HsW MhlxAkoH9/AGwAxUes0vRfQ5fj17aQNreuKQIMiQe86b/+6bJqELMEYdMDxpf30d6Rvf CuTeZGphC8m6rcV615iRzjTjYfrq70BB5HB10UG7XJR3BZLPRG53QAb7TvgpRBRfBU40 363g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804244; x=1747409044; 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=IFY1JKfV40ePZ7BNGWJZN/ncD8gPJzMqvq1UW+mwqBs=; b=KxfRB1D0MJKKvDYyaAT8ZDxZXYwMxGRY6ZPHH1YuTd/4EE37ujM0WSzTpP1UFWoS85 YzXiNwX8+3S7KCRa0+P8D2/Sxzu9MuVMBxLsscEIkDrHDeUti7xoBPb3IXBHMEHWV9OU Bgil/6EKe23fJDkf7JZFTpWArd5MIyqrbN7FU5ynTVH3F5y9567JjMAZZnho8u3kl7Pi 80F9CdkoywetdovqxBLHQVoSZLWB49c+ATEuBqK6yF/fiuOQrlPE7LtcWgT3XcQ4Ogzf GYZ9aZuwbY2Y3W6Zy1D5M0lkDGJChPCCH14RdvxLJN6UcfQwdwAov3yw5zbYNndJnC2g uHew== X-Gm-Message-State: AOJu0YzNQjGjE2I/UGYsqmcHWDeqgygvOCsf/C6Ub+rfTTVR4adN3Uj3 Ifp6WD9HBuRmaVURZMQOKCif/KyhSxaMimNikrtNivFEC+sAU/ZnnWu8Cf0GP8fPlL8lHhceTcs v X-Gm-Gg: ASbGnctpnhMOWUsA4SLD+6aZcp2CFDZj8Qj+VknUCaNUC2G2ML5YyBAQ5omvCoYaLM/ 9qNrNKVNsVlakpI8H0+rdZ9wEhF9Sw4FngRBMAjhfNhtcsSjU0ug3B/sOl66DpcS7PZxgla/YJo /EpMGPyBJYwEDofVxOJ+x6DYSKQBzoEKWv/hCVBcw6ZdoaDN1gQHqjYiKJb7kLivzx+97jJUB/Y vvifghSWvpQJHJNSbGEN9A2DxBzP8CS3jAZTnESWxkgN6jTBSc+wzfDL0OtskWEU9dLpCc3B1gq PM2hjS9BVh8sI0uZNG33iwMSIRD+Uwdt X-Google-Smtp-Source: AGHT+IEHOxVGyn+YvoUMJIxHr1IRmbWeNAi0XyH+QGNMR13DMMxp3xoD6LWF1B1lRW2LE/A1G2rn9g== X-Received: by 2002:a05:6a00:4605:b0:740:9c57:3907 with SMTP id d2e1a72fcca58-7423bfeb5b0mr5464986b3a.19.1746804243662; Fri, 09 May 2025 08:24:03 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 08/17] insane.bbclass: Report all invalid PACKAGECONFIGs for a recipe at once Date: Fri, 9 May 2025 08:23:24 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216216 From: Peter Kjellerstedt Rather than reporting each invalid PACKAGECONFIG with a separate error message, report them all with one error message. Signed-off-by: Peter Kjellerstedt Signed-off-by: Steve Sakoman --- meta/classes-global/insane.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 748de050e0..cd26bf5eb9 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1469,10 +1469,10 @@ python do_recipe_qa() { pkgconfigs = (d.getVar("PACKAGECONFIG") or "").split() if pkgconfigs: pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} - for pkgconfig in pkgconfigs: - if pkgconfig not in pkgconfigflags: - error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pkgconfig) - oe.qa.handle_error("invalid-packageconfig", error_msg, d) + invalid_pkgconfigs = set(pkgconfigs) - set(pkgconfigflags) + if invalid_pkgconfigs: + error_msg = "%s: invalid PACKAGECONFIG(s): %s" % (pn, " ".join(sorted(invalid_pkgconfigs))) + oe.qa.handle_error("invalid-packageconfig", error_msg, d) pn = d.getVar('PN') test_missing_metadata(pn, d) From patchwork Fri May 9 15:23:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62689 X-Patchwork-Delegate: steve@sakoman.com 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 9EB2EC3ABD3 for ; Fri, 9 May 2025 15:24:13 +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.web10.1407.1746804246148151727 for ; Fri, 09 May 2025 08:24:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ogyPx63T; 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-739525d4e12so2234891b3a.3 for ; Fri, 09 May 2025 08:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804245; x=1747409045; 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=yXshk84FRRfhZV6O4rFK66rhd7Qr392pbI8QxwZKq4s=; b=ogyPx63TXoPcWW1ex77zPbOxsGniYIvN6wQyk5MZwakJtXsAtaoag9N7SlkEcPs7xU HE6fM/AuCh0Naw7udLxCY8RQZmDhPechnQmDm2kEqmOWF6FlNQ+OUKdALulkoRYXhj2o AXilgdy/IVs6Do0Q60mlSsafqvdNRXBv5fQzkR2ybZagmCyojLvWZZf1bVJ2FpvTg1A4 vet3DyZpUDJekDqNNIT8tGJlJCcJ51rLCudBLsOjr+zmeZLoO31hbY2sF8zpsBvmtoTi pjIZCXcpIGVL1wMSgn/6LHRzIupLUp9GAaAB2+WfkO5cJ8Y3O/3bBFHo05nVC1fbnzDa ZDxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804245; x=1747409045; 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=yXshk84FRRfhZV6O4rFK66rhd7Qr392pbI8QxwZKq4s=; b=MZ+vqUzWFPGQp6HE5DPvVbjdL9ZZdCrwnUXQypyl5LjKN8Bw9NB8FYyBdb+dKHdv+6 VbLHKAgeNm+Y2p6EeJIilc3JvLui0oGuFRXthj4+Iu/iEaY0Qtph5+XhokDG78EaWWcq ir+3vjDhWfvPiM3S5JzGv63iWIOtzJiFQNgDpfDKOOJFTDIi4ijzgQehEitUWlzxNRlr XNaS7+TJaOgCUxgbGouw6VYqY1iv0UuGIuNIe1Us0ZRjwtwbnul054IFYozXRhWZqss9 7CRZvnVivPctbPXyi4gVBxA+IwsuA8pD5Ps6jNZaYEhJaSpCDmvY/OTW2mJsycva5Wd0 8nww== X-Gm-Message-State: AOJu0YxgmxpFqzt+2KcIW6iBfany/gdMrDmvNnnbhiFd83pv3PpQj2Vy q15lGHz3rD/A6fhAT6B8WE/38DjETcX8OhOjl7u+oNafotTF6C8RSfvQ80T5h2fZTsK+pGKZ/Sn G X-Gm-Gg: ASbGncu/dQIwxNpJUGeeqnJhsoSbAaFpz/HuaYDPyfV0+XL68oBRfJmqIJFwCR1vGXv 5haQdkSc3T/Ivgln7xmTPeqG8CW1eLbTgMUDVftp4jtN+5zneppMG/q8NL3UKOoBmZqCtVXtZ8G 9sewTPg5INurOCsDupb9eNnYBs1sFg6aIAxB4g6foCEL7u53BXq2K4Kc+3LwtZA/1tv+mLzCKla Sotk7k2WM2k1ZTxKsxmtXx6NyxmwBnn6hWTpvx8hPBjqbakdfAVC6sXl8ZNIlNf8JCNDj3KxTPr UcL+fzSZIrUuo3ViOJhsv8an8AGETJdONz6+Hbs6a3g= X-Google-Smtp-Source: AGHT+IEuP+9ZbdhTEyrkp823WWxQd/Y9CA2CGJJ65eZ7hlhoTcy7yjVPzNy9efpk9NEyeh/G+NlOzg== X-Received: by 2002:a05:6a00:138c:b0:736:b101:aed3 with SMTP id d2e1a72fcca58-7423bc1d5f4mr4920962b3a.1.1746804245384; Fri, 09 May 2025 08:24:05 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 09/17] patch.py: set commituser and commitemail for addNote Date: Fri, 9 May 2025 08:23:25 -0700 Message-ID: <2d202462cf85e92cc18bc07cffdb0f335e524256.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216217 From: Changqing Li When PATCHTOOL is set to 'git', and user don't setup user.name and user.email for git, do_patch fail with the following error, fix by passing -c options. CmdError("git notes --ref refs/notes/devtool append -m 'original patch: 0001-PATCH-increase-to-cpp17-version.patch' HEAD", 0, 'stdout: stderr: Author identity unknown *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- meta/lib/oe/patch.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 58c6e34fe8..edd77196ee 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -462,21 +462,23 @@ class GitApplyTree(PatchTree): return (tmpfile, cmd) @staticmethod - def addNote(repo, ref, key, value=None): + def addNote(repo, ref, key, value=None, commituser=None, commitemail=None): note = key + (": %s" % value if value else "") notes_ref = GitApplyTree.notes_ref runcmd(["git", "config", "notes.rewriteMode", "ignore"], repo) runcmd(["git", "config", "notes.displayRef", notes_ref, notes_ref], repo) runcmd(["git", "config", "notes.rewriteRef", notes_ref, notes_ref], repo) - runcmd(["git", "notes", "--ref", notes_ref, "append", "-m", note, ref], repo) + cmd = ["git"] + GitApplyTree.gitCommandUserOptions(cmd, commituser, commitemail) + runcmd(cmd + ["notes", "--ref", notes_ref, "append", "-m", note, ref], repo) @staticmethod - def removeNote(repo, ref, key): + def removeNote(repo, ref, key, commituser=None, commitemail=None): notes = GitApplyTree.getNotes(repo, ref) notes = {k: v for k, v in notes.items() if k != key and not k.startswith(key + ":")} runcmd(["git", "notes", "--ref", GitApplyTree.notes_ref, "remove", "--ignore-missing", ref], repo) for note, value in notes.items(): - GitApplyTree.addNote(repo, ref, note, value) + GitApplyTree.addNote(repo, ref, note, value, commituser, commitemail) @staticmethod def getNotes(repo, ref): @@ -507,7 +509,7 @@ class GitApplyTree(PatchTree): GitApplyTree.gitCommandUserOptions(cmd, d=d) cmd += ["commit", "-m", subject, "--no-verify"] runcmd(cmd, dir) - GitApplyTree.addNote(dir, "HEAD", GitApplyTree.ignore_commit) + GitApplyTree.addNote(dir, "HEAD", GitApplyTree.ignore_commit, d.getVar('PATCH_GIT_USER_NAME'), d.getVar('PATCH_GIT_USER_EMAIL')) @staticmethod def extractPatches(tree, startcommits, outdir, paths=None): @@ -654,7 +656,7 @@ class GitApplyTree(PatchTree): raise finally: if patch_applied: - GitApplyTree.addNote(self.dir, "HEAD", GitApplyTree.original_patch, os.path.basename(patch['file'])) + GitApplyTree.addNote(self.dir, "HEAD", GitApplyTree.original_patch, os.path.basename(patch['file']), self.commituser, self.commitemail) class QuiltTree(PatchSet): From patchwork Fri May 9 15:23:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62686 X-Patchwork-Delegate: steve@sakoman.com 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 86320C3ABC3 for ; Fri, 9 May 2025 15:24:13 +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.web11.1423.1746804247694993181 for ; Fri, 09 May 2025 08:24:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yjfRE5fx; 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-7403f3ece96so3217485b3a.0 for ; Fri, 09 May 2025 08:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804247; x=1747409047; 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=m63Vof5V5obDChBb2q6z5RcHudSCDZobec83vydlu5A=; b=yjfRE5fxU84/gufjNDXDzH8ikS/5afsBCC3IALjn569hjQEoX1s2ujwhwqJ13c8XCp V1G4L6E5+7pYuaZjALyk56mrIYZwPnJQD7cA8zuR7g/W2FwM72+M8Ys00vABB0pHXY8K ezSMDkD9cxqw+NmBAoozCZKhyOQYY711cvGmuWQLc9gxhid5uV6Kz7lo+3yQcCsJI0Xm slOuKd9h/9RvOy1gVQm2/7nRnj1x5nRbIij0nTRlbLWEUwJmfygwH8ZHO4asZoRgwuM8 eJwvCtC/eymP/3UxdUt25KIolsLXUhiIAsjdWuu9nTvxIBDKCxGiLZh/wlrTIuPsITca uQWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804247; x=1747409047; 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=m63Vof5V5obDChBb2q6z5RcHudSCDZobec83vydlu5A=; b=QX2OJXnKCgHxCUgtviC3sInTWKy9m4kKNiED3h+iE2G8vLBJyGGOoT2hY+UxvJrZTE C0r50pRpl59I3W106W2qURC3eoC7NmaSiEol1x7hPzHBMjXLsgFEAb2159L2tbR2Vii5 ShyGlhGqopupvfQCtm4GKIB0F64K6qyFEHtfgzFlSSgTM+kdJPafkDKgxV/zjS83c7iY nZgDF5DWSuEIyAu3LHnRFT2PChTycCSQjdLSqpm9Y2iywSawykYPtK2Eeraz0CnSmpFk 0WB/pGWUVdRweLgNRwUBSSThXaYqz6HVZ+v+NE1cXMlf1LPJKq+9h7k2pQ3WUwEZ6FYl /qew== X-Gm-Message-State: AOJu0YzTvebX/BFQC5iZ4OPJFvevArNZkSYN9fsZlQQN3ZrE8o3tZ5lO EMQlh3GrjB9XRR9jBvPtnGAbOJgz8bzB0vMc0X3PvG7OY16aC9UpHjkJv++qE79w0CcNko3aNeo l X-Gm-Gg: ASbGncsou8mTOyXiQjUHWXeDXYTKcX/xN8/dHDUBgEzIi5QSDi8otVc/BaeO5IUeZ/j WgA7qAwEis6gbbri3yi/pOG8I2UFoeWm4Qf8TVHgu2P04Vm6LuKVmU2Pd+g1+onOk6vGIl+vbnt +moPSN1HlOMv+PH45UM2545nmMpvp4DAuWXNziPlgqI0khDCz0VgW5YzXeNbJhy38MPkjDhqjRi AuHgsfu4N23c8/bICY2TAQ4Sxar60MezpLPnUeC8I4A5r4SbjtE+6CeswqfRsO+6/uJ7TNx1wyx cZFhLXzzS2g358J9X7LlcEs8D5xumqVn X-Google-Smtp-Source: AGHT+IEiMV2BcXyDVa+2ktPr7SkEgLOUzvlGRIc824dx+ixDHd9evZxsi7LT6l65L49LqQKjlm44fA== X-Received: by 2002:a05:6a21:1518:b0:20e:4f4b:944a with SMTP id adf61e73a8af0-215abc297ecmr6030477637.32.1746804246919; Fri, 09 May 2025 08:24:06 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 10/17] initscripts: add function log_success_msg/log_failure_msg/log_warning_msg Date: Fri, 9 May 2025 08:23:26 -0700 Message-ID: <1956cb8e04c586b555f51bc68b74ad5d5cf1a043.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216218 From: Changqing Li * add function log_success_msg/log_failure_msg/log_warning_msg, some packages still use these functions, like mariadb, refer [1], without these function, with sysV init manager, mariadb will report error: root@qemux86-64:~# /etc/init.d/mysqld status /etc/init.d/mysqld: line 383: log_success_msg: command not found * remove RCONFLICTS with lsbinitscripts, LSB support already remove in [2] [1] https://github.com/MariaDB/server/blob/main/support-files/mysql.server.sh#L104 [2] https://git.openembedded.org/openembedded-core/commit/?id=fb064356af615d67d85b65942103bf943d84d290 [3] https://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/iniscrptfunc.html Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- .../initscripts/initscripts-1.0/functions | 21 +++++++++++++++++++ .../initscripts/initscripts_1.0.bb | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/functions b/meta/recipes-core/initscripts/initscripts-1.0/functions index 35aebd4a55..7fc19c808b 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/functions +++ b/meta/recipes-core/initscripts/initscripts-1.0/functions @@ -92,3 +92,24 @@ passed() { echo -n -e "${BRACKET}[${SUCCESS} PASS ${BRACKET}]${NORMAL}" return $rc } + +log_success_msg() +{ + echo -n $@ + success + echo +} + +log_failure_msg() +{ + echo -n $@ + failure + echo +} + +log_warning_msg() +{ + echo -n $@ + warning + echo +} diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 98693fa66e..0bc078c5eb 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -54,7 +54,6 @@ RDEPENDS:${PN} = "initd-functions \ # Recommend pn-functions so that it will be a preferred default provider for initd-functions RRECOMMENDS:${PN} = "${PN}-functions" RPROVIDES:${PN}-functions = "initd-functions" -RCONFLICTS:${PN}-functions = "lsbinitscripts" FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" FILES:${PN}-sushell = "${base_sbindir}/sushell" From patchwork Fri May 9 15:23:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62688 X-Patchwork-Delegate: steve@sakoman.com 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 8C817C3ABCD for ; Fri, 9 May 2025 15:24:13 +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.web11.1425.1746804249244862273 for ; Fri, 09 May 2025 08:24:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ft0CpqsK; 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-739b3fe7ce8so2294688b3a.0 for ; Fri, 09 May 2025 08:24:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804248; x=1747409048; 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=OHZH+MVBn1fsuDh6HW3uHGu4h5OM1IDI9Hh1Iqs7Efo=; b=Ft0CpqsKdm6DcvUgwCtSlzNr9if9et7i1XG/PSCIaHtSNe4u2oPHsITOZjOedulOpf yQD35nC5wsW2KZOdTjYIZnyHnDsKtPdEiXanPFnZpt7wTcKGRMnKKpYF/g1srDPJuEL2 mqk+dTcPw3PIF3X/3zpeho/cgEjvKk14yn9885F7hHfSEZwp1Pj/tOojYYHij7PG2hjg Ef5/tIBcIpIHnA7elihxaqd2t4WHl5Zq5V8k6oNG/SkjFUo4SCiwE30sBbEV0YSddPkL t/QPh4FmUK6I/z10FbKF0LrHospWlDcZgwGN6GZWgqXkHCjBjHeV5P21giWXioSyl0qE 7j0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804248; x=1747409048; 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=OHZH+MVBn1fsuDh6HW3uHGu4h5OM1IDI9Hh1Iqs7Efo=; b=KUVFcuONhd+X0wY2yz4jNS7y4CLWVwl/jsbfuHHzCDn2ex7nCjZnF/waPiAc5kfGT0 ZxUOA2rNMiuca7vpQe6Pc9wHN3wzX52g+SSRqsOeYDOCUEB+6FeTsX9FIR9WamP7RQ/H OJgRBtzJL/65FVQZeaVrve73DD0SiEqn3bDHzvRJ6R6e6PYPLFnU1vJlFVM7jCwn07bQ eVg5hZhZTnSrLsNzeL3EsHEwbqNpJZAaGkBMi4otpRBq2FS82RSeUFqe3sFXxnbnNyHJ 4h/DJhbzOcog5iyPIQh6XuQAbpqS1gygAugkodjo1+AbkbIMfPnV59lWlp1cnX3kv8Id HMAQ== X-Gm-Message-State: AOJu0YxDM9hXWkdu01Ymeq00zfK8bPT9Kec0/sxSiqgGNOgdO4iNFO/n yldToKXaaFE+9A6xIESSVgichEh2XcH5wRC24Xun9C24/lTiH6GfB7SXDR62A7lrQ8ynVTDbgiX T X-Gm-Gg: ASbGncvlPF18/B/k4eNKPv+TBNPuzP0EpxaOE2AKxZYX5kN1kdj5StHTQVBwrU0vat/ nuvtiXVsRoeBkga6E8XKzelvpGfKkM4lYbgzQU9jTBtxqhF9UIFKz+tE+3tvhBlEHDqlL5zq2nJ QxSu3MtJmb6odtizJOVNx7P76c779fIcb84FrVoVxqtGEyWqTqgTWLo35xFW1JIK3FlzgYkkBPq JyLV49wUy61dN4Mnlk4X1sQ3wcYqbCtXbmzioRWpIPlyL1kWLwJ1BUlCP07eVR+PSpPPCb6+8fx B5r7kpEE8wBPSmBMnBd2TCjdGfwGC81v X-Google-Smtp-Source: AGHT+IH3S+7X4ZfPFss+mTccLBlUBTCWPd8eKf4GiH6l2BjlBa1c5Vpdjz0mG3WI+QeV8q8QUCtb/g== X-Received: by 2002:a05:6a21:4610:b0:1f5:7ea8:a791 with SMTP id adf61e73a8af0-215abb8df29mr5309144637.10.1746804248350; Fri, 09 May 2025 08:24:08 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 11/17] buildtools-tarball: move setting of envvars to respective envfile Date: Fri, 9 May 2025 08:23:27 -0700 Message-ID: <5c915fcada5868bdbb8aa3e28c18a26cfc41914f.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216219 From: Changqing Li * make git,curl,python3-requests align with openssl, move the setting of envvars into respective envfile * for environment.d-openssl.sh, also check if ca-certificates.crt exist before export envvars Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- .../openssl/files/environment.d-openssl.sh | 9 ++++++--- meta/recipes-core/meta/buildtools-tarball.bb | 6 ------ meta/recipes-devtools/git/git/environment.d-git.sh | 3 +++ meta/recipes-devtools/git/git_2.49.0.bb | 9 +++++++++ .../environment.d-python3-requests.sh | 3 +++ .../python/python3-requests_2.32.3.bb | 11 +++++++++++ meta/recipes-support/curl/curl/environment.d-curl.sh | 3 +++ meta/recipes-support/curl/curl_8.12.1.bb | 9 +++++++++ 8 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-devtools/git/git/environment.d-git.sh create mode 100644 meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh create mode 100644 meta/recipes-support/curl/curl/environment.d-curl.sh diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index d4b9047565..79b9bc77ec 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh @@ -1,6 +1,9 @@ export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/openssl.cnf" -export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs" -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs/ca-certificates.crt" +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs" + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs/ca-certificates.crt" + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" +fi export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" -export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index e2ce5b3ecf..414c266663 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -73,12 +73,6 @@ create_sdk_files:append () { touch $script echo 'export PATH="${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script - if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then - echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - echo 'export REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script - fi echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script echo 'unset HOST_PKG_PATH' diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh new file mode 100644 index 0000000000..18104f0528 --- /dev/null +++ b/meta/recipes-devtools/git/git/environment.d-git.sh @@ -0,0 +1,3 @@ +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" +fi diff --git a/meta/recipes-devtools/git/git_2.49.0.bb b/meta/recipes-devtools/git/git_2.49.0.bb index 2ca8711f75..3538170d08 100644 --- a/meta/recipes-devtools/git/git_2.49.0.bb +++ b/meta/recipes-devtools/git/git_2.49.0.bb @@ -12,6 +12,10 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ " +SRC_URI:append:class-nativesdk = " \ + file://environment.d-git.sh \ + " + S = "${WORKDIR}/git-${PV}" LIC_FILES_CHKSUM = "\ @@ -112,6 +116,9 @@ do_install:append:class-nativesdk() { GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} perl_native_fixup + + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${UNPACKDIR}/environment.d-git.sh ${D}${SDKPATHNATIVE}/environment-setup.d/git.sh } FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" @@ -152,6 +159,8 @@ FILES:${PN}-tk = " \ PACKAGES =+ "gitweb" FILES:gitweb = "${datadir}/gitweb/" + +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/git.sh" RDEPENDS:gitweb = "perl" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh new file mode 100644 index 0000000000..f2eee203ca --- /dev/null +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh @@ -0,0 +1,3 @@ +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" +fi diff --git a/meta/recipes-devtools/python/python3-requests_2.32.3.bb b/meta/recipes-devtools/python/python3-requests_2.32.3.bb index 4f0638b50c..bc9b2289f6 100644 --- a/meta/recipes-devtools/python/python3-requests_2.32.3.bb +++ b/meta/recipes-devtools/python/python3-requests_2.32.3.bb @@ -3,10 +3,19 @@ HOMEPAGE = "https://requests.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" +SRC_URI:append:class-nativesdk = " \ + file://environment.d-python3-requests.sh \ +" + SRC_URI[sha256sum] = "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760" inherit pypi python_setuptools_build_meta +do_install:append:class-nativesdk() { + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${UNPACKDIR}/environment.d-python3-requests.sh ${D}${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh +} + RDEPENDS:${PN} += " \ python3-certifi \ python3-email \ @@ -19,6 +28,8 @@ RDEPENDS:${PN} += " \ python3-compression \ " +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh" + CVE_PRODUCT = "requests" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh new file mode 100644 index 0000000000..0d53aabb8e --- /dev/null +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh @@ -0,0 +1,3 @@ +if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" +fi diff --git a/meta/recipes-support/curl/curl_8.12.1.bb b/meta/recipes-support/curl/curl_8.12.1.bb index dd1c89979a..4192693da8 100644 --- a/meta/recipes-support/curl/curl_8.12.1.bb +++ b/meta/recipes-support/curl/curl_8.12.1.bb @@ -15,6 +15,11 @@ SRC_URI = " \ file://disable-tests \ file://no-test-timeout.patch \ " + +SRC_URI:append:class-nativesdk = " \ + file://environment.d-curl.sh \ +" + SRC_URI[sha256sum] = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202" # Curl has used many names over the years... @@ -97,6 +102,9 @@ do_install:append:class-target() { do_install:append:class-nativesdk() { fix_absolute_paths + + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + install -m 644 ${UNPACKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh } do_compile_ptest() { @@ -150,6 +158,7 @@ FILES:lib${BPN} = "${libdir}/lib*.so.*" RRECOMMENDS:lib${BPN} += "ca-certificates" FILES:${PN} += "${datadir}/zsh" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" inherit multilib_script MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" From patchwork Fri May 9 15:23:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62685 X-Patchwork-Delegate: steve@sakoman.com 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 93D7CC3ABCE for ; Fri, 9 May 2025 15:24:13 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.1410.1746804251417523536 for ; Fri, 09 May 2025 08:24:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=246GkIYd; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-736c062b1f5so2438570b3a.0 for ; Fri, 09 May 2025 08:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804251; x=1747409051; 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=OpNh2vAwV3ninlNCjdDlcBraQy9dE9QqK3gXWhBlaA0=; b=246GkIYdGJl0/9GCeO5oQdYRvmGkq4E7qtAnWV48V4wJVvv/MyBxULoo2+DLcfnc8z APQOT8lctp/VZR0E9VJ86cKZND+zEnNRo+kGUfmyCyg2D4gbHqu8HUHrcWvVueGAet71 NLDVMScbMrfloY1UuuitRkzCUKOicxyWK4KgIhrLuona3PGD4Ymqm4BVm9MrlKx5SWqG DNRgfC628yRbodZvD5S2hrNpTCABRq//RfmOw1HUq+6pxNCvayJUYmbHHe4S12yEMemj heOCWwOnu4QImK8Ez+TfyVyMB0nnGmB1o9ynRYZBdV7UrueiHjSWGdkOnKwiXO4zyis3 FhVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804251; x=1747409051; 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=OpNh2vAwV3ninlNCjdDlcBraQy9dE9QqK3gXWhBlaA0=; b=eJJPnNbmcgDd/x1y0ZScuyDZ8e0IIaaSak+a1vILhxX1KeT/HZWVujQVfPuM8YSIB2 O6xwNoHNiLf2GMtGH4duplEgMAsT24pLbDUthWHdUMwPa2r5KCfeCFSpEdVpLqMjc90K imxIomdhn7LJCgt+eqQ74vrydzd7tvErlCrNopM830OlocnZ30IEZXn0MzG3pdChfVMn KmFI/1AwT40MWAVTpsuheNU7aTg/NcXqRoC0ofzfap1D7Z3NUP527CniWd9DsYt+q6Ln zyB4EKLtkVx8+NX2iVmMSLvFXReBR5S/ZsPydhfX1zA5hwDoqsvwLDWa6rci9g+ZPNpa w3PQ== X-Gm-Message-State: AOJu0Yw0stfkUqW3trTcXQjXoYRnied2z4XI1q+RI/PaSW+i0957jUtD iFoyK02DVjs5DwQGQOb9C5CM3e8fY8MdzFvDX9RM3q+yjrq6BCzXfVdprZtr8qFNfyD8IBOoFpn Q X-Gm-Gg: ASbGncv1GID9Q/59dB/FVk9mcdZZHGXDaBw+f4VlSgoCShv5dIuOXYPUbvc93aZy0fN +tN2iJlP6luZNROzMGhLf8GqENaXYO01U6mGGS7K7UppWLMKpkFEjwlk2k9ouvo1lFyP8ng4cuQ wM2asokzjnLe/85PtYamhZUnfP0f2BZj4Q9UzG9FD4p6qRqesjFVVV6gAkeeUPJ4lAkDsGO8s9q Ve2VxihDMeOWgwMXNMbEBtAf7hgGFzbMmpPADHMwMbI1/nRHG1f9KAg9ui4Nyj4Rr1ipZxly5lo UU0IPMPHkPgNBK/HAy14GwwzVDHYCu9INi9e5zvjdyo= X-Google-Smtp-Source: AGHT+IGcoG4sm0ehK1LsXrBYM4GM7JO/fxONMg5qYID+B//p9IuYXUQ91pPuWw+61xgyPa8TyOJzDw== X-Received: by 2002:a05:6a00:190e:b0:740:595e:1676 with SMTP id d2e1a72fcca58-7423bc59257mr6545595b3a.8.1746804250541; Fri, 09 May 2025 08:24:10 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 12/17] buildtools-tarball: add envvars into BB_ENV_PASSTHROUGH_ADDITIONS Date: Fri, 9 May 2025 08:23:28 -0700 Message-ID: <5fa8cb40395977722d0d5a2271c8044598fb1f01.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216220 From: Changqing Li Here is one testcase: For recipe tensorflow-lite-host-tools_2.18.0.bb, refer [1], do_configure[network] = "1" and it will git clone some repos in CMakeLists.txt When buildtools is used and nativesdk-git is installed into sdk, do_configure failed with error: [1/9] Performing download step (git clone) for 'protobuf-populate' Cloning into 'protobuf'... fatal: unable to access 'https://github.com/protocolbuffers/protobuf/': error setting certificate file: /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-wrlinuxsdk-linux/etc/ssl/certs/ca-certificates.crt Fix by adding GIT_SSL_CAINFO in BB_ENV_PASSTHROUGH_ADDITIONS, so that user can export GIT_SSL_CAINFO=${GIT_SSL_CAINFO} in their do_configure:prepend() to fix above do_configure failure CURL_CA_BUNDLE and REQUESTS_CA_BUNDLE is similar envvars, so all add into BB_ENV_PASSTHROUGH_ADDITIONS [1] https://github.com/nxp-imx/meta-imx/blob/styhead-6.12.3-1.0.0/meta-imx-ml/recipes-libraries/tensorflow-lite/tensorflow-lite-host-tools_2.18.0.bb Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git/environment.d-git.sh | 1 + .../python/python3-requests/environment.d-python3-requests.sh | 1 + meta/recipes-support/curl/curl/environment.d-curl.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh index 18104f0528..f8e3221510 100644 --- a/meta/recipes-devtools/git/git/environment.d-git.sh +++ b/meta/recipes-devtools/git/git/environment.d-git.sh @@ -1,3 +1,4 @@ if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} GIT_SSL_CAINFO" fi diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh index f2eee203ca..c7faec127d 100644 --- a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh @@ -1,3 +1,4 @@ if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} REQUESTS_CA_BUNDLE" fi diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh index 0d53aabb8e..0ab83a267d 100644 --- a/meta/recipes-support/curl/curl/environment.d-curl.sh +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh @@ -1,3 +1,4 @@ if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" + export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} CURL_CA_BUNDLE" fi From patchwork Fri May 9 15:23:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62684 X-Patchwork-Delegate: steve@sakoman.com 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 7FF41C3ABCC for ; Fri, 9 May 2025 15:24:13 +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.1428.1746804253211681096 for ; Fri, 09 May 2025 08:24:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=QONxwUEi; 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-7423df563d6so941189b3a.0 for ; Fri, 09 May 2025 08:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804252; x=1747409052; 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=oZshGgVqUWDYA/M6R3aHTbvJQo3F+EopkBjJSj4/3hE=; b=QONxwUEigXvU7FoGygLLKIwPpjjGNzfola17JlXrH/B4xyMKM/4xLbXD6hsvjenivT nAQBnAs1Fix08ww+baHPtDX/1++J5enQYovQeVUWl8uJ24fs2dx1IkbrrmKWqwpJT5vb cUuIToQdHllbvcUfrpwPDyNnTQE51L2roUdoso6HCcaXKoChCPE9nfd8haz4nPmPKAG5 XCX6wWjaKI3rcw4V2+vM1LmP3uRaU7NUnUm7kcGS79tY+VWbusrpAimytvcnft9PG7JS k1B3lmzNHJ7fSktnLm8dN/4mxXMkXgD7Z575RjgN6hDkgueuJ3AXz9FwsOkFXMTBo1mG lv3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804252; x=1747409052; 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=oZshGgVqUWDYA/M6R3aHTbvJQo3F+EopkBjJSj4/3hE=; b=ZrHwM6deBU0DlAu4ujwHIm8jCA6fpI8ZZCCruHbMWImoakx6kXHP1mkDWsP1tPI6PG Z7mAAWyijR/XKCF47MH31EX3UlGxOQ2DoBkO0M5va9rOg+9h9DcAIpt1elPmsK+4E5jp UUtbM5b1CK/vtEt79+Bld/JRdsztpstyKRIykJCgeoZpoWzj6rCQEimo2//hlsaCI4ss txlikth0HfVIF9tm4Ykp8HydhYJA/QhRujkCofaUHskVQD68jfJIaHf1VzsMq8NgIu9h 8a/2no3kzJFQLHNfZWUqZCcv6w1fXsZ/NQtuON9WQL6ud7JkVLMs3Fbh9/Zq9qoVwKnu B1RQ== X-Gm-Message-State: AOJu0YzRH8Xc23N4J5DAtHPUSi5oYfjWYRCA5Hcn68pWkSl4ULcVjhWi sKC2KXlxoDgJsPwplokABYmeazlhULwn0HMCL7ZNzQ+ryDY6TLrKpYCdeZWIHJk5C/hsQGfi43b 3 X-Gm-Gg: ASbGncvvzhQ0/h0h+w2xv/YIi9ls7Z3v4Fyj0srKVhg8YywNQ/7YMLxShV++KZKMCio 2yv9Y+VIJOSIBUVwlKHwYYHapFcv4bT12qtus7eXDLCN1sT5B0TGXcbrzm79v62Ji8ne6p9TKlF JZ81csC2UU58vW4n8SPvOMmuRycbAGaRGJU59i3QPElH1QcBybg4ROrqoMRg3rGjuVIFl4AUH0M wNAXQz/5laFA2G7ceLi0VVDkOy5Ui2LEuhfs1pYmY7DBcRfKsjyHOD9EBxSNgMe9vz/Ot4MZLBV zjpZb/6VxK0b3vM5xWHjQ3Tl/bVyhH/s X-Google-Smtp-Source: AGHT+IEpcehLN2lFpk65ZMCAD6kXMmpFw2nq6qlBvaYA30Z81Mo3yfeku2oYeYPEOea/CHSsCYHEBQ== X-Received: by 2002:a05:6a00:1488:b0:736:34ca:dee2 with SMTP id d2e1a72fcca58-7423ba81707mr5719106b3a.4.1746804252375; Fri, 09 May 2025 08:24:12 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 13/17] buildtools-tarball: Make buildtools respects host CA certificates Date: Fri, 9 May 2025 08:23:29 -0700 Message-ID: <0d5f241eee19c0dff9f9f59949485414935edaa2.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216221 From: Changqing Li To adapt user network enviroment, buildtools should first try to use the user configured envs like SSL_CERT_FILE/CURL_CA_BUNDLE/..., if these envs is not set, then use the auto-detected ca file and ca path, and finally use the CA certificates in buildtools. nativesdk-openssl set OPENSSLDIR as "/not/builtin", need set SSL_CERT_FILE/SSL_CERT_DIR to work nativesdk-curl don't set default ca file, need SSL_CERT_FILE/SSL_CERT_DIR or CURL_CA_BUNDLE/CURL_CA_PATH to work nativesdk-git actually use libcurl, and GIT_SSL_CAPATH/GIT_SSL_CAINFO also works nativesdk-python3-requests will use cacert.pem under python module certifi by default, need to set REQUESTS_CA_BUNDLE Signed-off-by: Changqing Li Signed-off-by: Steve Sakoman --- .../openssl/files/environment.d-openssl.sh | 25 +++++++++++++++---- meta/recipes-core/meta/buildtools-tarball.bb | 23 ++++++++++++++++- .../git/git/environment.d-git.sh | 21 +++++++++++++--- .../environment.d-python3-requests.sh | 13 +++++++--- .../curl/curl/environment.d-curl.sh | 21 +++++++++++++--- 5 files changed, 88 insertions(+), 15 deletions(-) diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index 79b9bc77ec..71d378734c 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh @@ -1,9 +1,24 @@ export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/openssl.cnf" -if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs" - export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs/ca-certificates.crt" - export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" -fi export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" + +# Respect host env SSL_CERT_FILE/SSL_CERT_DIR first, then auto-detected host cert, then cert in buildtools +# CAFILE/CAPATH is auto-deteced when source buildtools +if [ -z "$SSL_CERT_FILE" ]; then + if [ -n "$CAFILE" ];then + export SSL_CERT_FILE="$CAFILE" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs/ca-certificates.crt" + fi +fi + +if [ -z "$SSL_CERT_DIR" ]; then + if [ -n "$CAPATH" ];then + export SSL_CERT_DIR="$CAPATH" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl-3/certs" + fi +fi + +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} SSL_CERT_DIR SSL_CERT_FILE" diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 414c266663..8e78169e23 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -80,14 +80,35 @@ create_sdk_files:append () { toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} cat >> $script </dev/null 2>/dev/null; then + CAPATH="\$a" +fi + if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do . \$envfile done fi + # We have to unset this else it can confuse oe-selftest and other tools # which may also use the overlapping namespace. -unset OECORE_NATIVE_SYSROOT +unset OECORE_NATIVE_SYSROOT CAFILE CAPATH EOF if [ "${SDKMACHINE}" = "i686" ]; then diff --git a/meta/recipes-devtools/git/git/environment.d-git.sh b/meta/recipes-devtools/git/git/environment.d-git.sh index f8e3221510..9c7b5a9251 100644 --- a/meta/recipes-devtools/git/git/environment.d-git.sh +++ b/meta/recipes-devtools/git/git/environment.d-git.sh @@ -1,4 +1,19 @@ -if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" - export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} GIT_SSL_CAINFO" +# Respect host env GIT_SSL_CAINFO/GIT_SSL_CAPATH first, then auto-detected host cert, then cert in buildtools +# CAFILE/CAPATH is auto-deteced when source buildtools +if [ -z "$GIT_SSL_CAINFO" ]; then + if [ -n "$CAFILE" ];then + export GIT_SSL_CAINFO="$CAFILE" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export GIT_SSL_CAINFO="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" + fi fi + +if [ -z "$GIT_SSL_CAPATH" ]; then + if [ -n "$CAPATH" ];then + export GIT_SSL_CAPATH="$CAPATH" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export GIT_SSL_CAPATH="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs" + fi +fi + +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} GIT_SSL_CAINFO GIT_SSL_CAPATH" diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh index c7faec127d..492177a9c3 100644 --- a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh @@ -1,4 +1,11 @@ -if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" - export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} REQUESTS_CA_BUNDLE" +# Respect host env REQUESTS_CA_BUNDLE first, then auto-detected host cert, then cert in buildtools +# CAFILE/CAPATH is auto-deteced when source buildtools +if [ -z "$REQUESTS_CA_BUNDLE" ]; then + if [ -n "$CAFILE" ];then + export REQUESTS_CA_BUNDLE="$CAFILE" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" + fi fi + +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} REQUESTS_CA_BUNDLE" diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh index 0ab83a267d..7c2971b3da 100644 --- a/meta/recipes-support/curl/curl/environment.d-curl.sh +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh @@ -1,4 +1,19 @@ -if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" - export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} CURL_CA_BUNDLE" +# Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected host cert, then cert in buildtools +# CAFILE/CAPATH is auto-deteced when source buildtools +if [ -z "$CURL_CA_PATH" ]; then + if [ -n "$CAFILE" ];then + export CURL_CA_BUNDLE="$CAFILE" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" + fi fi + +if [ -z "$CURL_CA_PATH" ]; then + if [ -n "$CAPATH" ];then + export CURL_CA_PATH="$CAPATH" + elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then + export CURL_CA_PATH="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs" + fi +fi + +export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} CURL_CA_BUNDLE CURL_CA_PATH" From patchwork Fri May 9 15:23:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62692 X-Patchwork-Delegate: steve@sakoman.com 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 A4CC1C3ABC3 for ; Fri, 9 May 2025 15:24:23 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.1411.1746804254998874402 for ; Fri, 09 May 2025 08:24:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=jWciZXIt; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-736c3e7b390so2369200b3a.2 for ; Fri, 09 May 2025 08:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804254; x=1747409054; 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=x+ia9cClTpLhWnZONjq1YMKZx0rNCjtwEDAzCIBHD0g=; b=jWciZXItU90qLh6q8J7bksiPEXdn4FMb7TkbAUTLT0PX79ICVVKrddJkBqWKcy5C7Y xv1hQzSSAIRkq0TNBNMycT5f8JvosVBLP8hlmEkSN5Dzn0IBq23UbvOJ883LjbBomZyZ ERVLC6YHLKpBy1IN0anzHgQEKfR6VFcytJSCtdexeBVL1xDsmvgRK5Y6vwwPw/9hbGyE lQRZVzyf2tvtWer1q2vK++b1PXqZTI+1mf65xR3m1BtY5a6yuLA1sFjSm7x6Yemi4buu 4ppp6vPyPYX7Hq927Z1bpAuTIBQFkNRH/BVAy7v1h7URp45FLcay4ikReU9eUq/uWt8F ORqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804254; x=1747409054; 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=x+ia9cClTpLhWnZONjq1YMKZx0rNCjtwEDAzCIBHD0g=; b=R92T1OveNSibfw1XvecU/Fsf3JMllKpQ3nDIFCFbkpEAw4BsF5AamgYcBVLGPXLz68 c9yuunAoXyATNF0LtwWcQlzOY1WgkAgGc8jGqHY5WApyiiDiEDGPbtW+vAsRXQLtN2i6 SNSqxv/+Iy4JWnWRq4tPwLWQLOC+ZKhUaFVxGv0lbiyqDH1pMoQpb4b+abjO9LFQNx8+ T2VxBt1nu1Hw66cG8s68m9gnqTdaVT0z8zW/nw6eItajlp2HRcQlcwaca8W48hnel3d3 oHz0q0/kHSjNpY8r2PueVPDrHV+rEzCF3vArxIPsH7KcE1ybVRNLN3VYNTdoly9+fRsL pKwg== X-Gm-Message-State: AOJu0Yw3rOudIpBqpsWvuMK6vJx13Irf+MmSYFbjVq/z3kCOQ9X+H/Nq gCx6r44+4Azlo/wVfrjyqcWeV7pmf1npNzGeqkhZlxQtQqVUiMMpjQtII3MFhtqZwXR8e8tu943 r X-Gm-Gg: ASbGncu75wNkSvzXUoLzVQN+ZstMghABNAvx/T5rBhnWigCsEc+nD/nD5iMbp7WRAd6 nDNupvfAdhJoMFWxlDgJGDyTFmda+NSCBsyzc13xTphGgePduiPnmCF/ra6jZhjFdtKOtP8LxSh akwm5Syxg4bUE2hjydW9WQV0LYB5UDoRtJVtgscEKtGEaeyR8iWeDlZnve3dyg2Usu+X294+dim E1dxngR+YTUWbtBydhDeGOmDcThmVzYrTfBK2Y70eiGMy/N3FbQV2BtdH3+FTj7BWItroPGEs78 sC1yNzYIzth8PGlXfQ42kVq1Ylf4ZTRgX98D0Xi8H3U= X-Google-Smtp-Source: AGHT+IFPmRZwAFSaI783knDJBDpnGPuA0Nha3DYxpHA0hIdldc5Y7ObcQZ21aP5+lRfg2awegrTjBA== X-Received: by 2002:a05:6a21:110:b0:1f5:8eec:e521 with SMTP id adf61e73a8af0-215abb03ea5mr5521824637.15.1746804254140; Fri, 09 May 2025 08:24:14 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 14/17] cdrtools-native: fix booting EFI ISO live failed Date: Fri, 9 May 2025 08:23:30 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216222 From: Hongxu Jia In ISO live, if the size of efi.img > 32MB, and copy EFI application (bootx64.efi) to efi.img behind of kernel and initrd, UEFI system could not find EFI application bootx64.efi Using QEMU+OVMF to boot ISO live image, press ESC to enter UEFI shell: ... Shell> ls FS0:\ Directory of: FS0:\ 04/05/2011 23:00 12,985,344 bzImage 04/05/2011 23:00 2,048 EFI 04/05/2011 23:00 20,494,696 initrd 04/05/2011 23:00 26 startup.nsh 3 File(s) 33,480,066 bytes 1 Dir(s) Shell> ls FS0:\EFI Directory of: FS0:\EFI 0 File(s) 0 bytes 0 Dir(s) ... In following case, add 64MB extra space to bootable image efi.img, and the partition table of EFI is truncated to 26.3M $ echo 'IMAGE_FSTYPES:pn-core-image-minimal = " live"' >> conf/local.conf $ echo 'MACHINE_FEATURES:append = " efi pcbios"' >> conf/local.conf $ echo '# 64MB extra space to bootable image efi.img' >> conf/local.conf $ echo 'BOOTIMG_EXTRA_SPACE = "65535"' >> conf/local.conf $ bitbake core-image-minimal $ fdisk -l tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso ... Device Boot Start End Sectors Size Id Type tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso1 * 0 376831 376832 184M 0 Empty tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso2 120 54079 53960 26.3M ef EFI (FAT-12/16/32) According to page 11: `Figure 5 - Section Entry' in El Torito Bootable CD-ROM Format Specification [1]. The sector count takes 2 byte which means max sector count is 0xffff (65535), for 512-byte sector, the size of bootable image is no more than 32MB (65536 * 512 / 1024 / 1024) This commit truncate to 32MB if image size larger than 32MB, and report a warning, then save the extra image sector count to vendor unique selection criteria After apply this commit, the partition table of EFI is truncated to 32M $ fdisk -l tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso ... Device Boot Start End Sectors Size Id Type tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso1 * 0 376831 376832 184M 0 Empty tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso2 120 65654 65535 32M ef EFI (FAT-12/16/32) [1]https://pdos.csail.mit.edu/6.828/2017/readings/boot-cdrom.pdf (From OE-Core rev: 259bb8907d8bfe1217e88a3b6935c160e5a92f8d) Signed-off-by: Hongxu Jia Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- .../cdrtools/cdrtools-native_3.01.bb | 1 + ...ix-nsectors-exceeds-0xffff-situation.patch | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 meta/recipes-devtools/cdrtools/cdrtools/0001-fix-nsectors-exceeds-0xffff-situation.patch diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb index 085384064d..428202c258 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb @@ -15,6 +15,7 @@ SRC_URI = " \ file://0001-Don-t-set-uid-gid-during-install.patch \ file://riscv64-linux-gcc.rul \ file://gcc14-fix.patch \ + file://0001-fix-nsectors-exceeds-0xffff-situation.patch \ " SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" diff --git a/meta/recipes-devtools/cdrtools/cdrtools/0001-fix-nsectors-exceeds-0xffff-situation.patch b/meta/recipes-devtools/cdrtools/cdrtools/0001-fix-nsectors-exceeds-0xffff-situation.patch new file mode 100644 index 0000000000..8b0fbb3fe6 --- /dev/null +++ b/meta/recipes-devtools/cdrtools/cdrtools/0001-fix-nsectors-exceeds-0xffff-situation.patch @@ -0,0 +1,69 @@ +From ab6b5ee4c23099bf15ddd145fdf1ff4f5e34e802 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Sat, 26 Apr 2025 03:38:32 +0000 +Subject: [PATCH] fix nsectors exceeds 0xffff situation + +According to page 11: `Figure 5 - Section Entry' in El Torito Bootable +CD-ROM Format Specification [1]. The sector count takes 2 byte which +means max sector count is 0xffff (65535), for 512-byte sector, the +size of bootable image is no more than 32MB (65536 * 512 / 1024 / 1024) + +If the size of efi.img > 32MB, the partition table will be truncated +in ISO, which caused UEFI system or grub-efi read efi.img broken +occasionally. + +In this patch, nsectors means sector count, if it exceeds 0xffff, +truncate to 0xffff and set selection criteria type = 2, then save +extra nsectors to vendor unique selection criteria + +[1]https://pdos.csail.mit.edu/6.828/2017/readings/boot-cdrom.pdf + +Upstream-Status: Inappropriate [upstream https://sourceforge.net/projects/cdrtools/ is not alive since 2019] + +Signed-off-by: Hongxu Jia +--- + mkisofs/eltorito.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/mkisofs/eltorito.c b/mkisofs/eltorito.c +index 5dd04bc..a391003 100644 +--- a/mkisofs/eltorito.c ++++ b/mkisofs/eltorito.c +@@ -568,6 +568,34 @@ fill_boot_desc(boot_desc_entry, boot_entry) + fprintf(stderr, "Extent of boot images is %d\n", + get_733(de->isorec.extent)); + #endif ++ ++ // Boot sectors exceeds 0xffff ++ if (nsectors > 0xffff) { ++ unsigned int extra_nsectors = nsectors - 0xffff; ++ ++ fprintf(stderr, "Warning: Boot sectors 0x%x(%u) exceeds 0xffff(65535), save extra %u to pad2\n", ++ nsectors, nsectors, extra_nsectors); ++ ++ // Set nsectors to maximum 0xffff(65535) ++ nsectors = 0xffff; ++ ++ // Offset : 0C byte ++ // Type : Byte ++ // Description: Selection criteria type. This defines a vendor unique format ++ // for bytes 0D-1F. ++ // The following formats is reserved by Yocto: ++ // 2 - Save extra sector count to vendor unique selection criteria ++ boot_desc_entry->pad2[0] = 2; ++ ++ ++ // Offset : 0D-0E-0F-10 byte ++ // Type : D Word ++ // Description: Save extra sector count to vendor unique selection criteria. ++ // It takes 4 bytes in pad2, starting at pad2[1] ++ set_731(&boot_desc_entry->pad2[1], extra_nsectors); ++ ++ } ++ + set_721(boot_desc_entry->nsect, (unsigned int) nsectors); + set_731(boot_desc_entry->bootoff, + (unsigned int) get_733(de->isorec.extent)); +-- +2.44.1 + From patchwork Fri May 9 15:23:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62693 X-Patchwork-Delegate: steve@sakoman.com 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 B1B39C3ABCC for ; Fri, 9 May 2025 15:24:23 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.1430.1746804256938693439 for ; Fri, 09 May 2025 08:24:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JdlpC+ym; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7399838db7fso2310108b3a.0 for ; Fri, 09 May 2025 08:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804256; x=1747409056; 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=xltvyLvydcxqAjkT+dXW7hCNbpMkwauXAl2FL/2lg34=; b=JdlpC+ymrrrWTr1Tt4jwsHPz6HrpwoJXCG57U1T+edS8W61sSklP2ELNEpxBj4BCNa zvTEdGyZduptXwlpKFNPPkoQhoKYX2qHKyawx2kXBSi649FbNDEk1Ipj9AXYM6bL2XlG 8ExLPKuKOMHlByjvy3HeOU2hjanaA7hGAlO3RYTJRXB4NYSdSS8QLp/reHyGgr7kZbkX +a6lkBH+chEZL43C2iRxGbFUYNmltrDo8XwQl0XBLPfyFwLiOFRt+ZdEMj5J1SjizJbA DNcB7gZlgVPTMrP/f28edlzRolcR7dcKPthCHJs2/DymL4d5pysJkHkls22yOGPhY29H kQMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804256; x=1747409056; 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=xltvyLvydcxqAjkT+dXW7hCNbpMkwauXAl2FL/2lg34=; b=UKaY4QjD2M7ZkE3MeyJH3FDEhqduGPLcGEKQU6bqTf1MPh7ecOCUE/JTRRZlmWxpzN No0G1APmdly12GeCNS4JzcdN4UXmpy1BOruyW4oq8zvsB8IqJIkaM31caUZSgX1kA26F pILVkP8fqBCfa1W391I/TR5Te15RWP0OcImaqknv/CubBUbbNlly++Tol3pYe7RHbCih jeCuFajM52rodcI9d8s2GqrBiGZFdaCDaf73706JI29gfjjBp7b1x05qlOi0laHL9Syy F2hwaeupOMgP20pbw9ykWjx5vWnGcr0oZT7FFmc8owzdRcqEN+oiUA1prUGUgq8EYe9y DHOg== X-Gm-Message-State: AOJu0Ywpzh+GQZMT4VEA5Nv6a3EKUmfNsC5wxht5CfrPdXOazRpcNtA6 ULKodX3Px4Brs1fqCtwJDusUtJXCSEjoiVibcOIlmQlL4oIymq2U4ExOi1Hs6KCYQ9MwC+D2v8J Y X-Gm-Gg: ASbGncuwZ1Yy7ykHhPs30JPzboFGeoptEDnmY5RLYszskK83AQwtjixrXp7yXw4k/RO ltkY0RXu3xAMlYmyybD7LfljcTg6tcRm7HQe+Z3Rx0E/NLYmvfpHK4rax2gWYHEjRUxzMHwzml7 vU4VoLs8UrMqAt/UH/qORb5nizEGldXM3FktA5MBc1JBeUK53bJXrWrICLte6+KlYHU+G5wPFyz M8uY2rkX4Wt/HIqKAzcWjNnQgYEmwH+mh6ZW/yMxIm4SUG27KdkVDc+jOgSQh799ALMQFuK+Lp4 MY0BErK+lKPmRma0T5CYrUFOBGkqy9vU X-Google-Smtp-Source: AGHT+IGPAXvO/7KJp36mLi9LgH3sxIGQgYHuvCZ59602OQgVqliUyvHQG+IXX5gxkiAcsRn2eIZq+g== X-Received: by 2002:a05:6a00:3e20:b0:732:5875:eb95 with SMTP id d2e1a72fcca58-740a9316019mr14015100b3a.4.1746804256079; Fri, 09 May 2025 08:24:16 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 15/17] syslinux: improve isohybrid to process extra sector count for ISO 9660 image Date: Fri, 9 May 2025 08:23:31 -0700 Message-ID: <741d5ed1b906b8763d9f346481e980e2041c9c2a.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216223 From: Hongxu Jia Due to commit [cdrtools-native: fix booting EFI ISO live failed] applied to improve mkisofs to fix nsectors exceeds 0xffff situation which set selection criteria type = 2 and save extra nsectors to vendor unique selection criteria In following case, add 64MB extra space to bootable image efi.img, and the partition table of EFI is truncated to 32M $ echo 'IMAGE_FSTYPES:pn-core-image-minimal = " live"' >> conf/local.conf $ echo 'MACHINE_FEATURES:append = " efi pcbios"' >> conf/local.conf $ echo '# 64MB extra space to bootable image efi.img' >> conf/local.conf $ echo 'BOOTIMG_EXTRA_SPACE = "65535"' >> conf/local.conf $ bitbake core-image-minimal $ fdisk -l tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso ... Device Boot Start End Sectors Size Id Type tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso1 * 0 376831 376832 184M 0 Empty tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso2 120 65654 65535 32M ef EFI (FAT-12/16/32) After applying this patch to process extra sector count, the partition table of EFI is 90.3M $ fdisk -l tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso ... Device Boot Start End Sectors Size Id Type tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso1 * 0 376831 376832 184M 0 Empty tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs.iso2 120 185151 185032 90.3M ef EFI (FAT-12/16/32) [1]https://pdos.csail.mit.edu/6.828/2017/readings/boot-cdrom.pdf (From OE-Core rev: b4e112ed7e6ba5a6c6df530d696485a588831851) Signed-off-by: Hongxu Jia Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- ...-count-from-section-entry-for-EFI-ca.patch | 104 ++++++++++++++++++ .../syslinux/syslinux_6.04-pre2.bb | 1 + 2 files changed, 105 insertions(+) create mode 100644 meta/recipes-devtools/syslinux/syslinux/0001-Add-extra-sector-count-from-section-entry-for-EFI-ca.patch diff --git a/meta/recipes-devtools/syslinux/syslinux/0001-Add-extra-sector-count-from-section-entry-for-EFI-ca.patch b/meta/recipes-devtools/syslinux/syslinux/0001-Add-extra-sector-count-from-section-entry-for-EFI-ca.patch new file mode 100644 index 0000000000..5422d9b2de --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/0001-Add-extra-sector-count-from-section-entry-for-EFI-ca.patch @@ -0,0 +1,104 @@ +From 79a26046d178ae132cb88ba75de7141bd169ff16 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Sat, 26 Apr 2025 10:45:08 +0800 +Subject: [PATCH] Add extra sector count from section entry for EFI catalogue + +According to page 11: `Figure 5 - Section Entry' in El Torito Bootable +CD-ROM Format Specification [1]. The sector count tooks 2 byte which +means max sector count is 0xffff (65535), for 512-byte sector, the +size of bootable image is no more than 32MB (65536 * 512 / 1024 / 1024) + +If the size of efi.img > 32MB, the partition table will be truncated +in ISO, which caused UEFI system or grub-efi read efi.img broken +occasionally. + +This patch extend efi_count, mac_count and count to 4 byte int, if +Yocto defines `Selection criteria type = 2', add extra sector count +to original sector count as total count; for other situation, still use +original sector count as usual + +[1]https://pdos.csail.mit.edu/6.828/2017/readings/boot-cdrom.pdf + +Upstream-Status: Inappropriate [Yocto specific] + +Signed-off-by: Hongxu Jia +--- + utils/isohybrid.c | 48 ++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 43 insertions(+), 5 deletions(-) + +diff --git a/utils/isohybrid.c b/utils/isohybrid.c +index a9e38d4..1bbfd45 100644 +--- a/utils/isohybrid.c ++++ b/utils/isohybrid.c +@@ -76,7 +76,7 @@ uint32_t de_lba = 0; + uint16_t de_seg = 0, de_count = 0, de_mbz2 = 0; + uint8_t de_boot = 0, de_media = 0, de_sys = 0, de_mbz1 = 0; + uint32_t efi_lba = 0, mac_lba = 0; +-uint16_t efi_count = 0, mac_count = 0; ++uint32_t efi_count = 0, mac_count = 0; + uint8_t efi_boot = 0, efi_media = 0, efi_sys = 0; + + int apm_parts = 3; +@@ -552,17 +552,55 @@ read_efi_section(const uint8_t *buf) + } + + int +-read_efi_catalogue(const uint8_t *buf, uint16_t *count, uint32_t *lba) ++read_efi_catalogue(const uint8_t *buf, uint32_t *count, uint32_t *lba) + { ++ uint16_t _count = 0; ++ ++ // Jump to offset 6 byte + buf += 6; + +- memcpy(count, buf, 2); +- *count = lendian_short(*count); ++ *count = 0; ++ ++ // Offset : 6-7 byte ++ // Type : Word ++ // Description: Sector Count, the number of virtual/emulated sectors ++ // the system will store at Load Segment during the initial boot procedure ++ memcpy(&_count, buf, 2); ++ _count = lendian_short(_count); + buf += 2; + ++ // Offset : 8-0B byte ++ // Type : D Word ++ // Description: Load RBA. This is the start address of the virtual disk. CD’s use ++ // Relative/Logical block addressing. + memcpy(lba, buf, 4); + *lba = lendian_int(*lba); +- buf += 6; ++ buf += 4; ++ ++ // Offset : 0C byte ++ // Type : Byte ++ // Description: Selection criteria type. This defines a vendor unique format ++ // for bytes 0D-1F. ++ // The following formats have currently been assigned: ++ // 0 - No selection criteria ++ // 1 - Language and Version Information (IBM) ++ // 2 - Save extra sector count to vendor unique selection criteria (Yocto) ++ // 3-FF - Reserved ++ unsigned char slection_criteria_type = *buf; ++ buf += 1; ++ ++ // Offset : 0D-0E-0F-10 byte ++ // Type : D Word ++ // Description: Selection criteria type = 2, reserved by Yocto, ++ // save extra sector count to vendor unique selection criteria ++ if (slection_criteria_type == 2) { ++ memcpy(count, buf, 4); ++ *count = lendian_int(*count); ++ buf += 4; ++ } ++ ++ // total count = sector count + extra sector count ++ *count += _count; + + return 0; + } +-- +2.34.1 + diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index 7cf737170c..2522205fa1 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -23,6 +23,7 @@ SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz file://0013-remove-clean-script.patch \ file://0014-Fix-reproducibility-issues.patch \ file://0001-ext2_fs.h-do-not-carry-an-outdated-copy.patch \ + file://0001-Add-extra-sector-count-from-section-entry-for-EFI-ca.patch \ " SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec" From patchwork Fri May 9 15:23:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62691 X-Patchwork-Delegate: steve@sakoman.com 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 AD434C3ABCD for ; Fri, 9 May 2025 15:24:23 +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.1412.1746804258208163183 for ; Fri, 09 May 2025 08:24:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=3NqXVXr3; 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-7376dd56f8fso3104515b3a.2 for ; Fri, 09 May 2025 08:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804257; x=1747409057; 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=jgbyUvf4vgV5LCV94ghkCqWoxUnvWk2xmGsqo/1MF5E=; b=3NqXVXr3Ka7WSu9cPKoyLkZbi67Jz01KKnm058tvj7Xkrwv5CS5RWOLlvWSO3s5vTa gtPHAgKnurxQBdiiTS8mqphfM0hiWqk8MHu+rishEJB1SJBb8DoAR9rEJnYYSTQVcvxF Jta2mpi9rjZcgzg0sUpTSCfS0VGqOO/JzWr2IdK6mAv72EmdMHqN0btbfyXycyTlE/Qg GtyGAfafJeqVIdrzFON2Yx3pRIbvh3hT1zn6xLP7NC/bWD8c2jMaGiui9DupThfTiF0X DouuW+7U2SNKk2aDTApEtdpZ6tn7Cb4Ifq7TSLTKbYVbpt+UAhNG8pFOMObeFY1GQHio UZxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804257; x=1747409057; 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=jgbyUvf4vgV5LCV94ghkCqWoxUnvWk2xmGsqo/1MF5E=; b=tcMmJPEQJ2ECiVQ+j1YZpxWX8rV5f3qeF6kjsXYq3WIbQ5z3aETZAcqzGqly+35qcL tMl1kg7T15pMXHRjUy5ICxUCvWS8wcZ6wp2V8PDkUaLuEwyOrsSFFw4GGdvOU6OoVcBb qjbOfjQ4VqSBZSQxxSEn2PF8YUJ+Lz0Mj+rBSwqGCbqeiw5nwrxO1a9WX01l8zJlxuEC jjrCJ6fV/bTh4TOOcVRWcIE3GRyA5B+N+hpHYxlwUU2x8I+8/4VYUv2dZozGgSd+cSN7 6G+bqo1XhDqJmX50eFWnDxqPi+G8xGac0lCgXiNKFGFOuhnEOoP9Hg9utXLR2A97MUSu aeRA== X-Gm-Message-State: AOJu0YytNKlyG5cM+1H0juuMQT4YVnwNR5HNVYQreeJjno1OyQcR7eSd TgNQHMwL8bRI1cqxwPSyIhIEK7S9dQqSBG/OcZ0u3gm3ivIY6Y2hcCRkDiYE67z7IOdA43wMhUj 1 X-Gm-Gg: ASbGncvYTY+Q/FPye6tVQSB38XL2MaBx7POo2WUkyvm6ccNAuPT3RxiHwUQevthwkEx Fvbf2YlyIKZMb+yRa+sB3SqV3WNO9/VwY6k1//cYHd37hK28VBU1TfrXDV/ENJDE2rA7y9kda6p a0WwtO5GL/FJT609CbIMkKgnUuhjpfzj0S9y9xcJEWs5ZM1MxYZ9oVb8hqJUzTFW9lHl68+GiP7 FbwbVaUajD4ANKMboQZpTdNFf+bOfzS6y2bRYqyDf5Ai7pto9ki4TXhp+7Mt21fUDI8dHjqPZ4q DJaEGFTEQZ2rL3oRbz47+2TGKDuzp28n X-Google-Smtp-Source: AGHT+IH8FIEkyBPq/HhhX48HiUw3Xuj0MLxAvH9ON9/QjlrSSqHkNEqiJSTGLx+P/RL6Bo1xWUPzKQ== X-Received: by 2002:a05:6a20:3d20:b0:1ee:e33d:f477 with SMTP id adf61e73a8af0-215abafb68amr5390153637.15.1746804257402; Fri, 09 May 2025 08:24:17 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 16/17] webkitgtk: Use WTF_CPU_UNKNOWN when building for riscv64 Date: Fri, 9 May 2025 08:23:32 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216224 From: Khem Raj This helps fix the build regression seen with 2.48+ Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand (master rev: e06114af90b78abb3ba2e75c59fc4c60db8b6a9a) Signed-off-by: Zhang Peng Signed-off-by: Steve Sakoman --- .../webkit/webkitgtk/fix-ftbfs-riscv64.patch | 38 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.48.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch b/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch new file mode 100644 index 0000000000..e436896098 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/fix-ftbfs-riscv64.patch @@ -0,0 +1,38 @@ +From: Alberto Garcia +Description: Use WTF_CPU_UNKNOWN when building for riscv64 + WebKitGTK doesn't build on riscv64 even with the JIT disabled. + Treating the CPU as unknown is perhaps a bit severe, but it allows us + to get the build done until someone steps up to maintain this + properly. +Bug: https://bugs.webkit.org/show_bug.cgi?id=271371 + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=271371#c1] +Signed-off-by: Khem Raj +--- a/Source/WTF/wtf/PlatformCPU.h ++++ b/Source/WTF/wtf/PlatformCPU.h +@@ -286,14 +286,6 @@ + + #endif /* ARM */ + +-/* CPU(RISCV64) - RISC-V 64-bit */ +-#if defined(__riscv) \ +- && defined(__riscv_xlen) \ +- && (__riscv_xlen == 64) +-#define WTF_CPU_RISCV64 1 +-#define WTF_CPU_KNOWN 1 +-#endif +- + #if !CPU(KNOWN) + #define WTF_CPU_UNKNOWN 1 + #endif +--- a/Source/cmake/WebKitCommon.cmake ++++ b/Source/cmake/WebKitCommon.cmake +@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON) + set(WTF_CPU_PPC64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") + set(WTF_CPU_PPC64LE 1) +- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64") +- set(WTF_CPU_RISCV64 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64") + set(WTF_CPU_LOONGARCH64 1) + else () diff --git a/meta/recipes-sato/webkit/webkitgtk_2.48.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.48.0.bb index 6eb80da1de..58b78b5f28 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.48.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.48.0.bb @@ -19,6 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-EnumTraits.h-error-no-matching-function-for-call-to-.patch \ file://0001-Cherry-pick-292304-main-7ffc29624258-.-https-bugs.we.patch \ file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \ + file://fix-ftbfs-riscv64.patch \ " SRC_URI[sha256sum] = "94904a55cf12d44a4e36ceadafff02d46da73d76be9b4769f34cbfdf0eebf88e" From patchwork Fri May 9 15:23:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 62690 X-Patchwork-Delegate: steve@sakoman.com 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 A4C8DC3ABBC for ; Fri, 9 May 2025 15:24:23 +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.1431.1746804259548186898 for ; Fri, 09 May 2025 08:24:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=VjnGwubQ; 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-7376dd56eccso2438184b3a.0 for ; Fri, 09 May 2025 08:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1746804259; x=1747409059; 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=meztH4kJJXT/uAEUWM3d38R+PzSFgsa3giuLrE3x51M=; b=VjnGwubQ7K6dy4X123FTMQjt9SJomUvml4MP8+scB1wveoFd6IaA/WutYW/nX5dzfx RRsGqfbVwjV4Y1ebFY8cZid+ypWNvBVkxqu6WSYwrFNFPAuAimXH1AVz/pg2s2XnxEIh zHRZR/OSCLgz0tOKQx/r7NF+ybTUguMwM7Iflvy0IMH9jHPRSW3xhcNtNtbnd9xiC841 5BDYn4HWU9VkkdySDCWOdmg2DQ3XP71yeAxBvQ0mUzt2zOVyE+IG0SluyFC+N00ARcmH Dpc7Aroq58bsP0djcPA70WPoLZJWzAeWCuEkyIu00kGogRCImA8pR/8LzkTJO6h29ZNU 9G3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746804259; x=1747409059; 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=meztH4kJJXT/uAEUWM3d38R+PzSFgsa3giuLrE3x51M=; b=A7mOkl9lt9N7bPa4WJLVTVAKzjhDgW1cQG4yWT3sqsEJ0WoOftquelWhXoLTQvJdTy 6iqFol47uONrEOqq5tcsT6rKaWRqYQLf1S88DXcYo9ySyRa9BlPVNN/7CM8R2j5ukzkT 33Mz5i/Tzx94y4eME7yKc9eZEQv3qj0geskztbzHotHeInfq+Y8WPM98SXQz35FVqztQ Awbp/0ahTZUJ4QGWoeWU/231yrcDGUTVixv8o0KO1fAZtYASCISCJ4pH0Bwkh6bK5oAt UdOwCAUs2gFr9pUHcOjVscIvT1+e6utP5oH8A/U2wrcxFvNdsewuj+mFDUhN9SHV04qe Nkzw== X-Gm-Message-State: AOJu0YyPgAk/JubIIB/76JAc3KI7YZAbioral2km/+XLEADJFEegiBvS /EBLsrO5YPz79RSK2CW4HJYXnyJ/knPjqjOl0gdp4K1d7MFE3uCUI3EWo3OOfCwiA0QSGGyqR3h 8 X-Gm-Gg: ASbGnctyHfseDSkM4vzZpz9XalQ+4WOV5cOb/auKk4Cn4FSx5klVQYU0z0mPtEN3eiL is9qWK0TifFTFa6r4Ks4mQkp7vWLsWrZSarri5YM8sIPCiEJ86Uc1LNVkm2SEN2kLbbKCVQoU+V xv+JnQH/UMD5qxWI1x1/0YnXRezdw7ajx5Omf6w/Nk4tT4WpZsvn/XEnENRo8ItS4MhKgNfbr9g ckwSV3pO6xx7yZromPuT+kl8mqeUCJVPDtalwLZwpG6dd/Xq6Vbhq0ib1uNoQeeCIIvroyBe28K oTwpyIwbdfqSXn6WQbaD7pEPBllbyW0V X-Google-Smtp-Source: AGHT+IEA7Urm2uGe53kRHAQdfiS1eiijxepfK6v2MIRm4uwZKdaocgL7PT7zuzqRO0LiuIanWq/+Sw== X-Received: by 2002:a05:6a00:198b:b0:737:678d:fb66 with SMTP id d2e1a72fcca58-7423ba8740cmr5334760b3a.5.1746804258784; Fri, 09 May 2025 08:24:18 -0700 (PDT) Received: from hexa.. ([2602:feb4:3b:2100:1912:b658:11a7:402c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a108fbsm1848319b3a.115.2025.05.09.08.24.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 08:24:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][walnascar 17/17] gobject-introspection: Fix wrong PN used in MULTILIB_SCRIPTS Date: Fri, 9 May 2025 08:23:33 -0700 Message-ID: <5e594b3d074900580fa83ca50f7d837937c17856.1746804035.git.steve@sakoman.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 09 May 2025 15:24:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/216225 From: Jiaying Song The current MULTILIB_SCRIPTS entry incorrectly assigns g-ir-annotation-tool and g-ir-scanner to the ${PN} package. However, these scripts are actually installed in the gobject-introspection-tools package. This leads to incorrect symlinks being created when multilib is enabled. Therefore, this patch correctly moves them to the ${PN}-tools package. Error log: root@intel-x86-64:~# ls -l /usr/bin/g-ir-scanner lrwxrwxrwx 1 root root 27 Mar 9 2018 /usr/bin/g-ir-scanner -> /usr/bin/g-ir-scanner-lib64 root@intel-x86-64:~# ls -l /usr/bin/g-ir-scanner-lib64 ls: cannot access '/usr/bin/g-ir-scanner-lib64': No such file or directory Signed-off-by: Jiaying Song Signed-off-by: Steve Sakoman --- .../gobject-introspection/gobject-introspection_1.84.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb index ac5f4e9370..f6797cd2e5 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb @@ -24,7 +24,7 @@ inherit meson pkgconfig gtk-doc python3targetconfig qemu gobject-introspection-d GTKDOC_MESON_OPTION = "gtk_doc" -MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" +MULTILIB_SCRIPTS = "${PN}-tools:${bindir}/g-ir-annotation-tool ${PN}-tools:${bindir}/g-ir-scanner" # setuptools are required to provide distutils to build the tools DEPENDS += " libffi zlib python3 python3-setuptools flex-native bison-native"