From patchwork Sun Nov 20 14:14:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15759 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 AC02DC4332F for ; Sun, 20 Nov 2022 14:15:40 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.13201.1668953738486092819 for ; Sun, 20 Nov 2022 06:15:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=M0iSCu5I; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id w15-20020a17090a380f00b0021873113cb4so8677492pjb.0 for ; Sun, 20 Nov 2022 06:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=GTnqBu9eIzzZbr1TekKERZCQ+6n8EHUD0usMMv6W79E=; b=M0iSCu5IFnAx4GpIIR6jU26soIqPvligJylEgqxHn799GtFGZ7WIXq/W1Pee3hVPmX 2jtF6NXMPR2SchaKj3To76PPKtbfxbzv+tbK2U6guG0Vvuh4U2HVLNZ3BdmJVYYL2Dw0 Rxn5QYTtAPPZrDbviHr0u0OyGrId7yjN1mtDRMSGUbbfNO4J7jJWL4vnReK0XGr3KElf ycq6A835Qu2h8L43kyPfCkprJwVZ2/jwybJDWQUJWhbDlfvukCZppDI4Cmu0lfkKfpHd UJ6eTld18dCmY3th8/2dfRasqcAknDM5DHnLBHZrWcWKbZfBvJP82QKG7g1tZMtLkL3q s2sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GTnqBu9eIzzZbr1TekKERZCQ+6n8EHUD0usMMv6W79E=; b=n6Uot/Ot+PRzArrHVCWINSmjbFMPcZAJZ1pbipVeAamQZ+WFh/Vz3NwZDL9n9TPq5E C7UvbRYwCrm45bJAxzigxJBlWEYq8cGHXYZJdSz+ktpyjhogyerQOKQl84AIGJ147pjV uhsgamnbI4eVNAZLndBqN3dukdC9hPftXDJF0fKT1JuII+cpW1XwwgpG3zic8QUjY+zj uWPIRRZ44boNJVL/RRSdGYyrfiwLeAYCShKx57i9EEAOxj8vnQBLSOKQHqgBKvT1hfM3 AKsxsEYRUAaieWUlpkl+8xDd0CkCRcBQzTyh4nxoxK3cwWPwpAncLkn4+Rm4uqRmkUC8 rCew== X-Gm-Message-State: ANoB5plzyAL5GoZACb/QvUUtvO89/rhSVqqbkuz6fZI9wCg9RCYWSgjp E3GlYNSxefFIMvOqVolbJu4y9s2SYDGn6ZRtWXE= X-Google-Smtp-Source: AA0mqf7gVpW7jAjv4EVELM4gDNG2BRV94qA9WA4/HJ2fwZ40KMRkBrjNUvfuS6CBhI3FudgHTDaE7g== X-Received: by 2002:a17:90a:7402:b0:209:853d:ec6 with SMTP id a2-20020a17090a740200b00209853d0ec6mr16809469pjg.29.1668953737494; Sun, 20 Nov 2022 06:15:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/35] dbus: fix CVE-2022-42010 Check brackets in signature nest correctly Date: Sun, 20 Nov 2022 04:14:50 -1000 Message-Id: <901e2d7e785cfbeee6dd01146dd5185d023e70d5.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:15:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173601 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- ...idate-Check-brackets-in-signature-ne.patch | 119 ++++++++++++++++++ meta/recipes-core/dbus/dbus_1.14.0.bb | 1 + 2 files changed, 120 insertions(+) create mode 100644 meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch diff --git a/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch new file mode 100644 index 0000000000..f2e14fb8d5 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch @@ -0,0 +1,119 @@ +From 3e53a785dee8d1432156188a2c4260e4cbc78c4d Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Tue, 13 Sep 2022 15:10:22 +0100 +Subject: [PATCH] dbus-marshal-validate: Check brackets in signature nest + correctly + +In debug builds with assertions enabled, a signature with incorrectly +nested `()` and `{}`, for example `a{i(u}` or `(a{ii)}`, could result +in an assertion failure. + +In production builds without assertions enabled, a signature with +incorrectly nested `()` and `{}` could potentially result in a crash +or incorrect message parsing, although we do not have a concrete example +of either of these failure modes. + +Thanks: Evgeny Vereshchagin +Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/418 +Resolves: CVE-2022-42010 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/dbus/dbus/-/commit/3e53a785dee8d1432156188a2c4260e4cbc78c4d] + +Signed-off-by: Simon McVittie +(cherry picked from commit 9d07424e9011e3bbe535e83043d335f3093d2916) +Signed-off-by: Xiangyu Chen +--- + dbus/dbus-marshal-validate.c | 38 +++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) + +diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c +index 4d492f3f..ae68414d 100644 +--- a/dbus/dbus-marshal-validate.c ++++ b/dbus/dbus-marshal-validate.c +@@ -62,6 +62,8 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, + + int element_count; + DBusList *element_count_stack; ++ char opened_brackets[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH * 2 + 1] = { '\0' }; ++ char last_bracket; + + result = DBUS_VALID; + element_count_stack = NULL; +@@ -93,6 +95,10 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, + + while (p != end) + { ++ _dbus_assert (struct_depth + dict_entry_depth >= 0); ++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets)); ++ _dbus_assert (opened_brackets[struct_depth + dict_entry_depth] == '\0'); ++ + switch (*p) + { + case DBUS_TYPE_BYTE: +@@ -136,6 +142,10 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, + goto out; + } + ++ _dbus_assert (struct_depth + dict_entry_depth >= 1); ++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets)); ++ _dbus_assert (opened_brackets[struct_depth + dict_entry_depth - 1] == '\0'); ++ opened_brackets[struct_depth + dict_entry_depth - 1] = DBUS_STRUCT_BEGIN_CHAR; + break; + + case DBUS_STRUCT_END_CHAR: +@@ -151,9 +161,20 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, + goto out; + } + ++ _dbus_assert (struct_depth + dict_entry_depth >= 1); ++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets)); ++ last_bracket = opened_brackets[struct_depth + dict_entry_depth - 1]; ++ ++ if (last_bracket != DBUS_STRUCT_BEGIN_CHAR) ++ { ++ result = DBUS_INVALID_STRUCT_ENDED_BUT_NOT_STARTED; ++ goto out; ++ } ++ + _dbus_list_pop_last (&element_count_stack); + + struct_depth -= 1; ++ opened_brackets[struct_depth + dict_entry_depth] = '\0'; + break; + + case DBUS_DICT_ENTRY_BEGIN_CHAR: +@@ -178,6 +199,10 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, + goto out; + } + ++ _dbus_assert (struct_depth + dict_entry_depth >= 1); ++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets)); ++ _dbus_assert (opened_brackets[struct_depth + dict_entry_depth - 1] == '\0'); ++ opened_brackets[struct_depth + dict_entry_depth - 1] = DBUS_DICT_ENTRY_BEGIN_CHAR; + break; + + case DBUS_DICT_ENTRY_END_CHAR: +@@ -186,8 +211,19 @@ _dbus_validate_signature_with_reason (const DBusString *type_str, + result = DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED; + goto out; + } +- ++ ++ _dbus_assert (struct_depth + dict_entry_depth >= 1); ++ _dbus_assert (struct_depth + dict_entry_depth < _DBUS_N_ELEMENTS (opened_brackets)); ++ last_bracket = opened_brackets[struct_depth + dict_entry_depth - 1]; ++ ++ if (last_bracket != DBUS_DICT_ENTRY_BEGIN_CHAR) ++ { ++ result = DBUS_INVALID_DICT_ENTRY_ENDED_BUT_NOT_STARTED; ++ goto out; ++ } ++ + dict_entry_depth -= 1; ++ opened_brackets[struct_depth + dict_entry_depth] = '\0'; + + element_count = + _DBUS_POINTER_TO_INT (_dbus_list_pop_last (&element_count_stack)); +-- +2.34.1 + diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb index 7598c45f8e..4577da782c 100644 --- a/meta/recipes-core/dbus/dbus_1.14.0.bb +++ b/meta/recipes-core/dbus/dbus_1.14.0.bb @@ -13,6 +13,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://run-ptest \ file://tmpdir.patch \ file://dbus-1.init \ + file://0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch \ " SRC_URI[sha256sum] = "ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4" From patchwork Sun Nov 20 14:14:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15764 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 841AEC433FE for ; Sun, 20 Nov 2022 14:15:50 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.13266.1668953740641967628 for ; Sun, 20 Nov 2022 06:15:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=31J6OAXu; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id k5so8350879pjo.5 for ; Sun, 20 Nov 2022 06:15:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=zy8qbGtxFYFJ03AlrnZRDgraob1cAUm+uU+DzCJau3Y=; b=31J6OAXuP6sv9A8D9XyCIFe/uscr/IqmzuJZGAIDJqd35KNYZOcD5YPaB1SEienKEc sMsLmwV+n2J/qfHXpCzsQbDtyOzBFVQ1owMPGBQr4Rl6S6YW8iloE87ZT/wqE2b2A9Zx NW8Mjys3CiYc6BUvFWO+ebNJ5TWShGHUYmQ6VWQjLYk+2FQx6Y41Garw0gSCcJ/g5twN QypfudyommOANaUdZQrF0I6USOtHHg7pAy1PyHfDsRFh8sZHHisVq+HHRhebnv5ItEKF Lg7McbHK1WBOkHmRiEfc0B5gvVMinFnOchH0UmsLXPLPpT6glbOjAwleQ+rB++vb1WPr bt5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zy8qbGtxFYFJ03AlrnZRDgraob1cAUm+uU+DzCJau3Y=; b=M2AAnOQbAtDyOIYIsAOYSeagxHmIQwquIq9cSduqWFYBXcu7NEeHHSSBXyxdgMt4lp tFQaDLNjyheuJasZ2qmKp3LC2Lho8dnCn7Rkwco2hET68MvTrDWAR575frXL3QLsCeC7 vTczV3LzOyNzsepqsNO7YGnSEUKmq4rWYGAUBi64LKitE7O9/22DqcMJEnto2QlwE6jo jNn7VTEm+uduxiQPqcqXHQ+8747VDmO3k6IR/JTHfcKveErcdvRsY5KDeJ56XNOzqZyl suwA2TEe9E7+Qy38pLkrpSEwn/aWybcfiES8dc8n55KlWM/9xsJrthvo1GtPO9zzqR+J ugCg== X-Gm-Message-State: ANoB5pnUiHQlUnDY4fW7AGSMFMejF3b4o68qda3AwMXdct+sq3asvTbn SbmY0Ny6O1++ZT3TaHkQEMymgoZH/5TD93Ly0YE= X-Google-Smtp-Source: AA0mqf54js8fJgG2dR/gDtqIkZPVDQlMZNZezI9uxGTOoU9mAXyt+K8g0vUt3SPXJ1lSY6wfkZdVuw== X-Received: by 2002:a17:90a:f3d3:b0:213:241f:1939 with SMTP id ha19-20020a17090af3d300b00213241f1939mr22941972pjb.70.1668953739583; Sun, 20 Nov 2022 06:15:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/35] dbus: fix CVE-2022-42011 dbus-daemon can be crashed by messages with array length inconsistent with element type Date: Sun, 20 Nov 2022 04:14:51 -1000 Message-Id: <5d96a3c244388623d87a2999dafaa25d0bd216b6.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:15:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173602 From: Xiangyu Chen Backport a patch from upstream[1] to fix CVE-2022-42011 dbus-daemon can be crashed by messages with array length inconsistent with element type [1] https://gitlab.freedesktop.org/dbus/dbus/-/commit/b9e6a7523085a2cfceaffca7ba1ab4251f12a984 Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- ...idate-Validate-length-of-arrays-of-f.patch | 61 +++++++++++++++++++ meta/recipes-core/dbus/dbus_1.14.0.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch diff --git a/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch new file mode 100644 index 0000000000..f953326f78 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch @@ -0,0 +1,61 @@ +From b9e6a7523085a2cfceaffca7ba1ab4251f12a984 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 12 Sep 2022 13:14:18 +0100 +Subject: [PATCH] dbus-marshal-validate: Validate length of arrays of + fixed-length items + +This fast-path previously did not check that the array was made up +of an integer number of items. This could lead to assertion failures +and out-of-bounds accesses during subsequent message processing (which +assumes that the message has already been validated), particularly after +the addition of _dbus_header_remove_unknown_fields(), which makes it +more likely that dbus-daemon will apply non-trivial edits to messages. + +Thanks: Evgeny Vereshchagin +Fixes: e61f13cf "Bug 18064 - more efficient validation for fixed-size type arrays" +Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/413 +Resolves: CVE-2022-42011 + +Upstream-Status: Backport from +[https://gitlab.freedesktop.org/dbus/dbus/-/commit/b9e6a7523085a2cfceaffca7ba1ab4251f12a984] + +Signed-off-by: Simon McVittie +(cherry picked from commit 079bbf16186e87fb0157adf8951f19864bc2ed69) +Signed-off-by: Xiangyu Chen +--- + dbus/dbus-marshal-validate.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c +index ae68414d..7d0d6cf7 100644 +--- a/dbus/dbus-marshal-validate.c ++++ b/dbus/dbus-marshal-validate.c +@@ -503,13 +503,24 @@ validate_body_helper (DBusTypeReader *reader, + */ + if (dbus_type_is_fixed (array_elem_type)) + { ++ /* Note that fixed-size types all have sizes equal to ++ * their alignments, so this is really the item size. */ ++ alignment = _dbus_type_get_alignment (array_elem_type); ++ _dbus_assert (alignment == 1 || alignment == 2 || ++ alignment == 4 || alignment == 8); ++ ++ /* Because the alignment is a power of 2, this is ++ * equivalent to: (claimed_len % alignment) != 0, ++ * but avoids slower integer division */ ++ if ((claimed_len & (alignment - 1)) != 0) ++ return DBUS_INVALID_ARRAY_LENGTH_INCORRECT; ++ + /* bools need to be handled differently, because they can + * have an invalid value + */ + if (array_elem_type == DBUS_TYPE_BOOLEAN) + { + dbus_uint32_t v; +- alignment = _dbus_type_get_alignment (array_elem_type); + + while (p < array_end) + { +-- +2.34.1 + diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb index 4577da782c..e1efa9e058 100644 --- a/meta/recipes-core/dbus/dbus_1.14.0.bb +++ b/meta/recipes-core/dbus/dbus_1.14.0.bb @@ -14,6 +14,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://tmpdir.patch \ file://dbus-1.init \ file://0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch \ + file://0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch \ " SRC_URI[sha256sum] = "ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4" From patchwork Sun Nov 20 14:14:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15765 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 8FCF3C4167D for ; Sun, 20 Nov 2022 14:15:50 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.13267.1668953742754071399 for ; Sun, 20 Nov 2022 06:15:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CXL6VNwz; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id g10so8405720plo.11 for ; Sun, 20 Nov 2022 06:15:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=CUpmWpWbGv9Fpg6JKxcleBdP8nlg1s+C7jsyM+BD6PE=; b=CXL6VNwzJePogM4gUywA2TgArF5zAmkPIEZTL3GNb8sLRxg0HajvbjINBAXhiX/coc uhj1wZTNuUVkh/X6+wwRfGKdxjjstYJ9NREEnegE0HSv2vxYMoZba4O6B5ysClNA9op6 S97sUw3LUbw/n1dtQHwEy6Dpi3c56ZUe3Kkrz/xc9F1xfM9i51io0ZkS44nALCSnzU/P m63Lxgs5f6yKhRf70hqyUve8BOTw3E17ymcgN88WGstHHJ8b8+Z3yS2Hze6b64CasNGO HD6FIYd7ZJdQa2nusOPDex0lYkZSFhiNRM+eW3akQ7HwHxEVI/VU0rI+ImNEcRkH5y7s tzKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=CUpmWpWbGv9Fpg6JKxcleBdP8nlg1s+C7jsyM+BD6PE=; b=Rk+lzaEhpVkQEelpxcM55RDvN403K+6OXcgco4icD7vxGayo7hFM7F2MM8ko8Udwac WO43qOp03X2nwuuipkr1eOqPZbPqtxG02lliubqVA7/UqLEJcUEN6HjCzAyxPqJ6Znif DPvWaOtZDg1xIJQwbEtPMEUYggMaOvZEt8+8E2nXmqrRYw5dioPjj+giticsjjdP/3G6 B97uCgxyl3JMAJSkHOnjKn/noQor8lobvA6cmeCEWG2KDR0DQD2oKf+fzsqfoygWDVQU hd69QyZo9YRZL+ykmxrSXTqdzWZZglIZqa9y3ExxLX5FVeoHkUwrT/3na+FlfACVHSdW GrPw== X-Gm-Message-State: ANoB5pmuplGunR+ID9p2iftTyaPED67i6fzVNOtLPTQ8dukYpbaY8g68 bhujN3GNnPiVtXHtqIbIqUxNmlqJD9L36c1b1v8= X-Google-Smtp-Source: AA0mqf7bVeiLPNxCiVoFBhdgISw2qg2QvhTAujyXC9IXgnRAfv5/NvZRHWy/f6r8FDGIH6o6ltmDdw== X-Received: by 2002:a17:903:44e:b0:188:6fca:22b with SMTP id iw14-20020a170903044e00b001886fca022bmr7727148plb.4.1668953741631; Sun, 20 Nov 2022 06:15:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/35] dbus: fix CVE-2022-42012 dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed Date: Sun, 20 Nov 2022 04:14:52 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:15:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173603 From: Xiangyu Chen Backport a patch from upstream [1] to fix CVE-2022-42012 dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed [1] https://gitlab.freedesktop.org/dbus/dbus/-/commit/3fb065b0752db1e298e4ada52cf4adc414f5e946 Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- ...eswap-Byte-swap-Unix-fd-indexes-if-n.patch | 76 +++++++++++++++++++ meta/recipes-core/dbus/dbus_1.14.0.bb | 1 + 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch diff --git a/meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch new file mode 100644 index 0000000000..47f4f1e0d3 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch @@ -0,0 +1,76 @@ +From 3fb065b0752db1e298e4ada52cf4adc414f5e946 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 30 Sep 2022 13:46:31 +0100 +Subject: [PATCH] dbus-marshal-byteswap: Byte-swap Unix fd indexes if needed + +When a D-Bus message includes attached file descriptors, the body of the +message contains unsigned 32-bit indexes pointing into an out-of-band +array of file descriptors. Some D-Bus APIs like GLib's GDBus refer to +these indexes as "handles" for the associated fds (not to be confused +with a Windows HANDLE, which is a kernel object). + +The assertion message removed by this commit is arguably correct up to +a point: fd-passing is only reasonable on a local machine, and no known +operating system allows processes of differing endianness even on a +multi-endian ARM or PowerPC CPU, so it makes little sense for the sender +to specify a byte-order that differs from the byte-order of the recipient. + +However, this doesn't account for the fact that a malicious sender +doesn't have to restrict itself to only doing things that make sense. +On a system with untrusted local users, a message sender could crash +the system dbus-daemon (a denial of service) by sending a message in +the opposite endianness that contains handles to file descriptors. + +Before this commit, if assertions are enabled, attempting to byteswap +a fd index would cleanly crash the message recipient with an assertion +failure. If assertions are disabled, attempting to byteswap a fd index +would silently do nothing without advancing the pointer p, causing the +message's type and the pointer into its contents to go out of sync, which +can result in a subsequent crash (the crash demonstrated by fuzzing was +a use-after-free, but other failure modes might be possible). + +In principle we could resolve this by rejecting wrong-endianness messages +from a local sender, but it's actually simpler and less code to treat +wrong-endianness messages as valid and byteswap them. + +Thanks: Evgeny Vereshchagin +Fixes: ba7daa60 "unix-fd: add basic marshalling code for unix fds" +Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/417 +Resolves: CVE-2022-42012 + +Upstream-Status: Backport from [https://gitlab.freedesktop.org/dbus/dbus/-/commit/3fb065b0752db1e298e4ada52cf4adc414f5e946] + +Signed-off-by: Simon McVittie +(cherry picked from commit 236f16e444e88a984cf12b09225e0f8efa6c5b44) +Signed-off-by: Xiangyu Chen +--- + dbus/dbus-marshal-byteswap.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/dbus/dbus-marshal-byteswap.c b/dbus/dbus-marshal-byteswap.c +index 27695aaf..7104e9c6 100644 +--- a/dbus/dbus-marshal-byteswap.c ++++ b/dbus/dbus-marshal-byteswap.c +@@ -61,6 +61,7 @@ byteswap_body_helper (DBusTypeReader *reader, + case DBUS_TYPE_BOOLEAN: + case DBUS_TYPE_INT32: + case DBUS_TYPE_UINT32: ++ case DBUS_TYPE_UNIX_FD: + { + p = _DBUS_ALIGN_ADDRESS (p, 4); + *((dbus_uint32_t*)p) = DBUS_UINT32_SWAP_LE_BE (*((dbus_uint32_t*)p)); +@@ -188,11 +189,6 @@ byteswap_body_helper (DBusTypeReader *reader, + } + break; + +- case DBUS_TYPE_UNIX_FD: +- /* fds can only be passed on a local machine, so byte order must always match */ +- _dbus_assert_not_reached("attempted to byteswap unix fds which makes no sense"); +- break; +- + default: + _dbus_assert_not_reached ("invalid typecode in supposedly-validated signature"); + break; +-- +2.34.1 + diff --git a/meta/recipes-core/dbus/dbus_1.14.0.bb b/meta/recipes-core/dbus/dbus_1.14.0.bb index e1efa9e058..484629e987 100644 --- a/meta/recipes-core/dbus/dbus_1.14.0.bb +++ b/meta/recipes-core/dbus/dbus_1.14.0.bb @@ -15,6 +15,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.xz \ file://dbus-1.init \ file://0001-dbus-marshal-validate-Check-brackets-in-signature-ne.patch \ file://0001-dbus-marshal-validate-Validate-length-of-arrays-of-f.patch \ + file://0001-dbus-marshal-byteswap-Byte-swap-Unix-fd-indexes-if-n.patch \ " SRC_URI[sha256sum] = "ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4" From patchwork Sun Nov 20 14:14:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15763 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 8F7BDC4321E for ; Sun, 20 Nov 2022 14:15:50 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.13203.1668953744553972045 for ; Sun, 20 Nov 2022 06:15:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uyAxOcAU; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d20so8407052plr.10 for ; Sun, 20 Nov 2022 06:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=5n4Vyc5pFF3zmms39LHI3WyOOhGCj7UDy5E/Dp1ZCfs=; b=uyAxOcAUV+k4718mAKYswPrWcJc301PyTZnrKStP4KoLzvHJyT2P6PIj3nKQiy6JLM R4HyCF836SYDl664/WZZtcN0qzlLwg2cWjwfG3IqNfof8H4ePsYCYSsQy+05tPENjNEy w87ak/7FrYCDar/iCHkdU+AQIduLHq2g8EuaEJTXi6MDn4JaDzfqcvMKJbLX4dpcFmJN zUy/HrbklXKgXyuxdTdIsT2UqZKAwXo2BNoZQMsXLunrWqSow/umGJ5jlyXW8i5jy0Cm jKl7asIIOeOG52kiwMYrjX0Umr91x3sDRLENLRihx9or+H1at7wSBDBuInRPvnuIH9vL gS4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5n4Vyc5pFF3zmms39LHI3WyOOhGCj7UDy5E/Dp1ZCfs=; b=c3Ic6RaO3jJlvVh7zgG4dfQKRIJp2byqQ9Tk+ylX0dn+vMkbg5Mp1TYKulx0YtDHcg AigXVqdqbAjBBJ2tpma4PHpYSeBgHgMAlEI3OIoJUImF10bmcXrZwJ8v9TOQZKf2Y+H9 Ojv4c9lmnJor2wXS1832R9PAFzyU7FEXZ3CkDkwVXh+RZiM9nFTGez4DgZ3PffX0oKf8 BgzVSPsrMLLrIkexWou3Jmb+b9Yi4LemDEOa5GgqdItczd2nGBw3tXW0qK1YxAxycMw0 56zBonEgPmKiTs+D52S0XLcsizs+4qBkbbKeYBlD2jJquyis3gCcZj3o81U/6eZAo1s4 NFyA== X-Gm-Message-State: ANoB5pnvdmL7H3clQ/M0Tk4i/32dUAHBAay4RbvgoX2dC58NYiqdz46Z CZeC2dSG3R1BFaLxW4BtdYv1yA3VwiTODrcGHLc= X-Google-Smtp-Source: AA0mqf6QeybMqip/8SeH1QkaXDZzOBKYh5rlcbK7HsseuMoerV2EfiBXt91I5dScvn93TDLocHNpWg== X-Received: by 2002:a17:90b:360f:b0:218:ac6c:b229 with SMTP id ml15-20020a17090b360f00b00218ac6cb229mr2009047pjb.144.1668953743563; Sun, 20 Nov 2022 06:15:43 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/35] systemd: CVE-2022-3821 Fix buffer overrun Date: Sun, 20 Nov 2022 04:14:53 -1000 Message-Id: <4a29ef039897e2d45e5c0b7416ce30a22b668453.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:15:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173604 From: Hitendra Prajapati Upstream-Status: Backport from https://github.com/systemd/systemd-stable/commit/72d4c15a946d20143cd4c6783c802124bc894dc7 Affects "systemd <= 251" Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../systemd/systemd/CVE-2022-3821.patch | 45 +++++++++++++++++++ meta/recipes-core/systemd/systemd_250.5.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/CVE-2022-3821.patch diff --git a/meta/recipes-core/systemd/systemd/CVE-2022-3821.patch b/meta/recipes-core/systemd/systemd/CVE-2022-3821.patch new file mode 100644 index 0000000000..eb8b0cba12 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/CVE-2022-3821.patch @@ -0,0 +1,45 @@ +From bff52d96598956163d73b7c7bdec7b0ad5b3c2d4 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Tue, 15 Nov 2022 16:52:03 +0530 +Subject: [PATCH] CVE-2022-3821 + +Upstream-Status: Backport [https://github.com/systemd/systemd-stable/commit/72d4c15a946d20143cd4c6783c802124bc894dc7] +CVE: CVE-2022-3821 +Signed-off-by: Hitendra Prajapati +--- + src/basic/time-util.c | 2 +- + src/test/test-time-util.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/basic/time-util.c b/src/basic/time-util.c +index b659d6905d..89dc593d44 100644 +--- a/src/basic/time-util.c ++++ b/src/basic/time-util.c +@@ -588,7 +588,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) { + t = b; + } + +- n = MIN((size_t) k, l); ++ n = MIN((size_t) k, l-1); + + l -= n; + p += n; +diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c +index 4d0131827e..8db6b25279 100644 +--- a/src/test/test-time-util.c ++++ b/src/test/test-time-util.c +@@ -238,6 +238,11 @@ TEST(format_timespan) { + test_format_timespan_accuracy(1); + test_format_timespan_accuracy(USEC_PER_MSEC); + test_format_timespan_accuracy(USEC_PER_SEC); ++ ++ /* See issue #23928. */ ++ _cleanup_free_ char *buf; ++ assert_se(buf = new(char, 5)); ++ assert_se(buf == format_timespan(buf, 5, 100005, 1000)); + } + + TEST(verify_timezone) { +-- +2.25.1 + diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 5d568f639e..8b6d0e8580 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -25,6 +25,7 @@ SRC_URI += "file://touchscreen.rules \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ file://0001-resolve-Use-sockaddr-pointer-type-for-bind.patch \ + file://CVE-2022-3821.patch \ " # patches needed by musl From patchwork Sun Nov 20 14:14:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15761 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 846BEC43219 for ; Sun, 20 Nov 2022 14:15:50 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.13205.1668953746438080236 for ; Sun, 20 Nov 2022 06:15:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5A3QIrv3; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id t17so7676728pjo.3 for ; Sun, 20 Nov 2022 06:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=bHEhuFCL56rDv7RhlSG0Qc4NkAl/5/CwuS0TRynQxg4=; b=5A3QIrv3h716AkxMrgS2eAHxRTmuwpK5CPE/sWT2ZNEC2YewFIk/8dweHPzlFy0j5g 0QdgtDylKnlxywynD30Jfr9MULYSTQSd/u1bvmqatnPrhYJBdGCUlEzuaO11uO1ee3Cx Q8n1waBkor6bZZUt4zGzO2+48gsCPzptad5fGh+Aj7F0TntIHvL+V5QN3Uiw6oGWRTxg tpBQ4sK+M5r/FJOFZ2pTlQF9z8SNmSrLqHLn9tCewAyYb+4ONc5lYf4ZOgnWg0sfbDkk NhBwprmIz+7915c20HkTgqdaDBlFPoCKUfJTevIyLZKcKTrH27de4kgR693mE2XMH1rk 5zTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bHEhuFCL56rDv7RhlSG0Qc4NkAl/5/CwuS0TRynQxg4=; b=2puzHFvlX9N2g+oEb6zsp1iPXBZPRvVt7ScyucoIb4PkfnvZBCK/mcj/FKRMm0r8gr xQjIvNSh44XXgSdBP9RsIrX7V3aIODS9pzNlxTBn1NIv6zrmlkbAhDPp1dTqa58ptUQZ ZGI7WLZrk6gcKOqtVcyYftkQasDd2MDfNXXEu2J/MjKNQfKVlJMdWs6oBMy+LHce7Zll WwlB8UIwXJBKwgQUe78l3/rkPJXpHF/GA9SomoLSGVp9iy48r2fg1tDcuODKDMLh48vZ jaw+y77u4007nodHwnvkwttBde+leaMB7ZvNv5af1N0yKMCVqNjxcev/QGx0qXass696 e9zg== X-Gm-Message-State: ANoB5pmA5uFXNqpq7DsjN+9Su1MGG2WLjtkerWxaD6ouLCMAabNAqaA6 nznqLNkMxfTrgFn7mEKin5qO8MXyje7IJyzmbxo= X-Google-Smtp-Source: AA0mqf4hWahdjqrrO8fR1mox8vcQx4s6yUPO7SANMK9xbHM9+uOFPuSPNYINRTAXajD2NnXpCBPc2g== X-Received: by 2002:a17:902:c103:b0:186:7006:9a5f with SMTP id 3-20020a170902c10300b0018670069a5fmr219695pli.117.1668953745436; Sun, 20 Nov 2022 06:15:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/35] Revert "expat: backport the fix for CVE-2022-43680" Date: Sun, 20 Nov 2022 04:14:54 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:15:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173605 Prepare for version bump which includes this fix This reverts commit 791fe354e5887af3fa3d3f772fafacc5eaedca21. --- .../expat/expat/CVE-2022-43680.patch | 33 ------------------- meta/recipes-core/expat/expat_2.4.9.bb | 1 - 2 files changed, 34 deletions(-) delete mode 100644 meta/recipes-core/expat/expat/CVE-2022-43680.patch diff --git a/meta/recipes-core/expat/expat/CVE-2022-43680.patch b/meta/recipes-core/expat/expat/CVE-2022-43680.patch deleted file mode 100644 index 76c55edc76..0000000000 --- a/meta/recipes-core/expat/expat/CVE-2022-43680.patch +++ /dev/null @@ -1,33 +0,0 @@ -CVE: CVE-2022-43680 -Upstream-Status: Backport [5290462a7ea1278a8d5c0d5b2860d4e244f997e4] -Signed-off-by: Ross Burton - -From 5290462a7ea1278a8d5c0d5b2860d4e244f997e4 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Tue, 20 Sep 2022 02:44:34 +0200 -Subject: [PATCH] lib: Fix overeager DTD destruction in - XML_ExternalEntityParserCreate - ---- - expat/lib/xmlparse.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index aacd6e7fc..57bf103cc 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -1068,6 +1068,14 @@ parserCreate(const XML_Char *encodingName, - parserInit(parser, encodingName); - - if (encodingName && ! parser->m_protocolEncodingName) { -+ if (dtd) { -+ // We need to stop the upcoming call to XML_ParserFree from happily -+ // destroying parser->m_dtd because the DTD is shared with the parent -+ // parser and the only guard that keeps XML_ParserFree from destroying -+ // parser->m_dtd is parser->m_isParamEntity but it will be set to -+ // XML_TRUE only later in XML_ExternalEntityParserCreate (or not at all). -+ parser->m_dtd = NULL; -+ } - XML_ParserFree(parser); - return NULL; - } diff --git a/meta/recipes-core/expat/expat_2.4.9.bb b/meta/recipes-core/expat/expat_2.4.9.bb index 22f9845a99..cb007708c7 100644 --- a/meta/recipes-core/expat/expat_2.4.9.bb +++ b/meta/recipes-core/expat/expat_2.4.9.bb @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb" VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ - file://CVE-2022-43680.patch \ file://run-ptest \ " From patchwork Sun Nov 20 14:14:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15762 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 89776C43217 for ; Sun, 20 Nov 2022 14:15:50 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web10.13269.1668953748471738768 for ; Sun, 20 Nov 2022 06:15:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3IxL9D/v; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id f9so4787555pgf.7 for ; Sun, 20 Nov 2022 06:15:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=frWKzJ0P7TYcenc2MBZbRYkFwYzDNQcYsrwrKmdLzu4=; b=3IxL9D/vRfJs4+l4q92zhxwJw1gsozHrHD9vSa7dwhtOEwlH3KwqwJgi8bea5yEc7w 2lyZTTQHrSSiYw4ob/xdRRcaB7mTjgDlDTDPhkvU7BboPD0aWQVlHw3F9+oJzEFDwT45 c/cUEHjcSXQ/eyKhjjUdEHYSDTnaTuvvAe4/cLFHDKDS8ejm/NcP1nxIJRP+Hrfpj2GO laTWIbAEZm+iJuREmGGKp7m2UE0kTOO9KMqpCsPXadQT9LdP95hhqhp9e/880BTzq2Ft iPlugnsvr+CknFzKmjvLJYGvndUchVG6oK760jCrotUAF8He1TNL3rdxoxBlDKA6vO9K gGcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=frWKzJ0P7TYcenc2MBZbRYkFwYzDNQcYsrwrKmdLzu4=; b=WUNuYtZzpLeTdw09Y0vGwoAhmtNcrFB/flBEXrbrvi7ePN4QojDVvOyqso+HSY/g3B 7qfraUZ2t4VPDwKfUUUXtVvgOpSmMrzIKgt7Lx/0Vs2GWMX1uqeKg7rvtFv9KLXhewDt Jl8pYiovp6/ydMJtVSNXLe9IpE9TL10onsD8zXYlhwpRxFVJ44pAfQNCEs0qOvtifVQ1 MlH3TwBmdgWH++GOMbdPin8PafwU0XIgTpOQugfozPTLZukRVOu7zM9ib+rxpdZ7naYq LO/6UMeJXckVGAO5XXLHTXQhJcS8mOl0X3+E1WBcBoCLbWDzWDO7FVGTFd7bVE7obNwy v01w== X-Gm-Message-State: ANoB5pkPQ7Q4173zmnlV9yTKpwTD4GN6lKqB2VHuZX/da1M+2+WI4gz4 Ja6UYKISqaE8EstBpZvtyPqkZR5JfH+Kq1EXXzA= X-Google-Smtp-Source: AA0mqf6u8wfiEC1Fpza85VK+rNFz5omdlixHNzTja59zdFKmy4ERMdOLiypQkVLLnR7uwxFkiAlRlg== X-Received: by 2002:a63:4046:0:b0:460:fa0c:ab73 with SMTP id n67-20020a634046000000b00460fa0cab73mr2394864pga.315.1668953747321; Sun, 20 Nov 2022 06:15:47 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:46 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/35] expat: upgrade to 2.5.0 Date: Sun, 20 Nov 2022 04:14:55 -1000 Message-Id: <8dda30a9c64a4ad1f8eee11deb2e5143ba5fd719.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:15:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173606 From: Ross Burton Release 2.5.0 Tue October 25 2022 Security fixes: #616 #649 #650 CVE-2022-43680 -- Fix heap use-after-free after overeager destruction of a shared DTD in function XML_ExternalEntityParserCreate in out-of-memory situations. Expected impact is denial of service or potentially arbitrary code execution. Bug fixes: #612 #645 Fix curruption from undefined entities #613 #654 Fix case when parsing was suspended while processing nested entities #616 #652 #653 Stop leaking opening tag bindings after a closing tag mismatch error where a parser is reset through XML_ParserReset and then reused to parse #656 CMake: Fix generation of pkg-config file #658 MinGW|CMake: Fix static library name Other changes: #663 Protect header expat_config.h from multiple inclusion #666 examples: Make use of XML_GetBuffer and be more consistent across examples #648 Address compiler warnings #667 #668 Version info bumped from 9:9:8 to 9:10:8; see https://verbump.de/ for what these numbers do Includes a fix for CVE-2022-43680. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit a257a674272dc638f09167e9b9202adfb477ef1e) Signed-off-by: Steve Sakoman --- meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/expat/{expat_2.4.9.bb => expat_2.5.0.bb} (91%) diff --git a/meta/recipes-core/expat/expat_2.4.9.bb b/meta/recipes-core/expat/expat_2.5.0.bb similarity index 91% rename from meta/recipes-core/expat/expat_2.4.9.bb rename to meta/recipes-core/expat/expat_2.5.0.bb index cb007708c7..7080f934d1 100644 --- a/meta/recipes-core/expat/expat_2.4.9.bb +++ b/meta/recipes-core/expat/expat_2.5.0.bb @@ -14,7 +14,7 @@ SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TA UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/" -SRC_URI[sha256sum] = "7f44d1469b110773a94b0d5abeeeffaef79f8bd6406b07e52394bcf48126437a" +SRC_URI[sha256sum] = "6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67" EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" From patchwork Sun Nov 20 14:14:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15768 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 88434C43219 for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.13208.1668953750517925500 for ; Sun, 20 Nov 2022 06:15:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RwgZF6/+; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id y10so7238073plp.3 for ; Sun, 20 Nov 2022 06:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=WyqJW967qoZb8TPjxkSWYhAr3IUQbYA5NM0b+feC+BA=; b=RwgZF6/+R37QAlLw5WCQn7tOAzCKvm1ORsDDg3CzyHZxhdGEsZOaTQIsjAW9A96ymg 9sy2vYMO3DUMoIVbrLHN7LCdNlkjgKILfpQXw9mPzZGJ6K0zZWShXTACIo0S/+FwYWwG vK6sA+XG9z+w3MFsJQoFTxPErPd1QfzlYJ2bhcOOKi+gF0sQXET3W61GDhb5kTBGC4Ti xaX7lIn95uncNf10nmgSVAUWoc1PifDJgSyS1tAB5tU2PS9z1cOSiNFLbTzNLvtOhmFr byCcHZfjGDoLzU17whFSAW1YIocFdNQoEfeBCWgrkdpyEi5HL+ExCtDYRaAzA+SbFBBz e6uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=WyqJW967qoZb8TPjxkSWYhAr3IUQbYA5NM0b+feC+BA=; b=7uuutBY04jxg9EAR/ZsoWnGSLhg+LRs+dUkGPSh5/3qiNa2SgwbeOMo0bVa+uyKFoG ZWRERAwtiQtG6XnRk24ughaX+AJLRPYsL6tZEGeaNf0Jx4QuXB7XB4Vuwh490ELV4VLy d05EgSVeLcvEzEG0MM5JaOpsCy9ZJq+D3jADmD0ZVDR5Wkcc9+2NMMrBc3DNXii52o6+ z0mFq+FpT4038mTZtDVUV2Gmd+oEOgmG1rHmkuQuss4g/RwZCr8iesCmSj5snnsjqxqJ rzNLcdEw/Le15psJ2sY4ZokstMY0j9fPB+SBFnZzJ8aWlsZINhQa/3P81Q9v0T0+wY/v rPSA== X-Gm-Message-State: ANoB5pmbsplBc3AQdMsy6aCVm8O+X7TqTGPmXP/6LvMhSnVlSa86nseB w+fUDhKUuCl2nfAaE1fVX7IP+gGVGHEbckZ6GE4= X-Google-Smtp-Source: AA0mqf6ZQ6TGIgw2z2aa/ZVxgv3/fuKDM3MkamdDOxrHGb7+j6Nsptkz/jMVU10hWmdu9trBFtyfyQ== X-Received: by 2002:a17:90a:5d0e:b0:202:c5cc:15bd with SMTP id s14-20020a17090a5d0e00b00202c5cc15bdmr22235429pji.235.1668953749356; Sun, 20 Nov 2022 06:15:49 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:48 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/35] lttng-tools: Upgrade 2.13.4 -> 2.13.8 Date: Sun, 20 Nov 2022 04:14:56 -1000 Message-Id: <07aba073681a494da09ae5227ccd22cd50bf520e.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173607 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- .../{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) rename meta/recipes-kernel/lttng/{lttng-tools_2.13.4.bb => lttng-tools_2.13.8.bb} (90%) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb similarity index 90% rename from meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb rename to meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb index 0ea4da05ce..a814eb79f9 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.4.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://disable-tests.patch \ " -SRC_URI[sha256sum] = "565f3102410a53d484f4c8ff517978f1dc59f67f9d16f872f4357f3ca12200f6" +SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd @@ -113,7 +113,7 @@ do_install_ptest () { for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f case $f in - *.so|userspace-probe-elf-binary) + *.so|userspace-probe-elf-*) install -d ${D}${PTEST_PATH}/tests/$d/ ln -s ../$f ${D}${PTEST_PATH}/tests/$d/$f # Remove any rpath/runpath to pass QA check. @@ -124,6 +124,7 @@ do_install_ptest () { done chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary + chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libbar.so chrpath --delete ${D}${PTEST_PATH}/tests/regression/ust/ust-dl/libfoo.so @@ -185,4 +186,10 @@ do_install_ptest () { INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary \ ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/userspace-probe-elf-cxx-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-cxx-binary/.libs/userspace-probe-elf-cxx-binary \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/gen-syscall-events \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events/.libs/gen-syscall-events \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack \ + ${PKGD}${PTEST_PATH}/tests/utils/testapp/gen-syscall-events-callstack/.libs/gen-syscall-events-callstack \ " From patchwork Sun Nov 20 14:14:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15769 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 9677DC4321E for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.13210.1668953752749321267 for ; Sun, 20 Nov 2022 06:15:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KT8wyWVI; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id j12so8429809plj.5 for ; Sun, 20 Nov 2022 06:15:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=DJkqDg3jqNA1e3oD7rKD20kN/ACICF3i0XLV0LDWZpM=; b=KT8wyWVIMNmRzOgfuBS8d2M1DGuw4AoJKLNd2GYaTsMNPZSa6Wg6jcCVKmMXcPifAi VW3Jdtkvj4ttXyWwNb3E08vckrgY1IEufGSRaSIx5lQvmAOAbcBiZdkbiOAILlkOyURL XUEfdF7dSKBREIFNdXqCiWdLybTpYjVAnV27sp9C2IGgYV61CofmkM9mlM8rFEBLNRtb YlrX5gEGQ/MqbJ9VTcTyvNjD8BlV6c04OkyX00DnixCXyAJGBuXEGD03C6xy16cYmvOH PJLkDfZNKI7IL8j5kP1o1WC3TwhzOnjvvaPOj/JC6elKjGhQLC/ntScbLRSngOYq9ebj amdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DJkqDg3jqNA1e3oD7rKD20kN/ACICF3i0XLV0LDWZpM=; b=hOx0OVdNRvlgnh6+GBF5A2YqsRotwtyaVi7cadriitO2zH4w7MmzIEn42/5NV9oD5F ovdglDZbMHx3hAd8GSq2KlxiLCgdMW3pJ2kqz3K2g/u6HIV28bLkXD1jxv1q65Eh8QZC 3UfxwsN/cZc2mdcW35zz+pVCNIVC5JZjAgLiV7y6vZlGgfdLViI05tEMGNCPKkY6G05O 8B3Pny28qt6KVlIMpKy8IKCds5xej2DTw6E7UbDtAr4EPBzqpo8OIvqW9PyWNdIhz+vC BiMwYEul8P5rguljFcsG2Cs7mFwcigmDHyTmFYlk32tSVtipka1KDJnATTITKOljFHhN ZuCg== X-Gm-Message-State: ANoB5pm0TGEaqGwND3+CzzgmpVSLvEXTxdxRb2sYGvwL3rT54zE23/+a NgtuFaninaJCvXyVnmNuaMiq6DOY1UUQAjem1G4= X-Google-Smtp-Source: AA0mqf7qvW6Z7nsunbPr+46xVMDpa8qUjooPvdn/KFIN6SiUz27uzZlCX759y99UkUY7f1IemRHgvA== X-Received: by 2002:a17:902:f80d:b0:186:5d84:604e with SMTP id ix13-20020a170902f80d00b001865d84604emr7738576plb.85.1668953751468; Sun, 20 Nov 2022 06:15:51 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:51 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/35] lttng-tools: submit determinism.patch upstream Date: Sun, 20 Nov 2022 04:14:57 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173608 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit bec62455d900a0d3e18a62ea7053c214bc545fb6) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/lttng/lttng-tools/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch index b2ab880bd6..0a897a8e13 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch @@ -13,7 +13,7 @@ to me whether the tests need that or not. Fixes reproducibility issues for lttng-tools. -Upstream-Status: Pending [needs discussion with upstream about the correct solution] +Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution] RP 2021/3/1 Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am From patchwork Sun Nov 20 14:14:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15770 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 91DD6C43217 for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web11.13211.1668953754587176914 for ; Sun, 20 Nov 2022 06:15:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uBDNCa5s; spf=softfail (domain: sakoman.com, ip: 209.85.215.178, mailfrom: steve@sakoman.com) Received: by mail-pg1-f178.google.com with SMTP id 136so9024484pga.1 for ; Sun, 20 Nov 2022 06:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=jcKQllrGDjvqbm2MA9svqZXWKVjGseefosu8UFab5YY=; b=uBDNCa5soXM4QnwBLjLYaoqqk5aakMsCo0VRUosuG8Axj/UAV6DhFEx1raC4bpWkV7 2MflBt/qx+rV4bzMLuiDK5BNWdshmqLBj7FbTnjEM9WT1G12IZvNCPF8vQJe7ZErFH6u xxuhtmHjnjEJO5dEE86K2xBRRJa93epunCA4jpyFQSboqqRJ4mcdPC8rVw7WVS2HB2ha xZcXtJeHtLnI58DpGgDIqMbOhTKESZTsizwEWyZpshrfQK1Cb85SFjzRn5VhXUp5Xg5W cTm4QguTvygoJSBKV/KsAlNvdeaKowH/1h6AY3UzKeUKjcjbRvsd3u5/dRKoZN/6aBGU YqfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jcKQllrGDjvqbm2MA9svqZXWKVjGseefosu8UFab5YY=; b=Abo3s/1v5K6irj0DwvtSHBu8mub11uS+K9jJew/kwPbIEhHRvli0QZ+xDSNqXGGjmI zoZZoTdYMPZQFTKSaG6yIPfaqjOlkBMvjaGtsamZ3EqqkAdLVB071zL2SDxy6YDPbT7i +YoepCr6UWGiLr32M2xJfJsllokURuwuYOyDKhKuRdQbv5qXkUaNTeqJPaBz0dPXMLEB zr7Pk7ht5v5YQUCCScyCRfRns1SfKlC4s5207KrOIPYu48s5jWfA98fLa3D//NgGNnC8 TVD9StMmYOKUHH1C06XK4swB/Gcz3RuGOooQgDb+DVv566Nvq9UIjTf83S5UCsaYPQZQ XoVQ== X-Gm-Message-State: ANoB5pl4t6PA+Hio5TRmF6UiZwOurJhmMT7fY3+gUoosKHbilv6h56AT tZgWkql0B0wdlrmKDAR9wq+CHSXWXIEaLfa9iLM= X-Google-Smtp-Source: AA0mqf5ey3vMXPgbTvyOaoD0a+KjMn5hfOOBE1Ul9UAqu4fHEE4pN6Ryh9CQ3wUagGgmVvXqZw7y1g== X-Received: by 2002:a05:6a00:4009:b0:563:2ada:30a3 with SMTP id by9-20020a056a00400900b005632ada30a3mr2905950pfb.27.1668953753382; Sun, 20 Nov 2022 06:15:53 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:52 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/35] lttng-modules: upgrade 2.13.5 -> 2.13.7 Date: Sun, 20 Nov 2022 04:14:58 -1000 Message-Id: <7f5ec92b3865fcd094898f4cd2d7daba76464a5e.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173609 From: Richard Purdie 2022-09-30 (National Day for Truth and Reconciliation) LTTng modules 2.13.7 * Fix: handle integer capture page faults as skip field 2022-09-30 (National Day for Truth and Reconciliation) LTTng modules 2.13.6 * Fix: bytecode validator: reject specialized load field/context ref instructions * Fix: bytecode validator: reject specialized load instructions * Fix: honor "user" attribute for array/sequence of user integers * wrapper: powerpc64: fix kernel crash caused by do_get_kallsyms * Fix: event notification: Remove duplicate event enabled check * Fix: event notification capture: validate buffer length * Fix: handle capture page faults as skip field * Fix: event notification capture error handling * Fix: capture_sequence_element_{un,}signed: handle user-space input * Fix: notification capture: handle userspace strings * Implement lttng_msgpack_write_user_str * Fix: bytecode interpreter: LOAD_FIELD: handle user fields * Fix: move "user" attribute from field to type * Introduce lttng_copy_from_user_check_nofault * fix: adjust range v5.10.137 in block probe Remove "fix: adjust range v5.10.137 in block probe" and "wrapper: powerpc64: fix kernel crash caused by do_get_kallsyms" since they are included in this version bump. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 1243d6afc075e3c89ca69af214e70c0d159cb832) Signed-off-by: Steve Sakoman --- ...djust-range-v5.10.137-in-block-probe.patch | 92 ------------------ ...4-fix-kernel-crash-caused-by-do_get_.patch | 94 ------------------- ...ules_2.13.5.bb => lttng-modules_2.13.7.bb} | 4 +- 3 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.13.5.bb => lttng-modules_2.13.7.bb} (86%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch deleted file mode 100644 index 1c3918be5c..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-adjust-range-v5.10.137-in-block-probe.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6 Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 22 Aug 2022 14:16:27 -0400 -Subject: [PATCH] fix: adjust range v5.10.137 in block probe - -See upstream commit, backported in v5.10.137 : - -commit 1cb3032406423b25aa984854b4d78e0100d292dd -Author: Christoph Hellwig -Date: Thu Dec 3 17:21:39 2020 +0100 - - block: remove the request_queue to argument request based tracepoints - - [ Upstream commit a54895fa057c67700270777f7661d8d3c7fda88a ] - - The request_queue can trivially be derived from the request. - -Change-Id: I01f96a437641421faf993b4b031171c372bd0374 -Signed-off-by: Michael Jeanson -Signed-off-by: Mathieu Desnoyers - -Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/5dab3d515b6f5c5ac80c8e7674628495e3bf4ac6] -Signed-off-by: Steve Sakoman - ---- - include/instrumentation/events/block.h | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h -index 882e6e08..d4821c12 100644 ---- a/include/instrumentation/events/block.h -+++ b/include/instrumentation/events/block.h -@@ -366,7 +366,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_requeue, - lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) - ) - ) --#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0)) - /** - * block_rq_requeue - place block IO request back on a queue - * @rq: block IO operation request -@@ -611,7 +612,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, - ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) - ) - ) --#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, - - TP_PROTO(struct request *rq), -@@ -746,7 +748,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq, - ) - #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */ - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0)) - /** - * block_rq_insert - insert block operation request into queue - * @rq: block IO operation request -@@ -781,7 +784,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert, - ) - #endif - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0)) - /** - * block_rq_issue - issue pending block IO request operation to device driver - * @rq: block IO operation operation request -@@ -812,7 +816,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue, - ) - #endif - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0)) - /** - * block_rq_merge - merge request with another one in the elevator - * @rq: block IO operation operation request -@@ -1632,7 +1637,8 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap, - lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) - ) - ) --#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0) \ -+ || LTTNG_KERNEL_RANGE(5,10,137, 5,11,0)) - /** - * block_rq_remap - map request for a block operation request - * @rq: block IO operation request diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch deleted file mode 100644 index b3b191c7ac..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 480cce4315ce5bf59a509e8a53a52545f393de68 Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Tue, 27 Sep 2022 15:59:42 +0800 -Subject: [PATCH] wrapper: powerpc64: fix kernel crash caused by - do_get_kallsyms - -Kernel crashes on powerpc64 ABIv2 as follow when lttng_tracer initializes, -since do_get_kallsyms in lttng_wrapper fails to return a proper address of -kallsyms_lookup_name. - -root@qemuppc64:~# lttng create trace_session --live -U net://127.0.0.1 -Spawning a session daemon -lttng_kretprobes: loading out-of-tree module taints kernel. -BUG: Unable to handle kernel data access on read at 0xfffffffffffffff8 -Faulting instruction address: 0xc0000000001f6fd0 -Oops: Kernel access of bad area, sig: 11 [#1] - -NIP [c0000000001f6fd0] module_kallsyms_lookup_name+0xf0/0x180 -LR [c0000000001f6f28] module_kallsyms_lookup_name+0x48/0x180 -Call Trace: -module_kallsyms_lookup_name+0x34/0x180 (unreliable) -kallsyms_lookup_name+0x258/0x2b0 -wrapper_kallsyms_lookup_name+0x4c/0xd0 [lttng_wrapper] -wrapper_get_pfnblock_flags_mask_init+0x28/0x60 [lttng_wrapper] -lttng_events_init+0x40/0x344 [lttng_tracer] -do_one_initcall+0x78/0x340 -do_init_module+0x6c/0x2f0 -__do_sys_finit_module+0xd0/0x120 -system_call_exception+0x194/0x2f0 -system_call_vectored_common+0xe8/0x278 - - -do_get_kallsyms makes use of kprobe_register and in turn kprobe_lookup_name -to get the address of the kernel function kallsyms_lookup_name. In case of -PPC64_ELF_ABI_v2, when kprobes are placed at function entry, -kprobe_lookup_name adjusts the global entry point of the function returned -by kallsyms_lookup_name to the local entry point(at some fixed offset of -global one). This adjustment is all for kprobes to be able to work properly. -Global and local entry point are defined in powerpc64 ABIv2. - -When the local entry point is given, some instructions at the beginning of -the function are skipped and thus causes the above kernel crash. We just -want to make a simple function call which needs global entry point. - -This patch adds 4 bytes which is the length of one instruction to -kallsyms_lookup_name so that it will not trigger the global to local -adjustment, and then substracts 4 bytes from the returned address. See the -following kernel change for more details. - -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=290e3070762ac80e5fc4087d8c4de7e3f1d90aca - -Upstream-Status: Backport - -Signed-off-by: He Zhe -Signed-off-by: Mathieu Desnoyers -Change-Id: I34e68e886b97e3976d0b5e25be295a8bb866c1a4 ---- - src/wrapper/kallsyms.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/wrapper/kallsyms.c b/src/wrapper/kallsyms.c -index d2848764..93017adc 100644 ---- a/src/wrapper/kallsyms.c -+++ b/src/wrapper/kallsyms.c -@@ -39,10 +39,26 @@ unsigned long do_get_kallsyms(void) - memset(&probe, 0, sizeof(probe)); - probe.pre_handler = dummy_kprobe_handler; - probe.symbol_name = "kallsyms_lookup_name"; -+#ifdef PPC64_ELF_ABI_v2 -+ /* -+ * With powerpc64 ABIv2, we need the global entry point of -+ * kallsyms_lookup_name to call it later, while kprobe_register would -+ * automatically adjust the global entry point to the local entry point, -+ * when a kprobe was registered at a function entry. So we add 4 bytes -+ * which is the length of one instruction to kallsyms_lookup_name to -+ * avoid the adjustment. -+ */ -+ probe.offset = 4; -+#endif - ret = register_kprobe(&probe); - if (ret) - return 0; -+#ifdef PPC64_ELF_ABI_v2 -+ /* Substract 4 bytes to get what we originally want */ -+ addr = (unsigned long)(((char *)probe.addr) - 4); -+#else - addr = (unsigned long)probe.addr; -+#endif - #ifdef CONFIG_ARM - #ifdef CONFIG_THUMB2_KERNEL - if (addr) --- -2.17.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb similarity index 86% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb index 307fb912cf..49c584dff4 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.5.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.7.bb @@ -11,14 +11,12 @@ include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ - file://0001-fix-adjust-range-v5.10.137-in-block-probe.patch \ - file://0001-wrapper-powerpc64-fix-kernel-crash-caused-by-do_get_.patch \ " # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "eceb3428d80e85a9f008425beb9526195c9f7f02b302f28add56df53aef3e708" +SRC_URI[sha256sum] = "5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234" export INSTALL_MOD_DIR="kernel/lttng-modules" From patchwork Sun Nov 20 14:14:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15767 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 91F63C4167B for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.13270.1668953756379792125 for ; Sun, 20 Nov 2022 06:15:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5xkO9BcD; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so12216383pjs.4 for ; Sun, 20 Nov 2022 06:15:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=UTrgcJ+jUR88snMMO2XCbCG1SjujkANIOR64TB+5T+Y=; b=5xkO9BcDUKdCAVJpnPLXC6pRUd6lIUdcndnajJizNzhGU43WfyBXYITx2TC4bOhmHP k/RXrdZoJQub58DrGM91sADRFf6yyDua6dIATepvWk7ONmCQHW+nsRU72GTikrU4WePb ah9cnmyXG+SrSeTPDPi30vq8ucc1W++YjqWF2wmwmOiwMXuXkJDUtVpF3ifEZ590+2Su o0sx4iBOLW4DitlhhqOas3kg0zkddF5bLxegx3gXfgU6i3oWCBZPjUt4Zyk+RWhiSYbt bWxVmMbcURxht3qkyjrBs1BmMugDqrq64ja0WMZ8z8Y3qOpn7bY1Yzmlqx6Mpnq6HLNU 0cug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UTrgcJ+jUR88snMMO2XCbCG1SjujkANIOR64TB+5T+Y=; b=NpwCnZXw/xo0XX45ZXUSjXAgNqsa7jOoq4HyLX4qg6WfL+uW6gU+nYjUQpFG7VKqf4 wvu5tF9iA6DAGSTj5nCjMo8KxZ9ImjFCqRC4VGEhh1wtYEM5IWC+24XOOvrCyjv4A02G FIg8Pq26kylMRkmPMdLPp8MXUCLsQvfzw3YnUiYg2Dmcb5BijMJuuYGwlEasux5ujrmL Qd+mqC0cIifMgrMFYi9+HIx6HqnXbl8gd4NJuvCOSiafzDIU5cSYJjz0MxTJ9r4KREgv WP1Pufxjgq6rhecds3u8CXVCse03ehd16lYJHUYiTgYfgmBDRJYdO6EW1bFmZKZcmG3Q RIVQ== X-Gm-Message-State: ANoB5pkxuScpWPVYblrHVS2Tzl6vutdCK0cYIeOO0mzbkuC2vTWj8ead RaETfl7koJDL0wSjb33rC70W4OnEfe7zbvZBY/M= X-Google-Smtp-Source: AA0mqf4FzChO7lYW8V5ZMGHcf8xsU+OEopPh3wcqvZxu41R8lHGF2Tyn+8ShbqKN3Nt7zmJDTwMmjg== X-Received: by 2002:a17:903:2783:b0:186:a97d:6bc8 with SMTP id jw3-20020a170903278300b00186a97d6bc8mr7715188plb.101.1668953755262; Sun, 20 Nov 2022 06:15:55 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:54 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/35] bind: upgrade 9.18.7 -> 9.18.8 Date: Sun, 20 Nov 2022 04:14:59 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173610 From: Wang Mingyu Changelog: https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_18_8/CHANGES --- 9.18.7 released --- 5962. [security] Fix memory leak in EdDSA verify processing. (CVE-2022-38178) [GL #3487] 5960. [security] Fix serve-stale crash that could happen when stale-answer-client-timeout was set to 0 and there was a stale CNAME in the cache for an incoming query. (CVE-2022-3080) [GL #3517] 5959. [security] Fix memory leaks in the DH code when using OpenSSL 3.0.0 and later versions. The openssldh_compare(), openssldh_paramcompare(), and openssldh_todns() functions were affected. (CVE-2022-2906) [GL #3491] 5958. [security] When an HTTP connection was reused to get statistics from the stats channel, and zlib compression was in use, each successive response sent larger and larger blocks of memory, potentially reading past the end of the allocated buffer. (CVE-2022-2881) [GL #3493] 5957. [security] Prevent excessive resource use while processing large delegations. (CVE-2022-2795) [GL #3394] 5956. [func] Make RRL code treat all QNAMEs that are subject to wildcard processing within a given zone as the same name. [GL #3459] 5955. [port] The libxml2 library has deprecated the usage of xmlInitThreads() and xmlCleanupThreads() functions. Use xmlInitParser() and xmlCleanupParser() instead. [GL #3518] 5954. [func] Fallback to IDNA2003 processing in dig when IDNA2008 conversion fails. [GL #3485] 5953. [bug] Fix a crash on shutdown in delete_trace_entry(). Add mctx attach/detach pair to make sure that the memory context used by a memory pool is not destroyed before the memory pool itself. [GL #3515] 5952. [bug] Use quotes around address strings in YAML output. [GL #3511] 5951. [bug] In some cases, the dnstap query_message field was erroneously set when logging response messages. [GL #3501] 5948. [bug] Fix nsec3.c:dns_nsec3_activex() function, add a missing dns_db_detachnode() call. [GL #3500] 5947. [func] Change dnssec-policy to allow graceful transition from an NSEC only zone to NSEC3. [GL #3486] 5946. [bug] Fix statistics channel's handling of multiple HTTP requests in a single connection which have non-empty request bodies. [GL #3463] 5945. [bug] If parsing /etc/bind.key failed, delv could assert when trying to parse the built in trust anchors as the parser hadn't been reset. [GL !6468] 5944. [bug] Fix +http-plain-get and +http-plain-post options support in dig. Thanks to Marco Davids at SIDN for reporting the problem. [GL !6672] 5942. [bug] Fix tkey.c:buildquery() function's error handling by adding the missing cleanup code. [GL #3492] 5941. [func] Zones with dnssec-policy now require dynamic DNS or inline-siging to be configured explicitly. [GL #3381] 5938. [bug] An integer type overflow could cause an assertion failure when freeing memory. [GL #3483] 5936. [bug] Don't enable serve-stale for lookups that error because it is a duplicate query or a query that would be dropped. [GL #2982] 5935. [bug] Fix DiG lookup reference counting bug, which could be observed in NSSEARCH mode. [GL #3478] Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 1d87d2652f7f6640dda85e037c580c83f99a8ba8) Signed-off-by: Steve Sakoman --- .../0001-avoid-start-failure-with-bind-user.patch | 0 .../0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0 .../bind-ensure-searching-for-json-headers-searches-sysr.patch | 0 .../bind/{bind-9.18.7 => bind-9.18.8}/bind9 | 0 .../bind/{bind-9.18.7 => bind-9.18.8}/conf.patch | 0 .../bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh | 0 .../init.d-add-support-for-read-only-rootfs.patch | 0 .../make-etc-initd-bind-stop-work.patch | 0 .../bind/{bind-9.18.7 => bind-9.18.8}/named.service | 0 .../bind/{bind_9.18.7.bb => bind_9.18.8.bb} | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-avoid-start-failure-with-bind-user.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/bind9 (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/conf.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/generate-rndc-key.sh (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/init.d-add-support-for-read-only-rootfs.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/make-etc-initd-bind-stop-work.patch (100%) rename meta/recipes-connectivity/bind/{bind-9.18.7 => bind-9.18.8}/named.service (100%) rename meta/recipes-connectivity/bind/{bind_9.18.7.bb => bind_9.18.8.bb} (97%) diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/0001-avoid-start-failure-with-bind-user.patch rename to meta/recipes-connectivity/bind/bind-9.18.8/0001-avoid-start-failure-with-bind-user.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch rename to meta/recipes-connectivity/bind/bind-9.18.8/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/bind-ensure-searching-for-json-headers-searches-sysr.patch rename to meta/recipes-connectivity/bind/bind-9.18.8/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/bind9 b/meta/recipes-connectivity/bind/bind-9.18.8/bind9 similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/bind9 rename to meta/recipes-connectivity/bind/bind-9.18.8/bind9 diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.8/conf.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/conf.patch rename to meta/recipes-connectivity/bind/bind-9.18.8/conf.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/generate-rndc-key.sh rename to meta/recipes-connectivity/bind/bind-9.18.8/generate-rndc-key.sh diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/init.d-add-support-for-read-only-rootfs.patch rename to meta/recipes-connectivity/bind/bind-9.18.8/init.d-add-support-for-read-only-rootfs.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/make-etc-initd-bind-stop-work.patch rename to meta/recipes-connectivity/bind/bind-9.18.8/make-etc-initd-bind-stop-work.patch diff --git a/meta/recipes-connectivity/bind/bind-9.18.7/named.service b/meta/recipes-connectivity/bind/bind-9.18.8/named.service similarity index 100% rename from meta/recipes-connectivity/bind/bind-9.18.7/named.service rename to meta/recipes-connectivity/bind/bind-9.18.8/named.service diff --git a/meta/recipes-connectivity/bind/bind_9.18.7.bb b/meta/recipes-connectivity/bind/bind_9.18.8.bb similarity index 97% rename from meta/recipes-connectivity/bind/bind_9.18.7.bb rename to meta/recipes-connectivity/bind/bind_9.18.8.bb index 11c8a4e9d3..2964dc9963 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.7.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.8.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981" +SRC_URI[sha256sum] = "0e3c3ab9378db84ba0f37073d67ba125ae4f2ff8daf366c9db287e3f1b2c35f0" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # follow the ESV versions divisible by 2 From patchwork Sun Nov 20 14:15:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15771 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 84576C433FE for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.13214.1668953758144549955 for ; Sun, 20 Nov 2022 06:15:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=O7t/zAnd; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id w23so8396517ply.12 for ; Sun, 20 Nov 2022 06:15:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Dh/SaLthHQ6Yp/DyAO3mDrt41Du72zA3lISMD7gYXI8=; b=O7t/zAndC3vK2/zzedkT4q2hvvTc1o/EEFkj03u7EvzPT7gyirJQ7f8YOe3L2C9CXS C/+uXutwUmHqZPoeGgww5Hy2nK7n0Fr3T4kKgNzxbLj+eXE6ivXgoVNVxiOph5rWmA1O tKNzU//6yJHo8lBbUyMOIgkPGFoGAXLDLjslPlKXB84ZeJ5CC/3cgG8LgsEBoCXTU1k6 g3Y+gmcmIFOH0u+yd8vGIhCcDQTPsIyE+4rRGEkhW8X5GijG3yNRqh39e7SHjCtaUzTJ xANS48QN/2wbTxbpi4OApMHovzaOUFQAPbKWGo5yU2fdheuoShrIGFB0A8DF+ZVJdLXO PvKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Dh/SaLthHQ6Yp/DyAO3mDrt41Du72zA3lISMD7gYXI8=; b=03cKmcFbwUHxnrks6wtaSTNsprqKSWqbIhO6fXUQRlEdv3wK4gl+NTr0zHLd2peazp /L3PqZ5JL+aJD6fEdOPjFUat0y0dY6RRVrjGdQfA573+aiKhdw0hq3slk5JxzM670KKx 7fq9ZmAHY/F/7LDhppqVIRk0VcN5qMjRwP50WttiofYaKBaREwuAQkc8kuEskN+Oems7 ssvBep0AyZlAnI1ppTd0WZZD0j1W8+yZYyKujroaxqDCQzm7XdD0n7siVsIuRUIux4Vf lG3WOT1wkvGlotNIH6SIMz2fGJ8ZxEa7ZBuPm8FBDRLymNXOJxR0pVNs7Ci+hwqYCZp4 xotw== X-Gm-Message-State: ANoB5pkNqJcJ2L6fYHtsorl8PBKoXOcmzkC1OznIKctWbC/bZDcLJOAa /jEXcqxwYuHKtj5Qayfuj0ne3TFVNqwVtOi/gCQ= X-Google-Smtp-Source: AA0mqf45Ypu374ygLZWofsNkW41fOoQGo09bsje/i3ljru1+EHU6xlk5g//R6dmj9C7jheGnNtbOyw== X-Received: by 2002:a17:902:ed94:b0:186:748f:e8c5 with SMTP id e20-20020a170902ed9400b00186748fe8c5mr7826598plj.73.1668953757097; Sun, 20 Nov 2022 06:15:57 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:56 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/35] socat: upgrade 1.7.4.3 -> 1.7.4.4 Date: Sun, 20 Nov 2022 04:15:00 -1000 Message-Id: <42942e565870bd4d0753e0dc7bed9277a71bccf9.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173611 From: Wang Mingyu 1.7.4.4 is a bug fix release 0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch removed since it's included in 1.7.4.4 Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit c00e9d66f0b8449ff1bf24546f232345eb6feebd) Signed-off-by: Steve Sakoman --- ...ck-getprotobynumber_r-with-AC_TRY_LI.patch | 35 ------------------- .../{socat_1.7.4.3.bb => socat_1.7.4.4.bb} | 6 ++-- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch rename meta/recipes-connectivity/socat/{socat_1.7.4.3.bb => socat_1.7.4.4.bb} (89%) diff --git a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch deleted file mode 100644 index fbfb0816dd..0000000000 --- a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 17 Jan 2022 13:21:32 +0100 -Subject: [PATCH] configure.ac: check getprotobynumber_r with AC_TRY_LINK - -AC_TRY_COMPILE won't error out if the function is altogether absent -(e.g. on linux musl C library), the test needs to link all the way. - -Upstream-Status: Submitted [via email to socat@dest-unreach.org] -Signed-off-by: Alexander Kanavin ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4acc9e..973a7f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) - # getprotobynumber_r() is not standardized - AC_MSG_CHECKING(for getprotobynumber_r() variant) - AC_CACHE_VAL(sc_cv_getprotobynumber_r, --[AC_TRY_COMPILE([#include -+[AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], - [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], -- [AC_TRY_COMPILE([#include -+ [AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL,1024);], - [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], -- [AC_TRY_COMPILE([#include -+ [AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL);], - [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], - diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb b/meta/recipes-connectivity/socat/socat_1.7.4.4.bb similarity index 89% rename from meta/recipes-connectivity/socat/socat_1.7.4.3.bb rename to meta/recipes-connectivity/socat/socat_1.7.4.4.bb index a4a0a8933e..5a379380d1 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.4.4.bb @@ -9,11 +9,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86" -SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ - file://0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch \ - " +SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2" -SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007" +SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac" inherit autotools From patchwork Sun Nov 20 14:15:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15766 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 868E8C4332F for ; Sun, 20 Nov 2022 14:16:00 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.13267.1668953742754071399 for ; Sun, 20 Nov 2022 06:16:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MM3g93A0; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id g10so8406027plo.11 for ; Sun, 20 Nov 2022 06:15:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=LTv2TlgFZevmLIrX+We0aujnFw7GWTVNg4mpdXqAFJs=; b=MM3g93A02edHWeqhqJ/MI/1fcp9uhEP90gb41fhRF7d4dBxnLKlfzixd9pvlbmsKTE Rm3B8bmIXc/m5qgMVgA9Xb8OeLsbCPySofbg2t4NxPTP/0BdQd0OtV0Y+ovn0qErvpYW RQzL0V4k+LfRNPr8INUnN7utP/F2TNsOx2hHf9J75JjuRGKSlWgpuZRrxNeatfOEmsSq onEOF/gXpioDaiJ4JHdma8z0FFA7gQF3wOsvVQ5VftNVPGEl9B4vXuM+armsoj3QTd3i aXm+klardpI1ic87UGYWhjdgc4cFVtwEkBUkgb3ARSCHvVUMVrxcTZ9YFEwSbsXEehld fX+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LTv2TlgFZevmLIrX+We0aujnFw7GWTVNg4mpdXqAFJs=; b=Z6jMP2wk039kucCItNC5eX51uprXn2uUuj4RUfGz5cDyNWxEQF705y+pzyy+xHZhO1 EAG2L4hUVxDoBnWjjOvvoVEXi6k5BA10LboEKP8bVrGo6lZznKp0mq4QUtHUwyf8L7v1 fUrjqOS3cyfXg5ZFaTBnO5UB7Sl3s4HgYHqCshtAPEDxqyfbNT7mB4uJI5uT3HwBNYNA D/bFJ8UWKacqZFTc+tedHB39A+imGXAFA3i6ex1KztZMNMv5Fjlylz45Fj8auJ10QyBZ 4lZqn5oeO3YXCp7KexkwjFhlJqL9GnrKlsKNZ9okqZpZupi6OkUH9OYv9oG86tWP8NvA s5Jw== X-Gm-Message-State: ANoB5pmU0/4XpFZVTGmKs32lZZsPbqjMo9lVq+vyXTJ0b//GCPb2dVFT lYI94W1kiBLu41+6HzWr7e2zHbOClGTVsQOIDoA= X-Google-Smtp-Source: AA0mqf5a5mDSChudy9FCtm3JM9eTQZEgMW/6sEvYrc1vMMPhp9IqahYNPCmtmuzmLTNr0fUQZ9kxmA== X-Received: by 2002:a17:902:d349:b0:189:324:27cc with SMTP id l9-20020a170902d34900b00189032427ccmr7609421plk.70.1668953759106; Sun, 20 Nov 2022 06:15:59 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.15.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:15:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/35] libxcrypt: upgrade 4.4.28 -> 4.4.30 Date: Sun, 20 Nov 2022 04:15:01 -1000 Message-Id: <061a969a6d7a8d3a7009190a18c1564cae4ad990.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173612 From: Wang Mingyu Changelog: ========== * configure: Restore ucontext api functionality check. In c3f01c72b303cbbb0cc8983120677edee2f3fa4b the use of the ucontext api in the main program was removed, and with it the configure check for it. However, the ucontext api is still used in the "explicit_bzero" test and thus this test still needs to be in place. See also: https://bugs.gentoo.org/838172 * configure: Restore the functionality of the '--disable-symvers' switch. Without this fix the build was simply broken, if symbol versioning was disabled for any reason, e.g. whether the compiler nor the linker supporting it, or if disabled on purpose by the user (issue #142). * Fix variable name in crypt(3) for a datamember of 'struct crypt_data' (issue #153). * Add glibc-on-loongarch-lp64 (Loongson LA464 / LA664) entry to libcrypt.minver. This was added in GNU libc 2.36. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 7da5dd3b43718b876645602b1a23c739cbe8016d) Signed-off-by: Steve Sakoman --- .../{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.28.bb => libxcrypt-compat_4.4.30.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.28.bb => libxcrypt_4.4.30.bb} (100%) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 39ba2636ff..2bdedcba6d 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "50cf2b6dd4fdf04309445f2eec8de7051d953abf" +SRCREV = "fee2687bad66e351a3dcc963a34ae80125923ff8" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb From patchwork Sun Nov 20 14:15:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15774 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 84ADEC43217 for ; Sun, 20 Nov 2022 14:16:10 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.13216.1668953761960017562 for ; Sun, 20 Nov 2022 06:16:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1o7f+c+W; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id y4so8442096plb.2 for ; Sun, 20 Nov 2022 06:16:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=PPj1cQGKjp5C9P9oIePpTWLWahjGBi5vuIYBEi9oRLM=; b=1o7f+c+WN5kGukXrWC4kME44Xsu+6bihLC9nVR6tnV+W69nbzuYpr0zFg4xJwMpsdY baysNWj7yaKG7K4L1kiZRj5UmHQQwZ9HU4hbpNwnQN3khj1XTWIbmFt6orzgnu5ZazUW u/0MiTFAz4PIDoViUTAjWTrtQz9by96USuV86HtdgccAJuKqxVS34Q3RHpZI7LmLsapG hV6M6/s8cTyA48mmELl5R5hU8Aa/+1mczxC72tRkGH8HMqapw56TC+Z5eUVJdEwBRWWh f43HVPYwYq2gy9MwSHb+rL5bW6Dcq1AnO155uP9XQOnVyHS1o2DZPvENzV3fGQ7c1Avr DJPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=PPj1cQGKjp5C9P9oIePpTWLWahjGBi5vuIYBEi9oRLM=; b=S1d+5F2nUpJTYk+bi4XzkLCtsFmmB18NBfOQ2s0OkBvUNk9CdZIEs3EKfRzjdso0WI P5cFd1c7PhzMINURB45PhnLxR1BFbb8fKboOpVVI3Nmr1DLXI3smsqLX0eiNSXBFRCpT acxLOzjq4+eranwhmLWyn+kWqc+RzzOMzMT4tCwXkFzOamOxkDI+VFQtfppgYCJ8wVZ6 vJ/23VU4i8ILnAm5PkGH966uc79fHwAWzaqlL+/Jh0lwqIoYKFWK4UxGz8pLwyN2cd6Y ZJJJuQO8SXVddSf8+y2pqajRxLRnjTo6WSVSEj7LP4AVs1acle8/j/2iw9gyuXWYSZTY Ph3g== X-Gm-Message-State: ANoB5pnREgIRb1ACq7zk/gZe5CYbG2jrWIUJHfr9ECYh++9aP4LFpKpg o1lY9iIBXiw1jqvHh2MmChOM7FQsLCfHk++4WmU= X-Google-Smtp-Source: AA0mqf4gLaHD9fYUu1ERAf+gRzAlmSjucWZrUTDhSmm+W2lpmYE5ePl9FEWbGLCOgg5tyyaKvNifJQ== X-Received: by 2002:a17:903:40cb:b0:188:7dca:6f4a with SMTP id t11-20020a17090340cb00b001887dca6f4amr2872856pld.60.1668953760981; Sun, 20 Nov 2022 06:16:00 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/35] sudo: upgrade 1.9.10 -> sudo 1.9.12p1 Date: Sun, 20 Nov 2022 04:15:02 -1000 Message-Id: <192735486932d64e949d3764629b3706efd1bbc6.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173613 From: Xiangyu Chen Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- meta/recipes-extended/sudo/sudo.inc | 2 +- meta/recipes-extended/sudo/{sudo_1.9.10.bb => sudo_1.9.12p1.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.9.10.bb => sudo_1.9.12p1.bb} (96%) diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 8947c46129..fd5bbf103d 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/meta/recipes-extended/sudo/sudo_1.9.10.bb b/meta/recipes-extended/sudo/sudo_1.9.12p1.bb similarity index 96% rename from meta/recipes-extended/sudo/sudo_1.9.10.bb rename to meta/recipes-extended/sudo/sudo_1.9.12p1.bb index aa0d814ed7..1495b67b8b 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.10.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.12p1.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "44a1461098e7c7b8e6ac597499c24fb2e43748c0c139a8b4944e57d1349a64f4" +SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" From patchwork Sun Nov 20 14:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15776 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 912DCC4167B for ; Sun, 20 Nov 2022 14:16:10 +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.13276.1668953763939044230 for ; Sun, 20 Nov 2022 06:16:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qACEeU2T; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id v28so9099085pfi.12 for ; Sun, 20 Nov 2022 06:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=ryohtewRbXNR8Vd2UA0PLD1Vj/aMs1XgqdBj0RwaLpA=; b=qACEeU2To4qM3FXGpur9BS+2vBTqtMQXBDTiiOhwKWkpOneaaouBHkSIgLzjoKB1zu 9Lr4prB7IhrQHDgFNMV2T4RktYPV0mqnpANoXEET99HchDu1tei1IsCpcr68sII19ADd zKw/8he1D0GBfvDaafTAFhDMAgQKillyeeAezpKctiROBNhfCvNRVnm6U+XErstbEVSY 7lwWcWZqqNaJZUKCbqRY41O695l1RZQj2HSyvOj/76LK9KFswQsj68+Gg+W85QjOHVj3 q5L9xgd6sh+Wt5T/HUC/Ojrum+EpM+kajucaAhQueWnhHRTvvpYlBlgz5li2/bk+8H21 +43A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ryohtewRbXNR8Vd2UA0PLD1Vj/aMs1XgqdBj0RwaLpA=; b=FELl0EEoEC/mJ4sDMBZe3j1+2BiqVbPMlqTgag3WLm76IPxbBWLvn+wykN4C46CbGF 6vvfIOViC4QtSxJBaDf5TpzKv5l7wWwe1C4HPRIgIzJniH3DFFgZz8NuqdOl/Xd43uv9 87r8N29ChddlcN48NlaAQoYD664IB9mQVlPL2ATO+ngWHwN86PvuyCe3Y68+hF1qMTyP KB1mx6GXVUT7cvXg0DdELUwxfgXVO7WJhqYya68DaDdw5L9VJd3h2CVAH5/mawR6bjFE S8Rv7CzvIXpmWZhVmZK0qWtTeeOdRdCFzXZenfQnpf50y8TEc+uBTFJ5JGKX+ObkUegm b4HA== X-Gm-Message-State: ANoB5pmtR7WJd1jmiQcE9EzCa8slQ/fNJ3Hv7pB5Yagd4IE8OyYQFm75 l7pUDwj2XTikHS/XjaaF4zXPXmaJWwuHLSWx5M8= X-Google-Smtp-Source: AA0mqf5sK1B+ksfsX1HrG67OwbJi5UocZrO0kIkzu7H4y8WUFNNAqVD83KrmTF4uOC4IgFohDUrl2A== X-Received: by 2002:a05:6a00:27ab:b0:56c:71a4:efe with SMTP id bd43-20020a056a0027ab00b0056c71a40efemr16236616pfb.84.1668953762821; Sun, 20 Nov 2022 06:16:02 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/35] oeqa/selftest/lic_checksum: Cleanup changes to emptytest include Date: Sun, 20 Nov 2022 04:15:03 -1000 Message-Id: <63f4da1f46d4fdf0c244f0e52028087657fea7d4.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173614 From: Nathan Rossi Config written to the emptytest include file is invalid after the test has cleaned up its temporary directories resulting in the emptytest recipe potentially having invalid content when parsed by successive bitbake runs. This presents the following error in tests after lic_checksum execution, e.g. 'oe-selftest -r lic_checksum recipetool' ERROR: .../emptytest.bb: Unable to get checksum for emptytest SRC_URI entry tmpn_nyosnq: file could not be found Remove the recipe include content once the bitbake runs are completed in each lic_checksum test case. Signed-off-by: Nathan Rossi Signed-off-by: Alexandre Belloni (cherry picked from commit 087df767a64b271b503d714df3df6d8b3caad1c0) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/lic_checksum.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/lic_checksum.py b/meta/lib/oeqa/selftest/cases/lic_checksum.py index 8f1226e6a5..bc0a2b5d8e 100644 --- a/meta/lib/oeqa/selftest/cases/lic_checksum.py +++ b/meta/lib/oeqa/selftest/cases/lic_checksum.py @@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" """ % (urllib.parse.quote(lic_path), urllib.parse.quote(lic_path))) result = bitbake(bitbake_cmd) + self.delete_recipeinc('emptytest') # Verify that changing a license file that has an absolute path causes @@ -51,5 +52,6 @@ SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e" f.write("data") result = bitbake(bitbake_cmd, ignore_status=True) + self.delete_recipeinc('emptytest') if error_msg not in result.output: raise AssertionError(result.output) From patchwork Sun Nov 20 14:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15775 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 91183C4321E for ; Sun, 20 Nov 2022 14:16:10 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.13197.1668953736410795498 for ; Sun, 20 Nov 2022 06:16:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=v1AnQGQC; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso8685764pjt.0 for ; Sun, 20 Nov 2022 06:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=zJTcDp+ea0WJY+cTVNiOw5Rnp/XpLwHhX+SIhX9o54I=; b=v1AnQGQCjgqUr0/V9G0BiD/pmllCo5AEEmM+uF+E8OTTwSABI1u0dzSkzQ9psVXFny 377TSnC17kZVmSrzh8qc4addT4r9EI6bvpVFYh3zU4aaZf54mAZ5pXfzr12DlP5xKrRl SLvZlbUaRfpKFQrj+L1Qab5I9zUI2zgN3uGQLAB9P1hLuF7Hv6wvwwi2D6gduxVNpkOU Lfk9Uwd/L3aMU/2DXmC1VQZAzAoT8aiPV+/tD5prGcP3Cqd6l429zvElHN5uJpOT2OR8 aEC7Vv/cEKPQ4rworE2mj/TLH8tL9PHq6tvL6O7YiVaRUHHfDgzOcGNR52CKk/LxPhxd +Fsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zJTcDp+ea0WJY+cTVNiOw5Rnp/XpLwHhX+SIhX9o54I=; b=Jm+gc4/xWTqat+RMV0UTcbw/cJSHczht4l1sw+FWfYIwYyEnF6QvahFw3729jq4A2f ihXmN8XChKJrZTHbk0n1ZNig0rNEruVj4/rt1h4OKCw8fknWn6ERWa77FLKy3Sma+k60 QWUKtjPF4bu42qXI8wo5KBbBJ171vA5qbhsa6jcl3S0cb/lYZ0IgVZ+GhrESdSXEe8zs U8HspvjXHh4aAQXi7pbPLi/PWVqkRc++zJGL8DAnlN+CNnDOTyCX+dXss7ZkWEO5+D8a HKFyWHmK8StCsiYRKA3PZfii7WEQUbgRPHJyjz5BfPLCLD2dI9SCRaL5tyzyq9TvwLQf jlLA== X-Gm-Message-State: ANoB5pk/C2+/JIBshQ8ZsfC/3O6Owujvx21rJePnvZmxc3MryovIqG4E 1EVdoASFheXFYGdyaAfITHYtBWzkHoESJ9kBZuE= X-Google-Smtp-Source: AA0mqf5/ikSNqEG4hCaeKNXBdDuLSL0iqnRGoSK3jnFZCw6iyR2VeV5J1gC7ox2a3vF1maklsM1kGg== X-Received: by 2002:a17:902:e74d:b0:186:887b:baa2 with SMTP id p13-20020a170902e74d00b00186887bbaa2mr7854107plf.27.1668953764666; Sun, 20 Nov 2022 06:16:04 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/35] oeqa/selftest/minidebuginfo: Create selftest for minidebuginfo Date: Sun, 20 Nov 2022 04:15:04 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173615 From: Nathan Rossi Add a new selftest to validate minidebuginfo support. This selftest builds a complete target image with PACKAGE_MINIDEBUGINFO enabled. ELFs included in the image are expected to have minidebuginfo included in the resulting executables and shared libraries, the self test validates this by unpacking the image and checking for the associated ".gnu_debugdata" section on busybox and libc ELFs. Signed-off-by: Nathan Rossi Signed-off-by: Alexandre Belloni (cherry picked from commit 5063a31ad05b75ec6ac12158fe759e81fcdb1585) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/minidebuginfo.py | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 meta/lib/oeqa/selftest/cases/minidebuginfo.py diff --git a/meta/lib/oeqa/selftest/cases/minidebuginfo.py b/meta/lib/oeqa/selftest/cases/minidebuginfo.py new file mode 100644 index 0000000000..414dad64a3 --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/minidebuginfo.py @@ -0,0 +1,49 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# +import os +import subprocess +import tempfile +import shutil + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import bitbake, get_bb_var, runCmd + + +class Minidebuginfo(OESelftestTestCase): + def test_minidebuginfo(self): + target_sys = get_bb_var("TARGET_SYS") + binutils = "binutils-cross-{}".format(get_bb_var("TARGET_ARCH")) + + self.write_config(""" +PACKAGE_MINIDEBUGINFO = "1" +IMAGE_FSTYPES = "tar.bz2" +""") + bitbake("core-image-minimal {}:do_addto_recipe_sysroot".format(binutils)) + + deploy_dir = get_bb_var("DEPLOY_DIR_IMAGE") + native_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", binutils) + readelf = get_bb_var("READELF", "core-image-minimal") + + # add usr/bin/${TARGET_SYS} to PATH + env = os.environ.copy() + paths = [os.path.join(native_sysroot, "usr", "bin", target_sys)] + paths += env["PATH"].split(":") + env["PATH"] = ":".join(paths) + + # confirm that executables and shared libraries contain an ELF section + # ".gnu_debugdata" which stores minidebuginfo. + with tempfile.TemporaryDirectory(prefix = "unpackfs-") as unpackedfs: + filename = os.path.join(deploy_dir, "core-image-minimal-{}.tar.bz2".format(self.td["MACHINE"])) + shutil.unpack_archive(filename, unpackedfs) + + r = runCmd([readelf, "-W", "-S", os.path.join(unpackedfs, "bin", "busybox")], + native_sysroot = native_sysroot, env = env) + self.assertIn(".gnu_debugdata", r.output) + + r = runCmd([readelf, "-W", "-S", os.path.join(unpackedfs, "lib", "libc.so.6")], + native_sysroot = native_sysroot, env = env) + self.assertIn(".gnu_debugdata", r.output) + From patchwork Sun Nov 20 14:15:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15772 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 8320DC4332F for ; Sun, 20 Nov 2022 14:16:10 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web11.13221.1668953767537605476 for ; Sun, 20 Nov 2022 06:16:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Y/omjUJX; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id f3so9014764pgc.2 for ; Sun, 20 Nov 2022 06:16:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=a4UdipuwROKHdVzXciwSYvdW7yOc19pYKWyNyKfmRxY=; b=Y/omjUJXjxgyhs6kPWBFZDEPuieyaI4L4tyywJ4tUjbppD0ru0hW9XkamD0VjX2Nrt 206YnHWD4pnrY22c99L+vQspUg2h/iv4LxKFjtLZ5+H7V9pvhzeCRdbPjjB3+ar9zhf+ 94ur9Ev06h1c958nWI8wIataLsqtPxZX8eHYCS8x7D+Clm9FdvhoYYEs4MYpbjjhX3wY zmDDcpwL9amvw1V/FqPqg2bljNrQmW2H9n63b9KxP/7jUF5+v5V5I+Yw3Y+4UVETNl1A Sgs+lCqMx5YRAv6+65CLv2kt30kJl8deOOk3vuRxz1zaKZKvxnHJCZJm5H1v4FoKcqKz HQkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=a4UdipuwROKHdVzXciwSYvdW7yOc19pYKWyNyKfmRxY=; b=1kU/0fg5q0pRdNdeZlB1PSBxOc+EvxHfx9W0MKT/X8LfO+CwXrzeW8Lp+LBBcXFeRO UJsi0ZpDWac9KC8QA2b0/hqest7ONFMeH3IBhJXrPbhXmXBjCc/pB/HDoJ0o3mEUY/ww o2GLNq6JZ4dJqsvCFH5ZuUp6BOyCxSQ5nJg7B2y2CpuaX4l4lu3jIA1gqQqtgouULggu XCuZHvBYlLQAzjCwYqBnKnlYu0q9IfGYfE+4YfLt0yqzdBaQEa+Fb5Qx53dj5mQxDWsy ayj34pZBvCsT7ekI9LItvGg33V1RXtZiI7KmKG2T5rZpDT/0eLdLy2gJgNpSdun5a+6G PKGQ== X-Gm-Message-State: ANoB5pmC8w88Ga0BqGOk24HUhZWw61KkQ/vfBJX8i/4FnJFAbJ4f/gbd IOoeqqgkEfB/Gnnq+g2XKCbEEqmabNVZJdmKq0A= X-Google-Smtp-Source: AA0mqf7MhbCZzs/fWtNcWdJSNEPSttY3yknvPUUz7XZMnPljOE+k3xjqbg5U/uIr80h+7MB35FVPLQ== X-Received: by 2002:a62:3142:0:b0:56d:8d19:f331 with SMTP id x63-20020a623142000000b0056d8d19f331mr16390768pfx.7.1668953766533; Sun, 20 Nov 2022 06:16:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/35] glibc-locale: Do not INHIBIT_DEFAULT_DEPS Date: Sun, 20 Nov 2022 04:15:05 -1000 Message-Id: <97020ee9912663196a7e8a524a23b0b70d8cf686.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173616 From: Nathan Rossi The glibc-locale recipe already partially depends on the base depends in order to satisfy the do_package dependency on binutils. However since commit d6ffd683bf6 NM has defaulted to gcc-nm, meaning do_package depends on gcc (for minidebuginfo). Whilst the do_package task could handle having the dependencies explicitly defined (either in glibc-locale or in package.bbclass), setting these would require some amount of conditional dependency configuration (cross/crosssdk/etc.). Since both binutils and gcc are already dependencies of virtual/libc (although compilerlibs is not), having glibc-locale not inhibit the default depends simplifies the handling of this situation for both glibc-locale and package.bbclass. Signed-off-by: Nathan Rossi Signed-off-by: Alexandre Belloni (cherry picked from commit 8a40d0a6039e87a5b4b26a0e84dd797fe5c75cba) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-locale.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index 7c14abfe99..7f70b3ca4f 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -5,14 +5,9 @@ SUMMARY = "Locale data from glibc" BPN = "glibc" LOCALEBASEPN = "${MLPREFIX}glibc" -# glibc-collateral.inc inhibits all default deps, but do_package needs objcopy -# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') -# ERROR: Function failed: split_and_strip_files -BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" -BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" -do_package[depends] += "${BINUTILSDEP}" - -DEPENDS += "virtual/libc" +# Do not inhibit default deps, do_package requires binutils/gcc for +# objcopy/gcc-nm and glibc-locale depends on virtual/libc directly. +INHIBIT_DEFAULT_DEPS = "" # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION # is set. The idea is to avoid running localedef on the target (at first boot) From patchwork Sun Nov 20 14:15:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15773 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 88FB0C433FE for ; Sun, 20 Nov 2022 14:16:10 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.13281.1668953769306172176 for ; Sun, 20 Nov 2022 06:16:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=NFcd05Y+; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id b1-20020a17090a7ac100b00213fde52d49so9101155pjl.3 for ; Sun, 20 Nov 2022 06:16:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=CiUMQXQNinjLraCjSC7OoAiRlhZoG/CnqoN4kT93MLA=; b=NFcd05Y+PE4vF+Pv2e8JgPxLgu5ym+y0CudCuoMd1aO/myeQF/OvSK8wZ5O1V/RmCi dZiL/P0Hwn4Unx5fFJCQxPQJvN6rO/eW3AliE3qEWJ26zJoQi8YIJy+1YtWqhV94G8b7 4Qg4CQvhm2XCTKZ3l7nYqo092uQ3pUhj5lvOhdC3dnw3J8lDX7G/zV90Pr7aPCltYmvm 8PkNFOLIMbUOcx5o6BOvFCg3DZtA7Xs/l2XR3xgQD7j/L01bWvRKkeiIUOUhuSZuhHgN Nzm6r17drP3izqbbpsqhMArJnAmRPBdkWrO1fW1aYaJanocvI1lKi6ZtjayeHpyX7Enh i6FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=CiUMQXQNinjLraCjSC7OoAiRlhZoG/CnqoN4kT93MLA=; b=h+CamjkcJ2rTxiIFVwS9LuUMFgqwaOVq8RjKlEJgIhUqIiZsTuyqMbMh6EUlIpV/iU 1QgBGAAgpd6A9LFcRXVL+7xuzK9QjKXFUbueIqqasYU115p/6yJusR1Z4Jrxkb6UAuyH MyzLpjoCdHnCnq4gmr/0YAm2hm57HkLBGgT4/unnh3y5xEmRrcnvH/8FNWn03y8pyq/v EJijXjfhwJPZjbKJDj/HX6YDZ5U+B1bbRxfXMb9wrLHTguhNg3McbkWkLK67LQEq8K8Z iplbyXIzBcWIPkDo3ULma6SINTz/w3c3b3ShIMSkiwCl9KYU2pkoGBBJrglYdtL8zzli qqZA== X-Gm-Message-State: ANoB5pmuCBxW5ZrGcsk96113TzXZK/SV2MY6J1Ki1owpotKn/cuvxCYx IwRV+vpxuse4Oza9bnD6MP7ueaFIKrAhDJiQLbU= X-Google-Smtp-Source: AA0mqf5AfBQTUF5Bl80VE0fKaqtQTXlbRmYP+PW2vOb75zvc2MEKSr5KppDs4UM9tY6NVNXuPgxnAA== X-Received: by 2002:a17:903:31d5:b0:188:5581:c8de with SMTP id v21-20020a17090331d500b001885581c8demr3072854ple.140.1668953768251; Sun, 20 Nov 2022 06:16:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:07 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/35] package: Fix handling of minidebuginfo with newer binutils Date: Sun, 20 Nov 2022 04:15:06 -1000 Message-Id: <9485559d269ed11bfcc90399c9282549ced35ce0.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173617 From: Nathan Rossi Newer versions of binutils (2.38+) have changed how the "--only-keep-debug" of objcopy behaves when stripping non-debug sections from an ELF. https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=68f543154e92ab0f5d6c569e0fa143f5e8bd2d80 This change causes associated sections to be correctly marked as NOBITS with the section contents removed from the output. The side effect is that this causes issues with objcopy's ability to perform symbol and relocation stripping (-S/--strip-all) on the debug split ELF, such that with some object files (e.g. kernel modules) objcopy fails to strip symbols/relocations with an error like the following: .../.debug/nls_cp950.ko[.rodata]: file truncated Because of this it is now problematic to generate minidebuginfo for these types of ELF objects. However it is not typically useful to inject minidebuginfo into these types of ELFs, and other distributions (e.g. Fedora, referring to find-debuginfo.sh of debugedit) only insert minidebuginfo into executables and shared libraries. This change causes the minidebuginfo injection to only apply to EXEC/DYN type ELFs, which limits the injection to executables and shared libraires. Additionally this change fixes the parsing of the sections from the "readelf -W -S" output which was not accounting for the section index column having leading spaces for single digit index values e.g. "[ 1]". Signed-off-by: Nathan Rossi Signed-off-by: Alexandre Belloni (cherry picked from commit 2084cfcb3d15db3e02637f1cd63ab9c997f38a65) Signed-off-by: Steve Sakoman --- meta/classes/package.bbclass | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 97e97d2703..8b11fdd155 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -484,16 +484,31 @@ def inject_minidebuginfo(file, dvar, dv, d): bb.debug(1, 'ELF file {} has no debuginfo, skipping minidebuginfo injection'.format(file)) return + # minidebuginfo does not make sense to apply to ELF objects other than + # executables and shared libraries, skip applying the minidebuginfo + # generation for objects like kernel modules. + for line in subprocess.check_output([readelf, '-h', debugfile], universal_newlines=True).splitlines(): + if not line.strip().startswith("Type:"): + continue + elftype = line.split(":")[1].strip() + if not any(elftype.startswith(i) for i in ["EXEC", "DYN"]): + bb.debug(1, 'ELF file {} is not executable/shared, skipping minidebuginfo injection'.format(file)) + return + break + # Find non-allocated PROGBITS, NOTE, and NOBITS sections in the debuginfo. # We will exclude all of these from minidebuginfo to save space. remove_section_names = [] for line in subprocess.check_output([readelf, '-W', '-S', debugfile], universal_newlines=True).splitlines(): - fields = line.split() - if len(fields) < 8: + # strip the leading " [ 1]" section index to allow splitting on space + if ']' not in line: + continue + fields = line[line.index(']') + 1:].split() + if len(fields) < 7: continue name = fields[0] type = fields[1] - flags = fields[7] + flags = fields[6] # .debug_ sections will be removed by objcopy -S so no need to explicitly remove them if name.startswith('.debug_'): continue From patchwork Sun Nov 20 14:15:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15778 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 8051EC4332F for ; Sun, 20 Nov 2022 14:16:20 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.13208.1668953750517925500 for ; Sun, 20 Nov 2022 06:16:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=FDWHasd1; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id y10so7238470plp.3 for ; Sun, 20 Nov 2022 06:16:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=aOzMv6i0Sm1ZCtVj/6OwlXANLWfFabiZtiv0PE+AvGQ=; b=FDWHasd1OjW2AB3wLrAbPTw1UxbcbLzPyBkIfHnFH94TIpfT+SaOICVkTTvHresM1l k3wD7z6FG2wXaOTOugkNV/LJd8xyzI8D74OfZF5vpFKbcc6hxsn46d3IjUQKYI1nqPNC mcsZIuhT9eenK9zuV8BqWUYHESZ9rOjnEer0WBmraK2j1X+sZNpYae9IWW6c8c+YNLtR KfmeuHA9URmcSTaG+kyfNjfhzc3jrndx5hqyZau29THQwJVJnUhX3R27LumMOgyoqiUJ WaGRn8EDxA01m7KBZUOspZh2zMovOwFFZcWVWjHrwxyguE2QnKl0YugI0hUYr72hBGXW wHXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=aOzMv6i0Sm1ZCtVj/6OwlXANLWfFabiZtiv0PE+AvGQ=; b=Z+TlWWwndO86YVH+lzPMU/TrUbuVdE7PXlYr8Yv04J3kVnF2cIVAjLNPsd8aZRQ00V BdmAjp+fzgFO6QmJLVQsCTGfjLgVKMGaPVwYyZ5F/qaOObftEV9YAscK6nq1F2qj45XT yoXJjjbeh0hbtzr95xNW6QtheNzJzyKOKjlAx9Ju2NSyddN5GUP24VqZw6oaDehjARX0 Psinj+AbzQ1MBKIRRCD3xePm4iig6pF/M7of5CxrgqrStySxfc4mvccdZ9X6E5s4G5Bk KL3+NItJgOhv7Ur2GXD6vh2WHsOD2KXFsaGKh8oZp9RGDhqYNRWdK13NOY5S9nBfEtcm tf0w== X-Gm-Message-State: ANoB5pmlyQYsutQRIgh45/MwmiKQnqq8V3TFLZ8fbxlCG8Htj2kqtEwL zJElKc1/7cY0kc1NuOLqsKVqGGVqHAvTwZSgxmI= X-Google-Smtp-Source: AA0mqf7z0t7OF6pV2N5sFbWVCD2LMnoe9B8wJ+ahpCf937yRgLzVOq/H5nwYL6fU4CYYfo2wjkCjdA== X-Received: by 2002:a17:903:300a:b0:188:f6c8:2ca9 with SMTP id o10-20020a170903300a00b00188f6c82ca9mr7752109pla.6.1668953770138; Sun, 20 Nov 2022 06:16:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/35] archiver: avoid using machine variable as it breaks multiconfig Date: Sun, 20 Nov 2022 04:15:07 -1000 Message-Id: <8e65e5d9204cbc04587b7e90ff4ed8cd7bffdb65.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173618 From: Jose Quaresma STAGING_KERNEL_DIR uses the MACHINE name so it breaks the multiconfig and in this cases it will run the shared recipes twice, one for each machine. STAGING_KERNEL_DIR it's been introduced in commit 5487dee2e1 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 6050d1f74c02495490d982ead2993b6b3c9cc04a) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index dca4271a69..4a5865d7b5 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -461,7 +461,7 @@ def is_work_shared(d): pn = d.getVar('PN') return pn.startswith('gcc-source') or \ bb.data.inherits_class('kernel', d) or \ - (bb.data.inherits_class('kernelsrc', d) and d.getVar('S') == d.getVar('STAGING_KERNEL_DIR')) + (bb.data.inherits_class('kernelsrc', d) and d.expand("${TMPDIR}/work-shared") in d.getVar('S')) # Run do_unpack and do_patch python do_unpack_and_patch() { From patchwork Sun Nov 20 14:15:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15780 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 8F981C4167B for ; Sun, 20 Nov 2022 14:16:20 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.13208.1668953750517925500 for ; Sun, 20 Nov 2022 06:16:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5bdDu7pT; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id y10so7238498plp.3 for ; Sun, 20 Nov 2022 06:16:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=6gAZkl1p8ERZ5cXIpFu9nQcWwbsJfjAwo23Qi4jzLrk=; b=5bdDu7pTas0P5GHFL8SmmTbcwwHKMVReqFqhqBC04ByJdS8ec/hUolRk11bCpv8dfG 39zV/YeCfdJciP2VGOr8SjGwcNN4oyu+hrzCDS2+8GQkKbMhfL13rWTR4KJhZiBepZmT iQxGrOQTXoaFH8zDMoUtTPql+ToUYqlHXcmU2OLHt7OzNNt1JooCzyjvrf6UALxrfpS5 VU++sRCVRuG/g9djYE3ltAVIYiqTtOLufCmTBCknaRw2eYUBu0c32izw8qZKAt3su1tR JlfGf2o7YlXqYDXTIM/RlaJcbg86zinluSjYjl3woSzMGFYVOJ+/ZVEisolqsqYbA9xQ vLrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=6gAZkl1p8ERZ5cXIpFu9nQcWwbsJfjAwo23Qi4jzLrk=; b=WdtR6TEhwvPr1WXmjzc8wRs/Wt6YJlNPFjpq1uW6RyyYptR35XIZUzmswgs1P97VjF ib3DUqVLz6Y3HVAn08+FjFozqMkA58gXnyygW946nfckO1/UhppbQAmSZq0xdCvlPGYY tpm3z+Zj7Q7l+9HWGwCxGrVt+J4osYN+79bSnxtbjrcMHMWENUfmxSAG1F0SLHrYOu4B sdpHUBmQXU4/9SnNvmimHPjHKvytcuCgZGFGr/xyMAu1U9csyQz6zslCsaswZpyXS6lT WjMQ3wNyg6P2pNzDjM318GQjxzEKj56KG+Sl0T6x+R/DResM33rRujocVvK++tRNtJ9u utPA== X-Gm-Message-State: ANoB5pnbCJxenkA82TxtC/L2I5F13ExfTIr11bpN2X/cp4bB/Mwt4bX1 npagSFcftJpa11kEYQBUElru7PbfqumYiYEeXgY= X-Google-Smtp-Source: AA0mqf7BPqor6zhKppGvcEZ/7ibvJxyQ0vILuO/bgmQXDV1EVOv/+Y6ZcZ7tT3Je1xr4IEpPeg5DKA== X-Received: by 2002:a17:903:26ce:b0:186:8a1e:5055 with SMTP id jg14-20020a17090326ce00b001868a1e5055mr376179plb.116.1668953772028; Sun, 20 Nov 2022 06:16:12 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/35] cargo_common.bbclass: Fix typos Date: Sun, 20 Nov 2022 04:15:08 -1000 Message-Id: <8c58aacba69f815261b3e4aa32ba7eebeb3f62ae.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173619 From: Alex Kiernan Signed-off-by: Alex Kiernan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c7a92180b21e75a84f632e4c16e63dc1f4861a00) Signed-off-by: Steve Sakoman --- meta/classes/cargo_common.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cargo_common.bbclass b/meta/classes/cargo_common.bbclass index 39f32829fd..1e9d284b5d 100644 --- a/meta/classes/cargo_common.bbclass +++ b/meta/classes/cargo_common.bbclass @@ -50,7 +50,7 @@ cargo_common_do_configure () { [source.crates-io] replace-with = "bitbake" - local-registry = "/nonexistant" + local-registry = "/nonexistent" EOF fi @@ -88,7 +88,7 @@ cargo_common_do_configure () { cat <<- EOF >> ${CARGO_HOME}/config [build] - # Use out of tree build destination to avoid poluting the source tree + # Use out of tree build destination to avoid polluting the source tree target-dir = "${B}/target" EOF fi From patchwork Sun Nov 20 14:15:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15781 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 8BCA9C4321E for ; Sun, 20 Nov 2022 14:16:20 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.13205.1668953746438080236 for ; Sun, 20 Nov 2022 06:16:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rgSnLRyW; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id t17so7677238pjo.3 for ; Sun, 20 Nov 2022 06:16:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=3Rry59wqCucS1kUYTuByD4tU0tEsk4PxrnBwY6n5k3o=; b=rgSnLRyW6NPEOoOv/hZPuBPFcA4IzFmk9dK6SVzqJNvUJJlgRxqjdtOyPYcU+DaQzp RxAJQiChQsLu9d9Rx3j0W27vtGQHRahvMuJrEzbK6ZlaAQA+nI5ZkQG58B8DNa0+k5pP 1HVjFoY8Rp2A4wPTjoKmuCvETh3f9NZw0sKKE6KPUgmcy8bpffb9xEgjsPW9RzDqqeXS L/spXYWYgA5nf6yaFE2o+VgQ6ttpHJgEgpoebtWoUYildLswly7yDsEb/YI8+F3A1OEo Z9kSWkWCkAW4acUQHj/pvC6091jEgiBpEBsEuZxQN0+Mn2CAL+afRo6c9Ygy8y00dIGK 6ltw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=3Rry59wqCucS1kUYTuByD4tU0tEsk4PxrnBwY6n5k3o=; b=nPhsmaM5Mhv7bK+mfWGjLThyGrBXanBxiyA/7KYNGC94nXorOK96zaisZov5kv4dmf dhluKzd3HhWjusyBxs0ofxKH5tsXQ6l1RQuwRbSrKPr9wu8IRvCAGZZmekFsWEBSBXMG i3JihuUiz9CmYZSMW9Bb3YaD7Ur+HvqBGII2Nl2gv2MpyH6099/9+pSWGULKAeb08smB iLz7ztxm+E1Bhzz+lQW+nlyfU8liFzetZ8VHcEBEW9Jop3wtV8JIp8ioIB4rZrsbWNcO 2oCcqn4fqiZFOFLOz/FMyV03zDa2Ue4jEmayi5fFhwYl02wFHpPxEi20So1bt4jPXWJI /BtQ== X-Gm-Message-State: ANoB5pnDXrEJhQtgim7Aft+/JsaE4EfAb6qSBZdiIwS8x3gxVtp1dA51 gug+4qmTtZbB8XRAXUD1PQLawVMMQ5YFerWKr94= X-Google-Smtp-Source: AA0mqf5ySSIaeCG2hvivNnDYw2R1vEhLegMY4ihNyLZI79O37t3GdTna4wamiGeBF6cFtdR1u88F/g== X-Received: by 2002:a17:90a:4c:b0:218:b187:d7da with SMTP id 12-20020a17090a004c00b00218b187d7damr1010894pjb.68.1668953773864; Sun, 20 Nov 2022 06:16:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/35] groff: submit patches upstream Date: Sun, 20 Nov 2022 04:15:09 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173620 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 4269cfcd6c29be05964010d0406584b80822d1d1) Signed-off-by: Steve Sakoman --- .../groff/files/0001-Make-manpages-mulitlib-identical.patch | 2 +- .../groff/files/0001-replace-perl-w-with-use-warnings.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch index 9105da6457..c3cfc7cea8 100644 --- a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch +++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch @@ -3,7 +3,7 @@ From: Jeremy Puhlman Date: Sat, 7 Mar 2020 00:59:13 +0000 Subject: [PATCH] Make manpages mulitlib identical -Upstream-Status: Pending +Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com] Signed-off-by: Jeremy Puhlman --- Makefile.am | 2 +- diff --git a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch index eda6a40f51..b028fa20aa 100644 --- a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch +++ b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch @@ -15,7 +15,7 @@ doesn't work: So replace "perl -w" with "use warnings" to make it work. -Upstream-Status: Pending +Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com] Signed-off-by: Robert Yang From patchwork Sun Nov 20 14:15:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15779 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 83017C43219 for ; Sun, 20 Nov 2022 14:16:20 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.13284.1668953777002864346 for ; Sun, 20 Nov 2022 06:16:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fBmB4/O4; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id 4so8466026pli.0 for ; Sun, 20 Nov 2022 06:16:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=tlTQRtJN7M6xwBlIpmF3GxFuAe/T2bKCVhKbkGGWjrY=; b=fBmB4/O4unRI3s9Nw3sTVupijh7tRojrR1l9chMYwEiKRbjCrKxqO9TTPdTqunTLeN PBzw9hxlfN45ELgExEpgb2Prk+VESTU+N33o2SyDELf3GSmJsdOmLI/2BIO9xlZ7fgI7 QWaSO4Xpz18+mIH0gzkU7EkWmenz20dXqxB5IpXjxNY0ergDHLzJpB3papOxudLPUo0Q 8kt4w2YwcUi/xsL9uMMHMI7tyAlL2XQcfoOfjgYj1kcU7FkvvhQLv4vcYcMT+xBz1gIY i22SDlG2gbJT/ien//mh9nUbH728etYHYEo3x8VtGUSdDR9bjrxugXaduDON5FSjdc85 18Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=tlTQRtJN7M6xwBlIpmF3GxFuAe/T2bKCVhKbkGGWjrY=; b=FO/aSTTQa8bThPOzr+xJYUfOnAtKMbQnpWMdiWVatcVVFdUD8quQs8oA556aBRWtDP dh3RHR43bXk/w13JnSa2uNdTrOSoxYeMfLhV2MyowUB85WNVphhWBqpVeeo2EEHMG9C9 3cHdHV9Y6nwNFx+XeP4tsN6/5EupMIoKSCtIKQVpRqwOAro0ywqq+nOEeO8rgdw66vNU vYIr1PR+5ZuUi/6hAaNaLPQGzPX7Vm9LubEBMjaL3zlEpCcUyxyKIAheG2X81mrZDcQ5 R/ktZKaLOMt4FBYzsiLdma45ToYDr2+zNTJe8yMMCVbXc+SER/ifr0IAXIL7qzrojHsu sI8w== X-Gm-Message-State: ANoB5pknqjGOOLxyv2BQ3rq5VOxiIDxE4xQJpuhI1uPJwePBBG+xhw04 tBPHsFPMMsOyhaH0KrYdwlOYlfW09SV/Azx9OaY= X-Google-Smtp-Source: AA0mqf5YIyRH7q1d8zyQBiDRInG8SoVxz9yIA4DeP5/J3/TUPL3OG9da74NdBypJyGHgXlqd9TXAXQ== X-Received: by 2002:a17:903:3292:b0:188:ec14:e3a3 with SMTP id jh18-20020a170903329200b00188ec14e3a3mr4944177plb.154.1668953776032; Sun, 20 Nov 2022 06:16:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:15 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/35] tcl: correct patch status Date: Sun, 20 Nov 2022 04:15:10 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173621 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9f37e5b83db662bba92605c8741516108aad3c5e) Signed-off-by: Steve Sakoman --- .../recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index 44b2ce0a30..5a10c93a31 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inappropriate [upstream does not support installed tests] Index: unix/Makefile.in =================================================================== From patchwork Sun Nov 20 14:15:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15777 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 82FC9C43217 for ; Sun, 20 Nov 2022 14:16:20 +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.13225.1668953779098764303 for ; Sun, 20 Nov 2022 06:16:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0jqbXoRN; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id g62so9107154pfb.10 for ; Sun, 20 Nov 2022 06:16:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=wX2/TYn0xPtaXKjQhGB74R9yhOS852hfNPhU2peJ/Rs=; b=0jqbXoRNrXu7sNsOoWFwMUkc5hS4VoM8i+aTrR3wYo4YSWXPO/EfCTTrRT+eLoL5Me RsEb85yjxHZMhA9oB33sePlCJWtUyb7M84Uak89BoGk1eRlUvgAx71Yp+G+SwOa7/7sd jv2geQNDYtdjCVQO+0PRVDQPJCZqwzOWKme1NMgXj9rEHT50wGYmnT+aTaW2V10ny2ff hnidbypA9lqvXXbYI2bOZ0azZ3qy0KIydfmKCWUNQRmTvYyb0pR3bw5eqWtANXKujGqb DRGrJFpRnxwkLewhHik7QnpzObnlCw3EO3VmVNcSmBKnGuBlP0P35pi9HW6/VgRGHqnw qTiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=wX2/TYn0xPtaXKjQhGB74R9yhOS852hfNPhU2peJ/Rs=; b=dFdX8aIKYgrzCLq4tRdKbWdGo+syozmOKWKgPPdZ1oWh7p8nyVxEUnBpbJ+Ch92pj9 xUa7kBukMsjE3MZGq87Um1Yb4mACx0/uxFZ2H9hD2rt1MPPmlMTlDfxP690RPq0EeVwk FXQRW4WlsRcenq3XjCGWik+1vk/d/OGIHmju/8PALLz6tJ8WYaVybCzwLQeWuq6hu6IK I+is0VCUH8NxAGkZyQUGz0tN8Fu1FFQD/BY4fGp4PpuWIIROGt7rTFEHt9nB5drHn1KE db0tJuIdZMMWOFvTExfSjdXF962eqo+cxy6s8tb5NDQePn4kEvEwTDU6CTzLJgYdbU5a NtkA== X-Gm-Message-State: ANoB5pkNTexMZva0CZdQr6/aJVmgI1wOEZtDROOALCFXkKjqJIE73QvF La59EPqTDFizMm3ka5I+S91aPIY0YyuNeMOoYOI= X-Google-Smtp-Source: AA0mqf61tG3Wajz4GIhh6ie23WB+uv4eB3aHWM0+9jcDhRw6BwXTl7hScgWbdPmizcj+VTvy4Cy9Mw== X-Received: by 2002:a05:6a00:4c11:b0:56d:93d8:d81a with SMTP id ea17-20020a056a004c1100b0056d93d8d81amr16315483pfb.14.1668953778070; Sun, 20 Nov 2022 06:16:18 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:17 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/35] kea: submit patch upstream Date: Sun, 20 Nov 2022 04:15:11 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173622 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e8f0e3a01262ecb83185ec5e84e6f359d7d64d1d) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 78f475a495..451b409c88 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch @@ -12,7 +12,7 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea: Because they are all commented out, replace the expanded libdir path with '$libdir' in the config files to avoid conflict. -Upstream-Status: Pending +Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] Signed-off-by: Kai Kang --- From patchwork Sun Nov 20 14:15:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15786 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 83E9EC4332F for ; Sun, 20 Nov 2022 14:16:30 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.13227.1668953781022494184 for ; Sun, 20 Nov 2022 06:16:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=C6kmAb0E; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id y14-20020a17090a2b4e00b002189a1b84d4so2673636pjc.2 for ; Sun, 20 Nov 2022 06:16:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=xTb1Epe2VB2+P5HwpRPliqKQwxRLHUzgAPrCcQm1ZuQ=; b=C6kmAb0EMbuhB2yH0QidalF4pPmR5Dlhex8jJOdmsHLhXx4FQpP375CMskonr5kjQh WznhuZ0ucX70P2hr+jooe2SW7Ug9JT2KhuTuIYlOR3bTWsYysbDhfUUz5O1ru3394Ww9 Wx7OXUWOa7Z3xBkH+l0NoHfEdBRzH5lDMFhGLMqbLqUPznYA/SpB8Qc1zptxY0CwYZyK fDCJsMQw6GTucT66yfiUq5fEKcP6B357hXENKLIgtNVuyUg5J3nvh/tty1P9kb0QMfTX 3Og8jGXDO305ge39QnZ6nAFkAeXvNeAWC1VCxM67pxTxd3thTkHzzCI53DGDfK7m+zHq Lqmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=xTb1Epe2VB2+P5HwpRPliqKQwxRLHUzgAPrCcQm1ZuQ=; b=eJDdntNQupJzeEMUn8WBuwf4qj1+u5qu2YbegzVIdMl/jSonpaKyIhuxtWm55HwhV2 u5iy9KuFGOjre9Lr6E9JC5XDLKYcNwd1JewE44eK4oHTQJlARPnQsHfRB67kx/UtEmM/ yC2jGCRyODhaBZtwaMSl8LrSPxBlJyFGjDZzdBomt1u7ymmniemnys7aFgAd3csZdHFu ZP4myN5anJ+Pb4YMJuT6ZHXIuNRrn6tecKNoAd8Y35mfzj2T7MmTVtdnWjPQaitWNdnA f9RnJFFIGiRpUJsya6fHkbK1VseDpgHSQqFpjibgY3piYDsd63B+KQ7ymuWUoa5ctcW/ JMqA== X-Gm-Message-State: ANoB5pkMryh5Re5EM8rMzKXMKGZZtAf74cs5RIKaI6Dglncnhy9gQyWQ JBoy2+LkWw2BxkURwj4BLOLc8jtu44mSsPAfqIM= X-Google-Smtp-Source: AA0mqf5bdIXVotIDtlbhubXjB0nr5Cj7YmVbLD0tccQQMJmTnVJUlZHn8oqP6GhK1lcZrjxhvgeG4A== X-Received: by 2002:a17:90b:3c0a:b0:213:5de3:13e with SMTP id pb10-20020a17090b3c0a00b002135de3013emr22522875pjb.6.1668953780067; Sun, 20 Nov 2022 06:16:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:19 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/35] ovmf: correct patches status Date: Sun, 20 Nov 2022 04:15:12 -1000 Message-Id: <80280e06923b4adcf56d0726311da8d68f51ac57.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173623 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0f758719ad26fd7b23bbf21a37375f8de7068f0e) Signed-off-by: Steve Sakoman --- .../ovmf/0001-ovmf-update-path-to-native-BaseTools.patch | 2 +- ...seTools-makefile-adjust-to-build-in-under-bitbake.patch | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch index 89d9ffab5e..0c3df4fc44 100644 --- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch @@ -10,7 +10,7 @@ tools. The BBAKE_EDK_TOOLS_PATH string is used as a pattern to be replaced with the appropriate location before building. Signed-off-by: Ricardo Neri -Upstream-Status: Pending +Upstream-Status: Inappropriate [oe-core cross compile specific] --- OvmfPkg/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index f6141c8af5..2293d7e938 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch @@ -6,8 +6,13 @@ Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories. +Note from Alex: this is not appropriate for upstream submission as +the recipe already does lots of similar in-place fixups elsewhere, so +this patch shold be converted to follow that pattern. We're not going +to fight against how upstream wants to configure the build. + Signed-off-by: Ricardo Neri -Upstream-Status: Pending +Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] --- BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) From patchwork Sun Nov 20 14:15:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15784 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 8FBC4C43219 for ; Sun, 20 Nov 2022 14:16:30 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.13287.1668953782988949760 for ; Sun, 20 Nov 2022 06:16:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=foHWsT4+; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id a22-20020a17090a6d9600b0021896eb5554so3270082pjk.1 for ; Sun, 20 Nov 2022 06:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=7Im6TR76ttRMQ+ry3zrTBTsDYns6HGOXIVUVPbU7ucA=; b=foHWsT4+AAl7HL9YGlVng9xHT3O2BCVHu6yY81Lt1rZTAavt8e5oQGdfbe3J4ESNLj Nu1c6jfYydmN4Ffou3O1883mbA3FTNuzgkGTrZwmaD2gbk4oj0bgYbacl14nNNnSzxnJ fvXjqUhW37j4EvuomgYlBmWL7AKANylocws+lusjopToObtlC3sJtpIvjtr6992bbG2v Aez4b5jBF0gIve/j1Y7Sw2I6nbq/e9vfHEsAFp5KQUfcN48tl8rQBxxJ8a9q7QG8JFQx RuBPHR0jS5LUYSxHwMoEdrnWIVAL8NkPLfSjUj8DK/Xql91Qdgij99NQWmg88chcNQwt 1Vyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7Im6TR76ttRMQ+ry3zrTBTsDYns6HGOXIVUVPbU7ucA=; b=TvF7R5qnYwy31OZLlmvPUarsiQAGYU2ZT0fio2hgdUP4whSpiMVM6llXhTiYFe5jLR HKrSWnUtoFvJj9805JxlkZHiDGX5CdAxYD/8CIJXCyuiAKrIqCQ+gzjKKKrcbHbAIWRH q2ERfPATVRH0vRYWj7bFiaHgujpgCSjifUGcD0oDEE8IhjVjRariHxb/20dXIj30PLyF iceg8cPn5IYCC5cbDfnsG0TBWAkMgFhLpqudsJFhWDp3oMcgQ4C68E1dFBCknDoQxokU whZiE4e2wUsMUP70J18/pJPVLnyNpowC/mTD+WvGOBxdn2QzIEHcYujY4NkzzQsG3B4F wmWw== X-Gm-Message-State: ANoB5pk7mPZRw7fl7/IMseb7kN+iFjghEWQWDc7JgV9s6i7cZJW84yim yX7obGbDUSyoZlQdL4BWBgbhhSG8R2jB8fqMKPs= X-Google-Smtp-Source: AA0mqf69/nejorpuNO8zU8wB2voTptsCsxuruD/FZjp2MId/tUUvWefCZZP0KrGA38VtxMVEt9o91g== X-Received: by 2002:a17:902:ce0e:b0:172:86a2:8e68 with SMTP id k14-20020a170902ce0e00b0017286a28e68mr668081plg.27.1668953782043; Sun, 20 Nov 2022 06:16:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:21 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/35] libffi: submit patch upstream Date: Sun, 20 Nov 2022 04:15:13 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173624 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9555a7dc768c32a009333232e25cef041054b7f7) Signed-off-by: Steve Sakoman --- .../libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch index 5e529d1ce7..4233799501 100644 --- a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch +++ b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch @@ -11,7 +11,7 @@ https://github.com/libffi/libffi/issues/607. Now that clang supports the LDC and SDC instructions, this mitigation has been reverted. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/747] Signed-off-by: Brett Warren --- src/arm/sysv.S | 33 --------------------------------- From patchwork Sun Nov 20 14:15:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15785 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 8B24EC4321E for ; Sun, 20 Nov 2022 14:16:30 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.13270.1668953756379792125 for ; Sun, 20 Nov 2022 06:16:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=S8andq3y; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so12216901pjs.4 for ; Sun, 20 Nov 2022 06:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=ZwUA8tF6734Yf51bdUKhadUmKeVNwZpdHKxlCWMmu9Q=; b=S8andq3yuPcowqV86LBA8PSFIdxv1r8Vsw9hk+5oYhcCmvZUnwlQyPFNjrrSIFhigP vfk5Ku0iq+nkR0KDu/WT9XH4njfswIdHS/hgddS2TenotxGUjva/sW7Ai35yzdGGvYUC zHJ7kxm3Nq1bLKH4QkyYeTv2mUJx7wlsIdcPd+OyL7rNS4jl7wMihwvLBPc2KjydtohZ am4h4t4kOjfa/7XFsdsf8DJJuhxqY0NMI2eh5pWVXziGohvvJCac1NXV3YjqgPSAg7+Y CYhktPj/rTacIgZdFRhqpz2XSxRUL9IMA6VppQWzkiccvP60/HbjRStaLuypgpycEC5b Tk5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ZwUA8tF6734Yf51bdUKhadUmKeVNwZpdHKxlCWMmu9Q=; b=Gkas4ucJYi/LRGT33WePSkR7RtazLUC22vuu2+G9C2Bbpdnn//DrdrZ7fVamwWDqdO I16jCiFlTS9q1jUhPe/COQFUAuKklw0pcjzF5P1v6A0sDqX4ttK4Xn+RTh/15a8xO7j1 DwcryCJwYaWGfpwPlfRkxRasoFLt5OtNzQFkEhLDdHGn6qR0j18I3kx7ENozYewHlYOs OhEtmG2R/yjEj6wluUGj1i6pbWSScjr580OBqK5KRcQ4nDGQsr+Hy1Ji15Nddflc4OJI PJU2iriBc6tt+4LXnchH4Xng7NYEtkwtNIvJo8taEEDvuGGbMe/AnyZvNFjak1+c09OX s7ew== X-Gm-Message-State: ANoB5pmhDCGPptE4Ke8KK2Z6bJoiNGTMMqUs6GuAw+X+uahXovF4z3vP DwrzbbcBG/2pbd9/eMxTu+VDhOLwOOMLQkVs6es= X-Google-Smtp-Source: AA0mqf6Gzm2o/gHCaoM5i3iWUHDVO4k2PcDCStwIGNs5vj9GuN5vvGcNBX8bPwkFba422haGJUE8jw== X-Received: by 2002:a17:902:e849:b0:188:ff96:a7df with SMTP id t9-20020a170902e84900b00188ff96a7dfmr7969186plg.38.1668953783858; Sun, 20 Nov 2022 06:16:23 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/35] bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware Date: Sun, 20 Nov 2022 04:15:14 -1000 Message-Id: <67f6fe7d2cfb95c9a39a0d288daabf69babf6f17.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173625 From: Marek Vasut Currently the hciattach bcm43xx firmware loader looks up the firmware blob in /etc/firmware . Change this to /lib/firmware instead, so that the path is consistent with Linux kernel which also looks up firmware for the WiFi part in /lib/firmware . Signed-off-by: Marek Vasut Signed-off-by: Alexandre Belloni (cherry picked from commit 72b3b79ad8b980e8dd9470d16b72c2c70072bbc0) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index f07e318897..a8eaba1dd6 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -68,6 +68,8 @@ EXTRA_OECONF = "\ --without-zsh-completion-dir \ " +CFLAGS += "-DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\"" + # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" From patchwork Sun Nov 20 14:15:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15783 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 7E7C0C433FE for ; Sun, 20 Nov 2022 14:16:30 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.13208.1668953750517925500 for ; Sun, 20 Nov 2022 06:16:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fQNoOynL; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id y10so7238748plp.3 for ; Sun, 20 Nov 2022 06:16:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=IJzT/GzkK+Ke40r3eUMpEkr+SkOnILhR+E9lrR5C/Is=; b=fQNoOynLLcA0csLE3+/XxTMk5xaMRe9WQtJOXz4Em0HRyzL2XixvPnGbIr6chx74Tp WZHW9v3RWNYgYOC7L4uMcrrL9oYO7JpaF8p8fkuQaAXJFGicAnt3jU0vCeGz/3lcdg9k L9mxfoDXDdKFamFofEsl5RTG3eQQ+msa64ZgupiL1VXgOoLO3RT4OH6dws6459HFWJlh XUnqeiy0gFr5X1piLQvaPPYmZcZh9sK7mf2fasTDSOjuaSmbtz+AbYCEmpelee53A9ck lz8v/HI2zulehQohtgeyeISx63mqKoAlmTmDxAND7iJuBa0fZvBb35ungBYng6bhKOo7 rKQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=IJzT/GzkK+Ke40r3eUMpEkr+SkOnILhR+E9lrR5C/Is=; b=vVTVe5Fcu+u+u5OfZ7a9goy85ijLsehmhW/Jl3gqlwfj+65ZFUTAm0lAEiFy/7Ryp2 wi4gQpdXhXo3DbsO7yvqkMK8l8V0I/E1irlEWcWJs6D1J8OTw4gMQ43fdgL7kPE6s35j Fg7SiOtkbKsRJ7BXSh7ov65a4BzAdmverpL8/Pza+neM9n+xJJ8O0TFu9loyOWJiKlCF 8zJhq5BabBAlTqYIRs9HlSvNA8bSd+RyqZuyoNqHc+pQFRmUx86+L+heKzS49v/MtDCH BIC4y8aj2SuHfIcapMFEXwLU7BEWviIFUTbHYXxdrqArB3sHg/U3LDeZ+pQ3Eu9J1kZt rNKg== X-Gm-Message-State: ANoB5plLI4zZZZg2G3ksH2vEzTw+Q+3Nt2k9fUFkQB2IpYsk3JMAtkqt 1XgwIczMY4/uFTbM0RiUAhM2MKJ53QGe3lWBvBY= X-Google-Smtp-Source: AA0mqf6gErvXYpLMM0Qh8FYfrbh9S7RLWJXrud72Jz/qaQKNz561b5BBEbUFROf62W3pTHOFuXj67Q== X-Received: by 2002:a17:902:ee89:b0:187:1a3f:d54b with SMTP id a9-20020a170902ee8900b001871a3fd54bmr8043738pld.9.1668953785707; Sun, 20 Nov 2022 06:16:25 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/35] get_module_deps3.py: Check attribute '__file__' Date: Sun, 20 Nov 2022 04:15:15 -1000 Message-Id: <1684457df9fb7029a276df4438c8fc4a17e3e1e9.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173626 From: Leon Anavi Check if the module object has attribute '__file__' to fix and avoid errors like: AttributeError: module '_abc' has no attribute '__file__'. Did you mean: '__name__'? Signed-off-by: Leon Anavi Signed-off-by: Alexandre Belloni (cherry picked from commit 8acce12c1a4cf37ac312c92d62a6ae93a349dddf) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3/get_module_deps3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3/get_module_deps3.py b/meta/recipes-devtools/python/python3/get_module_deps3.py index 1f4c982aed..0ca687d2eb 100644 --- a/meta/recipes-devtools/python/python3/get_module_deps3.py +++ b/meta/recipes-devtools/python/python3/get_module_deps3.py @@ -56,7 +56,7 @@ if debug == True: try: m = importlib.import_module(current_module) # handle python packages which may not include all modules in the __init__ - if os.path.basename(m.__file__) == "__init__.py": + if hasattr(m, '__file__') and os.path.basename(m.__file__) == "__init__.py": modulepath = os.path.dirname(m.__file__) for i in os.listdir(modulepath): if i.startswith("_") or not(i.endswith(".py")): From patchwork Sun Nov 20 14:15:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15782 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 88138C43217 for ; Sun, 20 Nov 2022 14:16:30 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.13291.1668953788637235746 for ; Sun, 20 Nov 2022 06:16:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=c0SCBnnP; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id b21so8417607plc.9 for ; Sun, 20 Nov 2022 06:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=DNBuqjHHKei3onCnGBKM+dL9fkj43mjVAg3+ZacoNpw=; b=c0SCBnnPQ283hejCJVM8qdM+NFXaYDMwT5yQPHDVhmmWAqbtPH5VbxOB82KCWtVOJ2 6fOZsoAK3XYuhU+l9uO5UvEilqrmb1o/XpcAfeWt+SBX7S+wc5mRkQBNu9kNEVBHr1Xc WU9O5O0yKpX1tIoAnNmS3YyOn0yNDGAM1v7O/EgRNY8OoBMBsy8hDdaVEWc7WwJkqYU2 mm/XL6NUSxyYpmqK1oN5YG1OShFYPN2CfOwN0BF7+iwH8JtSeX28lxVcxuHCfsP5AryB 0SS6rXD1CKfkGDk/Aw30qaatK207cUFJc0xDF2DRorDovC2Qaj80YMy0tbc0PJ/xyoDs gFDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DNBuqjHHKei3onCnGBKM+dL9fkj43mjVAg3+ZacoNpw=; b=TPeaHYiXmbbEKVCiQbC6RfKCiBlQ16Oq7t4v6yVXP6l1NEjS0QN113uCFjGAnxK61L nXezqk0dBCHeVR7ZqvETp8zsx4WP/n8SrPKExI1cmgQyZX6tr+49YNxpPLZvrRF3t2Lx Fsrcm5NipmuLK+nnmIPCgtZdZx3g8IG5+mTB3jgLyq0oi/Rl60e4ouZGeYQ23roFn8qz 6ujUvx8EgUbIn1rNMSIhCaFsGPc8SIupr1FARQestWgdLkEg6dyoPk/JpLo7fcR5V4iR 52V6+NVr6b0yEbxmFYzLgCjdyq1FmsLPik2SE1ppk8ATqDTi03PqdsRHGxpuKPUady1O Ot+Q== X-Gm-Message-State: ANoB5pm+UYO+YyE10rVVv4uqcNMFJxsatUPInP43Eq1N3AIJ9eTAgN64 NNmsnIlw6ylaYyRujEeoLNJLemZGRQTCIlPCM8w= X-Google-Smtp-Source: AA0mqf5N80KppTTibZmK2Dc9S1dZMdiLeJPaNUh/CMR/UKDzSkSk9QV3B1SSrlVY/r7tNLbt0IJcIQ== X-Received: by 2002:a17:902:d58d:b0:187:2502:888f with SMTP id k13-20020a170902d58d00b001872502888fmr7920285plh.136.1668953787675; Sun, 20 Nov 2022 06:16:27 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/35] bitbake.conf: Drop export of SOURCE_DATE_EPOCH_FALLBACK Date: Sun, 20 Nov 2022 04:15:16 -1000 Message-Id: <7a1555a0f4223f8ca4485b410de91098301d5896.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173627 From: Richard Purdie Whilst SDE definitely needs to be exported, the fallback does not as it is only used in our python code via the datastore. It was introduced as an export in 9a1dde74e794362399193dc3f81c9685a83d0776 but even then it doesn't look like it needed to be, likely just a copy and paste mistake. Drop the export. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 74fb6539dd06acb0dd6a9af4809152975e8473e6) Signed-off-by: Steve Sakoman --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 516a30c963..82b115e3a2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -671,7 +671,7 @@ export PYTHONHASHSEED = "0" export PERL_HASH_SEED = "0" export SOURCE_DATE_EPOCH ?= "${@get_source_date_epoch_value(d)}" # A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE -export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400" +SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400" REPRODUCIBLE_TIMESTAMP_ROOTFS ??= "1520598896" ################################################################## From patchwork Sun Nov 20 14:15:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15787 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 82BDCC43217 for ; Sun, 20 Nov 2022 14:16:40 +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.web11.13229.1668953790562462287 for ; Sun, 20 Nov 2022 06:16:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=USyVSx4J; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id c203so9102430pfc.11 for ; Sun, 20 Nov 2022 06:16:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=kQYi2yccbM+r/SnZeX5MNM9dMTyKAzUECiQrvlvJeQg=; b=USyVSx4J7AsIyVS6gEzZnFCQX1REDNqInYUBtxRwJAO3cyd8+XfXHP39+kK3zb6oDP wvSLeL8GCbNPVKvOCC8ws0uZKEfD915Y2ToXhLHZzjv6lKprwcEvmK3xpABKCDmi/GJQ yMu8FKR2jVzrUTsQIWroxPRTP9Ii/bPQzHLOZyaHldx6WBXg8vkJWUaepGrHU3E4OnrV f0p80A4ToIhE/mJtrLdAcJEDT6ts2s1k+bTgp8UYN1umzlCqTpOILgP1ttbuV25EvsLu V52pJRYeMzfM7l4turNEdqr3xL1YNGG2nrG/XBOUDPpYLtFQ5BypYKfWmnKqwv4qInjM 95KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kQYi2yccbM+r/SnZeX5MNM9dMTyKAzUECiQrvlvJeQg=; b=lxB6IA7avbI/ta3e9ueMyDUPH8FYco1Dp/19ApR8i9wGgP97cbO5Yj+Cv1OU4kTCfp wiGLKgSJrskpcRBigY/O3anheolQH5XlFVpVSGsd9ZspAnfpKsY8GFsc7SunOfvNceNd 5AdZh/WZuGCRovV661CTQXbqBoHxl42asKZ3sZ22+FdZIdEiMxHCN+aP6cX8P12f0UwB hIsvyLhUSHQ+KGA1XBj7tCbJyUW3Mndpk+TV8ZntQlqumiJjQ3fYhQn99X6W6BIVl6ch mvn6lLnfDMUd/HnUbXWZ8u/j347xWmKhhRnhyo3qMjBot4UivXzSuDwgqqSbj5N+40St oydA== X-Gm-Message-State: ANoB5pkyQqCRl2i7FFHAXOP/eMdP1Xk8GjUzGDbGJ8K3C98Gpvln/U7b t3+xECvOk5vwEXroSor+e187sqwG1sj8DqWbIf0= X-Google-Smtp-Source: AA0mqf5g13uwmHl0DnRZIakC2yGnfThsC2jCfCa0UoyVORfH+l6r2XQaq1/2BCBcjIDQa0zlqFjFng== X-Received: by 2002:a05:6a00:24c1:b0:56e:a001:8cb0 with SMTP id d1-20020a056a0024c100b0056ea0018cb0mr16075881pfv.60.1668953789621; Sun, 20 Nov 2022 06:16:29 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 28/35] libuv: fixup SRC_URI Date: Sun, 20 Nov 2022 04:15:17 -1000 Message-Id: <8e5d2044ff27b54a8013fbf2ecf1cccd2cf76871.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173628 From: Kai Kang Add the trailing '.git' to git repo uri in SRC_URI then it could share source code repo on premirror with grpc which uses libuv as a git submodule with fixed revision. Signed-off-by: Kai Kang Signed-off-by: Alexandre Belloni (cherry picked from commit cecdf616e7cf192cdc723a446be1d14c197c980d) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/libuv/libuv_1.44.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/libuv/libuv_1.44.2.bb b/meta/recipes-connectivity/libuv/libuv_1.44.2.bb index 4c1b8eed56..27e79276b5 100644 --- a/meta/recipes-connectivity/libuv/libuv_1.44.2.bb +++ b/meta/recipes-connectivity/libuv/libuv_1.44.2.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d" SRCREV = "0c1fa696aa502eb749c2c4735005f41ba00a27b8" -SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https" +SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" From patchwork Sun Nov 20 14:15:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15792 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 8E6EBC433FE for ; Sun, 20 Nov 2022 14:16:40 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.13296.1668953792553304384 for ; Sun, 20 Nov 2022 06:16:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZanV7A17; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id u6-20020a17090a5e4600b0021881a8d264so6765677pji.4 for ; Sun, 20 Nov 2022 06:16:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=C0TnRUTT124PE9ANzqgLh2JSsLVqZmsRlYPZxkb17JI=; b=ZanV7A17tomlAuS2MwAV8477WARMCPQxxajQETGdS/jqXcA8DH3iIdjofSwoOYifsi TRFdr2j48YNxV7H5/A8RhjWa98TbACBxbxEaKgpreXzs/R3unhOrFVsja2uihItc4eq6 I79ai53IBW3pwyMTtRlUUgLWMKBsFrh0h2g52N99GrJpoWcMVWrKhAhkD8EPyTlNqOi6 OUBpfIL36asYWDoERVwfbRhQrYGRGZI9/sZTTfgS00NxMZ5qoX/FkOuHcxBC4pRlrf8y 8d7qQbFNZIAArq4P3Z6AOP1xQc3+1SiND5A5l3AWBLkHEG1bBjr2Jb+bSb1gKiB+beTV +OGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=C0TnRUTT124PE9ANzqgLh2JSsLVqZmsRlYPZxkb17JI=; b=PKyl6kY7909JLfbWsI0hmFZz/dPsmmoQj7jj29z7KtJQknvlJap4gMOT0iRINjSOOZ OELQJQhWjN+min3keEzcuSDU1kB1gO08/apBlqprpCVebCR412/K2r5J/8QRLlK71stG COT3jwMi+peJ1KiFjg6+qOiozrtJJkG6TIjlUfq6wa/azQ5VcEmmy3Sg53V63/PGka4X LPeAmPFQjxd3JZXvMleu9MkXS83p2xFbwXEzYKJ79yP4071XQx7RSETq2rREEz9VjQq9 EDK6suY+jltQ20S/Jmglx2awv8SD5TX/cLLzTMGUIW0Lt5ogqSLJpQhvNqbizo+/5f4+ xcKw== X-Gm-Message-State: ANoB5pn7lhEWsRia3RSx/btm9DvtOIu/xrtX2NUDAbmrtx4Jx+cNFlkL op3l7bVQzO6CwEARZX74N8cnYp0unHDK/l5Ba3I= X-Google-Smtp-Source: AA0mqf5S27pPQEeu4RKIPYUPZPzYgSDE3odA5B234wsuK8muGKpMT8tbsoTro2gZ/C8ycKfv+eyr/w== X-Received: by 2002:a17:902:7b96:b0:186:9890:97cd with SMTP id w22-20020a1709027b9600b00186989097cdmr2964150pll.104.1668953791600; Sun, 20 Nov 2022 06:16:31 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:31 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 29/35] systemd: Consider PACKAGECONFIG in RRECOMMENDS Date: Sun, 20 Nov 2022 04:15:18 -1000 Message-Id: <41ecfff7a413fff178364d67c1bf96c8e6d31c30.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173629 From: Niko Mauno Since RRECOMMENDS declaration implictly induces building the recipes that provide the runtime recommended packages, conditionalize adding such values according to associated PACKAGECONFIG settings in order to avoid redundant building. Signed-off-by: Niko Mauno Signed-off-by: Alexandre Belloni (cherry picked from commit a1989add927f7805378fe4d5afbde780b747ba77) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd_250.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index 8b6d0e8580..93cdd6fa16 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb @@ -431,9 +431,9 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ ${rootlibexecdir}/systemd/systemd-binfmt \ ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \ ${systemd_system_unitdir}/systemd-binfmt.service" -RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" +RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}" -RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" +RRECOMMENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ From patchwork Sun Nov 20 14:15:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15788 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 8A8ACC4321E for ; Sun, 20 Nov 2022 14:16:40 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.13297.1668953794459881634 for ; Sun, 20 Nov 2022 06:16:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CmsrpNE6; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id q9so9125923pfg.5 for ; Sun, 20 Nov 2022 06:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=zgtinEgDEe2ikZU5s08uIwiRuvqg0fcYUnEM/MaKess=; b=CmsrpNE6muyEl7Fkk+GUNUr7XrnI0/2/RQftAeTxwKpuMx00vgQiqKxPp/B/+T1JHa XAjkw99v7GAxlFZDDaCdkBNvc2HHb0JJ3Leke5VrqaHZ4SP8C3wz8TtieCdL9gLW1YY0 MTUT58menuechrPESA9e76M1m+u9yBqK/TdKhwCVblG1iLLGhIwOxe1whfMxP4okgk7R NP9Zs+66nVtqWux6TKyrlkIGPmzPi/xnzL0twhO7GPp/kTJBq02ylk7CeXEYW+ki598a aDW07o1BxYPWsVUWrvlZS4Hp4HXj9UrbSHN4TmwmNvBJo/UBeqL2mb0LpcgIH2ehYDgY u+QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zgtinEgDEe2ikZU5s08uIwiRuvqg0fcYUnEM/MaKess=; b=uAH0wVMtPK7HOQWh4tVTpRRA3tf7ypcPkSOlGYgzQ2gajKhm8OglgWTbiBi4Sb5BkX D1pmQYVXwKzB7o7Q/X/xWuNk+kvfZBQ9XMBCVBEiQoYqUdNa55XYaBh4m0TEDNFJoMLg GUTI8EZPzBEceqbwTjYpg+su0W3WTe6YNXB5wqlfYzDkHjOm5iz4NloRcg9mIBKr6B/c D5GqZ+bONgij/ucXOztzC+Y8rd/ELqV0o+WBToFRELHbkzyWl5RGsLnEqbD+d1w2LoUA buPCrzYYmsx6XeSC3LVTelJxSY2ocsttlUkhrv07zM7IB6WSwexgdrdtsBK0nHpXbXRY lMew== X-Gm-Message-State: ANoB5plQEM2yJZmwlrKA6P0rJbG5Ummnt9B3X9+SB6CN4VbSEGoh0bPA NT4KaZ9S7rZu5VrGo/S+RfDthszMDoGJgZZvtuQ= X-Google-Smtp-Source: AA0mqf4Xlo+DI3jqY8rAYpqktfxovMnRR/vp9oAiyi5afUdhDf6BWA6XJC545Bbse8T5e4aTUQsP5Q== X-Received: by 2002:a63:191d:0:b0:46f:1cbd:261f with SMTP id z29-20020a63191d000000b0046f1cbd261fmr14131182pgl.329.1668953793458; Sun, 20 Nov 2022 06:16:33 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 30/35] kernel.bbclass: Include randstruct seed assets in STAGING_KERNEL_BUILDDIR Date: Sun, 20 Nov 2022 04:15:19 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173630 From: Diego Sueiro When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need to copy the build assets generated for the randstrutc seed to STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will generate those assets which will result in a different RANDSTRUCT_HASHED_SEED. Signed-off-by: Diego Sueiro Signed-off-by: Alexandre Belloni (cherry picked from commit b36303158b2e0273ff415bdedefb379f680b30fc) Signed-off-by: Steve Sakoman --- meta/classes/kernel.bbclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index d878d4e167..ad2b296c2d 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -585,6 +585,22 @@ do_shared_workdir () { cp tools/objtool/objtool ${kerneldir}/tools/objtool/ fi fi + + # When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need + # to copy the build assets generated for the randstruct seed to + # STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will + # generate those assets which will result in a different + # RANDSTRUCT_HASHED_SEED + if [ -d scripts/basic ]; then + mkdir -p ${kerneldir}/scripts + cp -r scripts/basic ${kerneldir}/scripts + fi + + if [ -d scripts/gcc-plugins ]; then + mkdir -p ${kerneldir}/scripts + cp -r scripts/gcc-plugins ${kerneldir}/scripts + fi + } # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware From patchwork Sun Nov 20 14:15:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15791 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 8AD8FC4167B for ; Sun, 20 Nov 2022 14:16:40 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.13300.1668953796617699692 for ; Sun, 20 Nov 2022 06:16:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=It2yIK9A; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 6so8987595pgm.6 for ; Sun, 20 Nov 2022 06:16:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=/HiQy1GKfxtky/g/xoT1NAKewvG4qKjBYP7fAvx1pAM=; b=It2yIK9A0oW1CAyKG6irAh1TgKMg9c2ywufN+qdrDU18fVQQMyinl/RHtbO8kaoRqN nBrX9r33fly2Z4lTcvKPIvinPPKpjvSuugNk6MDDDSggLO27tjvqqe9ZOUj0L8wYgUWH 7LZQWbrEUP7l1E2Gqct/znMovwu9JIeq+bM1h9guIP4lAc6yToc0ulikzrXrYWafHys0 LQlb4x4gWuSDPI0Cjx6M1YQd7W6I+5kRSZRTA9HNCWcIR42azGhuwnAZAYhuAjjnNiyd cCReAaJs8932tQDq2lK/nlYRdA+w68FbcYakxwhxW1j+bbThlW4nm6P5BVThecAjcnXN ZzTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/HiQy1GKfxtky/g/xoT1NAKewvG4qKjBYP7fAvx1pAM=; b=PfKwhOPq2MHKwt2FnHeYlwJU1F1MmuHdJvqKOdlSA+UWW9grrm+q9kwT2Wy3L2TZWy oiPpGPIZeZwWXI9YT61bjZ5hx4jEVbQqhQHBM6hScKFgHi4k/vnPg11tQQtwDIlfzbJX XKDT/1hrfi9wV3gaK4eCieZP/Zlw7pPOd4uzUsHa9muRsbucj0HtdAxZd/W6t7hOBNx/ aaKCVzhWUkq5NUR5WvOB6H+qJ2A8PzqG86iazRMqdIcrwVF3eHW23TVcr9/x0rpceBjB gVUAedEAhKM0OZnNBy3cXbu3FTG08EyUmwnjFlealoNtMQcYiew0nDvG76+SLs2yeHUd zDXQ== X-Gm-Message-State: ANoB5pk1+Py59tENdViJG3cDpKuA9i6bz/5NxIE00KbD6jr7jS55VGee sACgmycgPTXrXmH9SKHoZlZx1Khtj4olR5UPuS8= X-Google-Smtp-Source: AA0mqf7k0PvCEZ+PtxiZTHq8GziH5JmoFhb47J2hxJjnNSssgwrwi1SADpXD+enF2XsMBwHH2NvdqQ== X-Received: by 2002:a63:747:0:b0:46f:2780:93b7 with SMTP id 68-20020a630747000000b0046f278093b7mr4455184pgh.166.1668953795562; Sun, 20 Nov 2022 06:16:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 31/35] gcc-shared-source: Fix source date epoch handling Date: Sun, 20 Nov 2022 04:15:20 -1000 Message-Id: <0511f24264bcc27d6b61edd2e16f899c985eb8ad.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173631 From: Richard Purdie The source date epoch for gcc isn't being transferred from the shared workdir to the current WORKDIR for the specific recipe. This results in the clamping code within sstate.bbclass using a value from 2011 which changes the timestamps of many files. Since this happens part way through the build, if pieces of gcc haven't built, or build/rebuild later, we see things rebuilding when they should not and for generated files, races are possible. Fix this by copying the SDE from the shared workdir into the recipe workdir. [YOCTO #14953] Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit b996293b4c8ab7ff3ed852045d17290df29205df) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-shared-source.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc index aac4b49313..cd2e341099 100644 --- a/meta/recipes-devtools/gcc/gcc-shared-source.inc +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc @@ -9,3 +9,13 @@ SRC_URI = "" do_configure[depends] += "gcc-source-${PV}:do_preconfigure" do_populate_lic[depends] += "gcc-source-${PV}:do_unpack" +do_deploy_source_date_epoch[depends] += "gcc-source-${PV}:do_deploy_source_date_epoch" + +# Copy the SDE from the shared workdir to the recipe workdir +do_deploy_source_date_epoch () { + sde_file=${SDE_FILE} + sde_file=${sde_file#${WORKDIR}/} + mkdir -p ${SDE_DEPLOYDIR} $(dirname ${SDE_FILE}) + cp -p ${S}/../$sde_file ${SDE_DEPLOYDIR} + cp -p ${S}/../$sde_file ${SDE_FILE} +} From patchwork Sun Nov 20 14:15:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15789 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 82C07C43219 for ; Sun, 20 Nov 2022 14:16:40 +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.web11.13229.1668953790562462287 for ; Sun, 20 Nov 2022 06:16:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZhVortgc; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id c203so9102592pfc.11 for ; Sun, 20 Nov 2022 06:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=aSpmwPFJC+Iz4YOhDkfiVcQhALe+ZyuvspVEH3w6lKU=; b=ZhVortgcDU2Dcw5ML0eYfRDz7BNrtvkEYJwhLVFAs/XzFcq3aG6hW1JynMtVXYRlog gAJcYL0DvokgQRflAHC7HFHpjvW0YGRNxwN4x9RVTihnCIZ21G179FXu35dJVt1Qu/f8 dEDWg5gTlZ/E1XGrz38fMPpAPYmVflWvjxYgTwuDkWbzov+GQkN4wyGGMLWgt/gUcqc5 ZLd5vn8Njr5ZKpfE+oLsOVGtB6PLLu33o44lGutCt/65WyCo+8FOWzUKxaHFvnIYDKny S82pEMBYCoilhDN592Xl+Cu8yJOzOHKCWonpN2vdeyU8yp5q/ybNIbfzWYZilwHqt0Ar wfdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=aSpmwPFJC+Iz4YOhDkfiVcQhALe+ZyuvspVEH3w6lKU=; b=0zz0hRBnP2IN9i7YjHWWd5YOclWblFoo9rNKVTWyCLC5FT5XpliISwT1/DCH/3wVgT PknKrDopmL1g0BP+Cy1wB6Pg8ED8woyjzXnmuRbEqEKrK606Sub15D3wg6tkFEgG81GP qXH1XrXgADGkFf75Q4vTbowPT3m7cC2ctqmkmvZtKuWRUx4JkuM/ftIQORAB3FLYvWl4 trQQDkZFLmIOnZ5b4n3b7FlkIC7BoSqiBQWQz+bIdcIh+ZI6EVVejvM/apcCIdYNjcYM 6s+R+8pHCGCXXfmo6pIXqAR+MvZVsnc9ezNqUXLnE3pGigiucEsV1a4pDh3EFyq+9AZS +DSQ== X-Gm-Message-State: ANoB5pmVY/JmkivbtlEpCqtH0hhXhDULJwd4aunMq6DQEmI5yQxs9Jye ukMuZcqi7e7t1rA+f++X1AysKYXTrHKrrH95LFw= X-Google-Smtp-Source: AA0mqf4WyB90FM+qnKrP5tCqXlAgxe3srIwmr1fXAPllxZVP9lJkuyA3X3MuQhCWFWMY7+7U/M2Eiw== X-Received: by 2002:aa7:95b7:0:b0:548:4e65:348d with SMTP id a23-20020aa795b7000000b005484e65348dmr15987691pfk.56.1668953797402; Sun, 20 Nov 2022 06:16:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 32/35] gcc-source: Fix gengtypes race Date: Sun, 20 Nov 2022 04:15:21 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173632 From: Richard Purdie gcc renamed .c files to .cc files: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5c69acb32329d49e58c26fa41ae74229a52b9106 but we didn't fix this reference which meant we re-introduced a race around gengtypes-lex.c. This lead to the race reappearing on the autobuilder. Fix the naming to avoid the problem again. [YOCTO #14953] Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit dbca40ed399405b663dbc3894e35596a2615f47d) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-source.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 224b7778ef..03837f4381 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -26,7 +26,7 @@ python do_preconfigure () { cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize') subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) # See 0044-gengtypes.patch, we need to regenerate this file - bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c")) + bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc")) cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) From patchwork Sun Nov 20 14:15:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15790 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 80630C4332F for ; Sun, 20 Nov 2022 14:16:40 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web10.13302.1668953800222913081 for ; Sun, 20 Nov 2022 06:16:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Bi61ivx7; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id r18so8958032pgr.12 for ; Sun, 20 Nov 2022 06:16:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=1xkM+lzYlgi6quiuVRxeBs++ouehiqW/eTRoygC8a14=; b=Bi61ivx7rH+JtJcxJmbq2bEqOHymjHlS6kXtvYg+0DMeeyGcEixv6m/yfJnfbExuLG waH/rtWa/2beAUbzZINW0mqKy+gvrvJmf7Znwz4uh6q9L64vdwfx1FbUWBdznaLihPA+ mQZxBgOTIWg6WVMFisbmYoZ5xvSqCGDQXz9eLvky+C5IDVwOomnt1El6vn2PPFmbI4TB /w1HK50cvo7NtJccmiX6JnyKya/zXhq3KosrlZunkG8cpX6ed2kbf2DG/YXhYHWLKoAp E8eCmC96HRE88YZkNwAizb/r35X0CHPsTwvdY7Msu4QQSzPOJRoMevJXwdoztlnRon7Q iIsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=1xkM+lzYlgi6quiuVRxeBs++ouehiqW/eTRoygC8a14=; b=pKD8+BDJeLF+/McFIm89dSruecubb8jhdfwgUF5wFn6VQgpHes3YVmuZq48j4odLi4 C8XrDo7XOm1INWifU840wguCieqdbkPH5OE/t0F+Fw35ZpKpNhj5KHljEzxodgzTO8Xq m6Sx4YHmp0tvGG3zNNl4IS+AUpwO9Z37O6FNnvPgSstOqEBmkPVLzPXLzibmxb3Ix13o L2Q8X1mog6oP3/ixXrFkRlmJ7bXFLtt4UBlDgWVhnMO82fNllBqPCCcv4TsincKMwuVm xwkNQlcudsdA9ITaIbMkm5qzVihLMb4gDbjmcSkuMUvx6vDgQD8xFJLc3x4TchAIh6fR l7FQ== X-Gm-Message-State: ANoB5pnWL6SmxdtVMRoF7Oi9qomPjJevJEfLmcx0cTZ2sVUQG87DZEnK 2pSYCOPREMaK51gkY9Nkbk3Whyc0yO+DcxgJ00I= X-Google-Smtp-Source: AA0mqf69OJHx3aMCIc5XvbzjXNtzsl7cnkCKT5KgELzboSONIu9p/SMi8QCdKc4IxcJb+fV5RylfCA== X-Received: by 2002:a63:1a55:0:b0:477:4ba4:c278 with SMTP id a21-20020a631a55000000b004774ba4c278mr2658978pgm.482.1668953799229; Sun, 20 Nov 2022 06:16:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 33/35] gcc-source: Drop gengtype manipulation Date: Sun, 20 Nov 2022 04:15:22 -1000 Message-Id: <8a49626bb32b40a2cf97fd8b80564b494ae38698.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173633 From: Richard Purdie Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would be the file which would trigger regeneration of files. The real bug that was likely the cause for this fix is probably SDE issues with gcc shared workdir so this code can now be dropped. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 7ab82b5db2a737c2a0266280b15d343a27c0e1d5) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-source.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 03837f4381..bf33a4b31f 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -25,8 +25,6 @@ python do_preconfigure () { import subprocess cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize') subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) - # See 0044-gengtypes.patch, we need to regenerate this file - bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc")) cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure") subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) From patchwork Sun Nov 20 14:15:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15794 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 7FD80C433FE for ; Sun, 20 Nov 2022 14:16:50 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.13235.1668953802137056149 for ; Sun, 20 Nov 2022 06:16:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZIPX++GF; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id k2-20020a17090a4c8200b002187cce2f92so7024376pjh.2 for ; Sun, 20 Nov 2022 06:16:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=WGbIHVMWTYsG58trt2y5xO8zgQRB+Oj6CaRfibTparE=; b=ZIPX++GFzz9hrkOwE59Y/7WGU8/f9iNpVLA9hJ28M0U6b4WozleWs1iITwwC4qnQTl mFgO2Y81CX6O2Py4tHn0hucEHKu+/Kw7l604Lmo7DpKFecSCFI1HBk4TORRIHb6rS3lZ VOMMndg3LCTdpYxS2aMsv+vCN3SSg/fwwM7f3NGj6PL/xYvC/vbfN0LhW9YWdkpDBdZv oZ+rcrZhOLS+tcA4U5scR0MojP/YzH7wKtzX4e+TkD4JaIrYmjcThh5k804cKH1xVRxN HWU0EEOKy7pt0KoDPbsmpEeD9WRxorqNmiqNSgczvG0c7+DNREdoy5eNmlN4dudODllI GK2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=WGbIHVMWTYsG58trt2y5xO8zgQRB+Oj6CaRfibTparE=; b=4c6TGfiTsXJkkNiFZDQV6n4QRCdpz0jm9oQQtT9uS6+yTKwfbcU8dlQtKjl75SrqYp 1NNs5Fu110WXsM00DDNYz+9zPczhLUHtgLTTBQaHR247Qf02+H1S2y2qQEiS987W5zyP 4CQikrojCRVmDfedqnQwgIFj2y37O2cy0Uqd3RVUhjw2Q2iTshKO2KSvwa6zFom781/v uwrTBV8Jp10h2+xaVh7sa/i6bAju2RhnZsoMf1KrLESNhVN32KuJySe7tXv8q8JvJTLo uNDcfWIoNxk1gWBGAs9B/AhhCw0hcrLw/FPEXIHExG2wFEY0RUjut8UDQkYX8I8oQx0h vzYA== X-Gm-Message-State: ANoB5pn10Fxjzyr98+JIcuPAEDXi0kksdEyN7FF2+T8ZhMoBapGdVnAC 5NXGYb0giKxtzfisVj7fu2U16IChJVYLIA4mqyw= X-Google-Smtp-Source: AA0mqf6CJ0lrfaImnataZyPC9Ovv7NXieK1a0sJ5xUmf1qKVgHy6o2nVCCfpFrd7k7Qe6eX9dMLzuw== X-Received: by 2002:a17:90a:5d08:b0:218:770c:9a40 with SMTP id s8-20020a17090a5d0800b00218770c9a40mr16081877pji.158.1668953801058; Sun, 20 Nov 2022 06:16:41 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 34/35] gcc-source: Ensure deploy_source_date_epoch sstate hash doesn't change Date: Sun, 20 Nov 2022 04:15:23 -1000 Message-Id: <1511cb3bae2d6e2dad48269108e68967ae302efc.1668952942.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173634 From: Richard Purdie Currently if you switch machines, gcc-source do_deploy_source_date_epoch would re-run as the stamps are tune specific. This hasn't caused much of an issue until now, however if we fix the gcc recipes to reuse the timestamp from this task, it does then create problems. Copy code from allarch to ensure this task hash doesn't change between machines/tunes. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 7e052d03464ba5e880a6c5a0e45ff2f467ef97e8) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-source.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index bf33a4b31f..265bcf4bef 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -17,6 +17,13 @@ STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-${PV}-*" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "" PACKAGES = "" +TARGET_ARCH = "allarch" +TARGET_AS_ARCH = "none" +TARGET_CC_ARCH = "none" +TARGET_LD_ARCH = "none" +TARGET_OS = "linux" +baselib = "lib" +PACKAGE_ARCH = "all" B = "${WORKDIR}/build" From patchwork Sun Nov 20 14:15:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15793 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 8541EC4332F for ; Sun, 20 Nov 2022 14:16:50 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.13304.1668953803963534975 for ; Sun, 20 Nov 2022 06:16:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Vn01awqU; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id h14so8357728pjv.4 for ; Sun, 20 Nov 2022 06:16:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=LYMWADDF66VgYP9QsEG6Hudh9GELIONym5Fs2OSC8NE=; b=Vn01awqUuBRfWVfD9tK/lP8c6wNiIDraWHDz1rM792jv+6Rvv9jGMRh+3XCjLwXarR LihPdKMJGM7RmxywuTBP/yQnVeKHZWgs6vbxxRYGczWrBXHLQliBQrLEzxOPoSiifBto 4ZV3TtQNv1mJkbJZV0A6c9T0GWlbqLgpCj2Xodj526B7IXvdgxKWLQvbMaEVWxK1MdfF znvG22/091+llLTUIkM/HTyvi2RkCwWxYyC95bHF23He0ftizYLURamXiF2l0MT2xDOO Pztop1KnEMPGT9IDRQxTPajpLVk2lz5mdqkGNPKVFgjFNJKGXSrYIPPhuyZfZYI4Cq3O D8aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=LYMWADDF66VgYP9QsEG6Hudh9GELIONym5Fs2OSC8NE=; b=I42px3gVd/wOVhDUGDwFPftENtwbtg6A+o7GyeVLUJVuvtDx3VKCBGXQzvC8J6CsyN KvI+8IC9xLyC4+4K0n3ygMJobE1AdjzC6tEgplp9mSUsNNlLPQVL3NVlKMTn3Y8JF9VO 7E13naKLSriSlIescD2IBHg8vi0KtyCopmNwN7GsB6r/6zwfXY2z3EPkWhJMXkFLqJ+F LbH9jBbtGIpGTHZufIzOtTdcU54oEmBEwUvZDdLBFCdnYnJfQSmuzo8AdhXi9X2RAbWU I73ktVBi9lu9jE4Pey6yegKwooOg2psk4fXP0+olgrFMrYxJK10Eu3lG0j3wp/K4p5/6 DpqA== X-Gm-Message-State: ANoB5pkkDdW/EXmiz33i9mOLXoa893cxs98gchyt1ySITo+s6VMY50za eDuTotaprXCHgN+mfa58HHmFdgohRK2rPRvzhVg= X-Google-Smtp-Source: AA0mqf7PJiKEeGhXG2sYD9TOgqAaQe3DPj4JUXuTZi71qV3llnNEUgPJfz6L0Iu1mTQHsxxPQsAQjw== X-Received: by 2002:a17:90b:2810:b0:213:ecb6:b690 with SMTP id qb16-20020a17090b281000b00213ecb6b690mr22622596pjb.244.1668953802929; Sun, 20 Nov 2022 06:16:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id x15-20020aa78f0f000000b0056be4dbd4besm6721379pfr.111.2022.11.20.06.16.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:16:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 35/35] wic: make ext2/3/4 images reproducible Date: Sun, 20 Nov 2022 04:15:24 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 20 Nov 2022 14:16:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173635 From: Sergei Zhmylev Ext2/3/4 FS contains not only mtime, but also ctime, atime and crtime. Currently, all the files are being added into the rootfs image using mkfs -d functionality which affects all the timestamps excluding mtime. This patch ensures these timestamps inside the FS image equal to the SOURCE_DATE_EPOCH if it is set. Signed-off-by: Sergei Zhmylev Signed-off-by: Alexandre Belloni (cherry picked from commit 75d2dd0ea7790db2e8ee921784ca373abff2df65) Signed-off-by: Steve Sakoman --- scripts/lib/wic/partition.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 7c288d2958..5563f4448a 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -293,17 +293,36 @@ class Partition(): f.write("cd etc\n") f.write("rm fstab\n") f.write("write %s fstab\n" % (self.updated_fstab_path)) - if os.getenv('SOURCE_DATE_EPOCH'): - fstab_time = int(os.getenv('SOURCE_DATE_EPOCH')) - for time in ["atime", "mtime", "ctime"]: - f.write("set_inode_field fstab %s %s\n" % (time, hex(fstab_time))) - f.write("set_inode_field fstab %s_extra 0\n" % (time)) debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs) exec_native_cmd(debugfs_cmd, native_sysroot) mkfs_cmd = "fsck.%s -pvfD %s" % (self.fstype, rootfs) exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) + if os.getenv('SOURCE_DATE_EPOCH'): + sde_time = hex(int(os.getenv('SOURCE_DATE_EPOCH'))) + debugfs_script_path = os.path.join(cr_workdir, "debugfs_script") + files = [] + for root, dirs, others in os.walk(rootfs_dir): + base = root.replace(rootfs_dir, "").rstrip(os.sep) + files += [ "/" if base == "" else base ] + files += [ base + "/" + n for n in dirs + others ] + with open(debugfs_script_path, "w") as f: + f.write("set_current_time %s\n" % (sde_time)) + if self.updated_fstab_path and self.has_fstab and not self.no_fstab_update: + f.write("set_inode_field /etc/fstab mtime %s\n" % (sde_time)) + f.write("set_inode_field /etc/fstab mtime_extra 0\n") + for file in set(files): + for time in ["atime", "ctime", "crtime"]: + f.write("set_inode_field \"%s\" %s %s\n" % (file, time, sde_time)) + f.write("set_inode_field \"%s\" %s_extra 0\n" % (file, time)) + for time in ["wtime", "mkfs_time", "lastcheck"]: + f.write("set_super_value %s %s\n" % (time, sde_time)) + for time in ["mtime", "first_error_time", "last_error_time"]: + f.write("set_super_value %s 0\n" % (time)) + debugfs_cmd = "debugfs -w -f %s %s" % (debugfs_script_path, rootfs) + exec_native_cmd(debugfs_cmd, native_sysroot) + self.check_for_Y2038_problem(rootfs, native_sysroot) def prepare_rootfs_btrfs(self, rootfs, cr_workdir, oe_builddir, rootfs_dir,