From patchwork Sat Jul 8 15:55:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27090 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 DF7EDEB64DC for ; Sat, 8 Jul 2023 15:56:07 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.329.1688831762414942146 for ; Sat, 08 Jul 2023 08:56:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=GMXn4coZ; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-55ba5fae2e6so2259251a12.0 for ; Sat, 08 Jul 2023 08:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831761; x=1691423761; 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=T0JnnhXurP0cB/U1w9QfhV/tQrjxrX5QSgyFQUvK3Ag=; b=GMXn4coZuy8LROYQ2fJZaoCgfPDf+PMD81aK/bXU2GVjQaJp1orQqDHTMmaVu0ymCz i7DwvbFPTliaxdOVow+iBmaLU3lVvY8Fwx/ohFgHF7xSRrWwqGWxOZmP1QbiiJhg6nFr 5TGJvQVFNUB3oGjWRebxYN41SiMVR+P9p4BdEbPW1WBqlTrzloPMatY6VTIuaZBDHj7C o6e3TDk4qVegAh/3c8ZvRZpA5euBaZ4z0nuqmXkKxPLV+hHZIfBivVF36MKhgdv4XPRy 6FXB6OsFbtxY8kfRLfEjmOs+lH6Uqvpnn6COeY/Eg53MW7vlWy2yNKWotGbeNLGsovGN YSkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831761; x=1691423761; 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=T0JnnhXurP0cB/U1w9QfhV/tQrjxrX5QSgyFQUvK3Ag=; b=Ea54bVEHclQ4Qc0SqX1w98Iere0U86liWumQpC1OUAHmO6aGPTgzVcsROXccFg9ye7 GnI8mEgb0tQIbNDJ8Bo8V2HZw8PIdWn8XjHhad6jE0L/UwcFw92j4f4DFdW2uQ2P6Jff Drus8qxvsdAZrIFjrK5hZOGpigV40i8QKTk/PynmZUASrjOMQPjRJ+cXEwhIOoJ8g5ai SfZ7UUu3BEUjpJVLkoRnGpKbzl8GFAHba8eiCHpuggc2YJ171Z9mRxXto+JCTZJZhEpc llkXyOqNsbMo34PKhywRRxNUIIYZOlWKSNkaxgn6BEAhrTtk4LiOZcWeEaY8kKxvMMOT S0ag== X-Gm-Message-State: ABy/qLaqNgWEBwl+ixU4n+fNgz051PBnQCTG+MVknxoT8JS8CqMqBI/I JfNvOduDWoCoEigI5t6Uhvb7tsrSoDk0eI8ebEA= X-Google-Smtp-Source: APBJJlHVbUvaiLomi5e34Le70/+UL2o2Bd25Bwb/EQ4HEsKm7bUeG/4nnjDiCSqSk16tgqDxg4XHSw== X-Received: by 2002:a17:90a:404f:b0:263:f72f:491 with SMTP id k15-20020a17090a404f00b00263f72f0491mr8513852pjg.43.1688831760867; Sat, 08 Jul 2023 08:56:00 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.55.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/17] cups: Fix CVE-2023-34241 Date: Sat, 8 Jul 2023 05:55:35 -1000 Message-Id: <28b25ba7a8c6aa5c5744ca17e8686f2762791c72.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184021 From: Vijay Anusuri OpenPrinting CUPS is a standards-based, open source printing system for Linux and other Unix-like operating systems. Starting in version 2.0.0 and prior to version 2.4.6, CUPS logs data of free memory to the logging service AFTER the connection has been closed, when it should have logged the data right before. This is a use-after-free bug that impacts the entire cupsd process. The exact cause of this issue is the function `httpClose(con->http)` being called in `scheduler/client.c`. The problem is that httpClose always, provided its argument is not null, frees the pointer at the end of the call, only for cupsdLogClient to pass the pointer to httpGetHostname. This issue happens in function `cupsdAcceptClient` if LogLevel is warn or higher and in two scenarios: there is a double-lookup for the IP Address (HostNameLookups Double is set in `cupsd.conf`) which fails to resolve, or if CUPS is compiled with TCP wrappers and the connection is refused by rules from `/etc/hosts.allow` and `/etc/hosts.deny`. Version 2.4.6 has a patch for this issue. References: https://nvd.nist.gov/vuln/detail/CVE-2023-34241 https://github.com/OpenPrinting/cups/security/advisories/GHSA-qjgh-5hcq-5f25 https://security-tracker.debian.org/tracker/CVE-2023-34241 Upstream Patch: https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2 Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 1 + .../cups/cups/CVE-2023-34241.patch | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-34241.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index d6e7d95800..1d2377486a 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -15,6 +15,7 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t file://0004-cups-fix-multilib-install-file-conflicts.patch\ file://CVE-2022-26691.patch \ file://CVE-2023-32324.patch \ + file://CVE-2023-34241.patch \ " UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" diff --git a/meta/recipes-extended/cups/cups/CVE-2023-34241.patch b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch new file mode 100644 index 0000000000..816efc2946 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch @@ -0,0 +1,65 @@ +From ffd290b4ab247f82722927ba9b21358daa16dbf1 Mon Sep 17 00:00:00 2001 +From: Rose <83477269+AtariDreams@users.noreply.github.com> +Date: Thu, 1 Jun 2023 11:33:39 -0400 +Subject: [PATCH] Log result of httpGetHostname BEFORE closing the connection + +httpClose frees the memory of con->http. This is problematic because httpGetHostname then tries to access the memory it points to. + +We have to log the hostname first. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2] +CVE: CVE-2023-34241 +Signed-off-by: Vijay Anusuri +--- + scheduler/client.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/scheduler/client.c b/scheduler/client.c +index 91e441188c..327473a4d1 100644 +--- a/scheduler/client.c ++++ b/scheduler/client.c +@@ -193,13 +193,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + /* + * Can't have an unresolved IP address with double-lookups enabled... + */ +- +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, +- "Name lookup failed - connection from %s closed!", ++ "Name lookup failed - closing connection from %s!", + httpGetHostname(con->http, NULL, 0)); + ++ httpClose(con->http); + free(con); + return; + } +@@ -235,11 +233,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + * with double-lookups enabled... + */ + +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, +- "IP lookup failed - connection from %s closed!", ++ "IP lookup failed - closing connection from %s!", + httpGetHostname(con->http, NULL, 0)); ++ ++ httpClose(con->http); + free(con); + return; + } +@@ -256,11 +254,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + + if (!hosts_access(&wrap_req)) + { +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, + "Connection from %s refused by /etc/hosts.allow and " + "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL, 0)); ++ ++ httpClose(con->http); + free(con); + return; + } From patchwork Sat Jul 8 15:55:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27088 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 BF8ACEB64DA for ; Sat, 8 Jul 2023 15:56:07 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.330.1688831763960806822 for ; Sat, 08 Jul 2023 08:56:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=sh4ddVxy; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-553ad54d3c6so2046927a12.1 for ; Sat, 08 Jul 2023 08:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831763; x=1691423763; 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=NCZ72GolJw3Obw0hpj20chb0js/rd5DSnAZbKKVkd3Y=; b=sh4ddVxybBRjEXOcLCZEXT3dS+eNWiJntZXhdbRZwfqPR1BJ5M6pfRIgP9koJwXlUy +0ngYA1vfokjn9LWaeYlJosKZ3KiwaRQzI4qnqL5QiajJtNzbsAmr12G+YyarmsvEbpg tFr5ugGOhYBHFColD391l3kiSYxoObWA6+Ft5+cLCEpWvoZYEl0dUGaW8jut833JNzEO x3iEbAGckE1CdB2KdhKv6QOt1VLjxe7E97hoI8xALwVhs40XRfhCpYGbxPrQ6OgXfTBx +kkYZa0R6+J8Y+Vt0KNglImq9KnD+y7Lz8GKAM7zSaukh8yR08nVWEZs2/qr5qMjB6qB cf9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831763; x=1691423763; 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=NCZ72GolJw3Obw0hpj20chb0js/rd5DSnAZbKKVkd3Y=; b=gs/4BIFAKKrDMZwas4CV5VNgEszr1gVTh1Jt86SM5PrVFvN6a1INPbfPC+7rY8tgRn RVmGNLJun4QZi4yHK6N3QSo5MEr+lSsE7ZP5JOXY5IpH7yDFa4LHlI/SGgKjrgZJJnlk 0sOG97AcDuG4run8iDhavH6qHo/CgjVZzY67wUZZkMEiTMzYAIhggECS+f1xnDHM4v+X R0fr+5cBIomM8h/x2K0C2ohX6aC+lMVIsf9t7Tra5KJLuLo9XDo7pKDBntlXfvNtSEDZ vbipXA33gfbHpPSi/4M1oo7WhNhHclBu9fwaw3/+fK1/cZHZTrQ/htpp/hr9QzOXAB/j P71g== X-Gm-Message-State: ABy/qLZtRAU5FJ3EjlWEM2yx2rJgSKJ9nUdYlcToNEXdcc5vU/20tRQx ArKmXB/n+48JyGL2eY2BBRYfo/ulEpKiE4fdanw= X-Google-Smtp-Source: APBJJlEE3FayM9DiCwk977hmvV3L7QfrSFH5NbtNzKm8N0GmTBTb4NUxv4P1et4H3MecFeBLigyK/g== X-Received: by 2002:a17:90a:5898:b0:262:f029:6946 with SMTP id j24-20020a17090a589800b00262f0296946mr5790654pji.9.1688831762836; Sat, 08 Jul 2023 08:56:02 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/17] sysstat: fix CVE-2023-33204 Date: Sat, 8 Jul 2023 05:55:36 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184022 From: Chee Yang Lee import patch from debian to fix CVE-2023-33204 http://security.debian.org/debian-security/pool/updates/main/s/sysstat/sysstat_12.0.3-2+deb10u2.debian.tar.xz upstream patch: https://github.com/sysstat/sysstat/commit/6f8dc568e6ab072bb8205b732f04e685bf9237c0 Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- .../sysstat/sysstat/CVE-2023-33204.patch | 46 +++++++++++++++++++ .../sysstat/sysstat_12.2.1.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch diff --git a/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch b/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch new file mode 100644 index 0000000000..9a27945a8b --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch @@ -0,0 +1,46 @@ +Origin: https://github.com/opencontainers/runc/commit/6f8dc568e6ab072bb8205b732f04e685bf9237c0 +Reviewed-by: Sylvain Beucler +Last-Update: 2023-02-18 + +From 954ff2e2673cef48f0ed44668c466eab041db387 Mon Sep 17 00:00:00 2001 +From: Pavel Kopylov +Date: Wed, 17 May 2023 11:33:45 +0200 +Subject: [PATCH] Fix an overflow which is still possible for some values. + +CVE: CVE-2023-33204 +Upstream-Status: Backport [ upstream: https://github.com/sysstat/sysstat/commit/6f8dc568e6ab072bb8205b732f04e685bf9237c0 +debian: http://security.debian.org/debian-security/pool/updates/main/s/sysstat/sysstat_12.0.3-2+deb10u2.debian.tar.xz ] +Signed-off-by: Lee Chee Yang + +--- + common.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +Index: sysstat-12.0.3/common.c +=================================================================== +--- sysstat-12.0.3.orig/common.c ++++ sysstat-12.0.3/common.c +@@ -1449,15 +1449,16 @@ int parse_values(char *strargv, unsigned + */ + void check_overflow(size_t val1, size_t val2, size_t val3) + { +- if ((unsigned long long) val1 * +- (unsigned long long) val2 * +- (unsigned long long) val3 > UINT_MAX) { ++ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && ++ (((unsigned long long) UINT_MAX / (unsigned long long) val1 < ++ (unsigned long long) val2) || ++ ((unsigned long long) UINT_MAX / ((unsigned long long) val1 * (unsigned long long) val2) < ++ (unsigned long long) val3))) { + #ifdef DEBUG +- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", +- __FUNCTION__, +- (unsigned long long) val1 * (unsigned long long) val2 * (unsigned long long) val3); ++ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", ++ __FUNCTION__, val1, val2, val3); + #endif +- exit(4); ++ exit(4); + } + } + diff --git a/meta/recipes-extended/sysstat/sysstat_12.2.1.bb b/meta/recipes-extended/sysstat/sysstat_12.2.1.bb index 2c0d5c8136..ac7b898db9 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.2.1.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.2.1.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch \ file://CVE-2022-39377.patch \ + file://CVE-2023-33204.patch \ " SRC_URI[md5sum] = "9dfff5fac24e35bd92fb7896debf2ffb" From patchwork Sat Jul 8 15:55:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27091 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 C09FAEB64DD for ; Sat, 8 Jul 2023 15:56:07 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.333.1688831766245644980 for ; Sat, 08 Jul 2023 08:56:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=KUQQN9KC; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-55b83ae9be2so2141447a12.2 for ; Sat, 08 Jul 2023 08:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831765; x=1691423765; 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=PVqxAt246PryYIQ0qNSsJPbYGAwHbgtLd7QWzvVTWDQ=; b=KUQQN9KC517d54kbXIcndaV0SuvUL24JTuAM31mi32n3jzdVG9St7V5hp5p72DZCkr F+a2F7Pqp8gI68/Oo0sKTpxLFEs5GgBsx6Ks7+JJwppsMBXbZi2uUHdN/D1EU5I8UXsZ 5lc2FACG8lX/XHXUDu05mi+fJTeOfRtDj8zF1X3HspC6ulf6Nb5Sm/tX/TKRafmBsVx3 pn2xAMGieOvDzgRrB3v4ncrJ2LR0iVEqFzzmtXQkNDh+KT+sOHJh1lmTd5ywCSFAaiV9 saeYsnPUkU8MwQJMY74V7YoL1i5sVqrSaDvWEkMBCd/ihYi5hiW2YYdjPl/G8a8PREcA H9IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831765; x=1691423765; 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=PVqxAt246PryYIQ0qNSsJPbYGAwHbgtLd7QWzvVTWDQ=; b=Y6/xxY50J2knCVvnhPgYiAfwx4UonYDI2qL/CSVnKzqLf/jZ4ND1Uc4+dqz0z5oEKY JmWiecE9e9xmi4s2ZdPeKEFbzrKnaauTewlNUaPhPnIEkr3vOeXyEczyg2cZztw/PdDf 5AaeOUtJ+Es6FPd8a5bV7YDn/hfqKvnQhvaLriBvJJLSBDW/vyyCGl65mlgA4a/rthYB PbiS754/oBrszcegToZuiP21FmmKLFR41hi9qxTCoiLXfybH+vJ6dBRWRhI3TKOPpQlV PxfXCEYyE33KvnjKGnA8Cy0jlBPoIibH79sFrsEEXUqH1IGY3d8ao28qZBMp8q2k8UY7 JRwg== X-Gm-Message-State: ABy/qLZ2UaKB1AsQHEwD9/fAfCIU05MT431IqW9jZ3x+HB92z8/Vk/1n L20V7gd9WkmmheG3ZRhU47Cg+NrAJWxMKmH/e68= X-Google-Smtp-Source: APBJJlGB0NDGG/3W84SV3oyhlSvmrVWjToQlJqAioKwaxUOTsMtA8pJnfUZJpT+LwAr1To+cyv5qaw== X-Received: by 2002:a17:90a:ebc5:b0:262:dc67:98cd with SMTP id cf5-20020a17090aebc500b00262dc6798cdmr8211024pjb.5.1688831764768; Sat, 08 Jul 2023 08:56:04 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/17] grub2: Fix Multiple CVEs Date: Sat, 8 Jul 2023 05:55:37 -1000 Message-Id: <636aab87bc7e10b4ce0bdaa00dd01416a590a801.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184023 From: Hitendra Prajapati Backport fixes for: * CVE-2020-27749 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=c6c426e5ab6ea715153b72584de6bd8c82f698ec && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=b1c9e9e889e4273fb15712051c887e6078511448 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=3d157bbd06506b170fde5ec23980c4bf9f7660e2 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=8bc817014ce3d7a498db44eae33c8b90e2430926 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=030fb6c4fa354cdbd6a8d6903dfed5d36eaf3cb2 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=4ea7bae51f97e49c84dc67ea30b466ca8633b9f6 * CVE-2021-20225 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=2a330dba93ff11bc00eda76e9419bc52b0c7ead6 * CVE-2021-20233 - Upstream-Status: Backport from https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=2f533a89a8dfcacbf2c9dbc77d910f111f24bf33 Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../grub/files/CVE-2020-27749.patch | 609 ++++++++++++++++++ .../grub/files/CVE-2021-20225.patch | 58 ++ .../grub/files/CVE-2021-20233.patch | 50 ++ meta/recipes-bsp/grub/grub2.inc | 3 + 4 files changed, 720 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/CVE-2020-27749.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2021-20225.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2021-20233.patch diff --git a/meta/recipes-bsp/grub/files/CVE-2020-27749.patch b/meta/recipes-bsp/grub/files/CVE-2020-27749.patch new file mode 100644 index 0000000000..a2566b2ded --- /dev/null +++ b/meta/recipes-bsp/grub/files/CVE-2020-27749.patch @@ -0,0 +1,609 @@ +From 4ea7bae51f97e49c84dc67ea30b466ca8633b9f6 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Thu, 7 Jan 2021 19:21:03 +0000 +Subject: kern/parser: Fix a stack buffer overflow + +grub_parser_split_cmdline() expands variable names present in the supplied +command line in to their corresponding variable contents and uses a 1 kiB +stack buffer for temporary storage without sufficient bounds checking. If +the function is called with a command line that references a variable with +a sufficiently large payload, it is possible to overflow the stack +buffer via tab completion, corrupt the stack frame and potentially +control execution. + +Fixes: CVE-2020-27749 + +Reported-by: Chris Coulson +Signed-off-by: Chris Coulson +Signed-off-by: Darren Kenny +Reviewed-by: Daniel Kiper + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=c6c426e5ab6ea715153b72584de6bd8c82f698ec && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=b1c9e9e889e4273fb15712051c887e6078511448 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=3d157bbd06506b170fde5ec23980c4bf9f7660e2 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=8bc817014ce3d7a498db44eae33c8b90e2430926 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=030fb6c4fa354cdbd6a8d6903dfed5d36eaf3cb2 && https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=4ea7bae51f97e49c84dc67ea30b466ca8633b9f6] +CVE: CVE-2020-27749 + +Signed-off-by: Hitendra Prajapati +--- + grub-core/Makefile.core.def | 1 + + grub-core/kern/buffer.c | 117 +++++++++++++++++++++ + grub-core/kern/parser.c | 204 +++++++++++++++++++++++------------- + include/grub/buffer.h | 144 +++++++++++++++++++++++++ + 4 files changed, 395 insertions(+), 71 deletions(-) + create mode 100644 grub-core/kern/buffer.c + create mode 100644 include/grub/buffer.h + +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index 651ea2a..823cd57 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -123,6 +123,7 @@ kernel = { + riscv32_efi_startup = kern/riscv/efi/startup.S; + riscv64_efi_startup = kern/riscv/efi/startup.S; + ++ common = kern/buffer.c; + common = kern/command.c; + common = kern/corecmd.c; + common = kern/device.c; +diff --git a/grub-core/kern/buffer.c b/grub-core/kern/buffer.c +new file mode 100644 +index 0000000..9f5f8b8 +--- /dev/null ++++ b/grub-core/kern/buffer.c +@@ -0,0 +1,117 @@ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2021 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see . ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++grub_buffer_t ++grub_buffer_new (grub_size_t sz) ++{ ++ struct grub_buffer *ret; ++ ++ ret = (struct grub_buffer *) grub_malloc (sizeof (*ret)); ++ if (ret == NULL) ++ return NULL; ++ ++ ret->data = (grub_uint8_t *) grub_malloc (sz); ++ if (ret->data == NULL) ++ { ++ grub_free (ret); ++ return NULL; ++ } ++ ++ ret->sz = sz; ++ ret->pos = 0; ++ ret->used = 0; ++ ++ return ret; ++} ++ ++void ++grub_buffer_free (grub_buffer_t buf) ++{ ++ grub_free (buf->data); ++ grub_free (buf); ++} ++ ++grub_err_t ++grub_buffer_ensure_space (grub_buffer_t buf, grub_size_t req) ++{ ++ grub_uint8_t *d; ++ grub_size_t newsz = 1; ++ ++ /* Is the current buffer size adequate? */ ++ if (buf->sz >= req) ++ return GRUB_ERR_NONE; ++ ++ /* Find the smallest power-of-2 size that satisfies the request. */ ++ while (newsz < req) ++ { ++ if (newsz == 0) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, ++ N_("requested buffer size is too large")); ++ newsz <<= 1; ++ } ++ ++ d = (grub_uint8_t *) grub_realloc (buf->data, newsz); ++ if (d == NULL) ++ return grub_errno; ++ ++ buf->data = d; ++ buf->sz = newsz; ++ ++ return GRUB_ERR_NONE; ++} ++ ++void * ++grub_buffer_take_data (grub_buffer_t buf) ++{ ++ void *data = buf->data; ++ ++ buf->data = NULL; ++ buf->sz = buf->pos = buf->used = 0; ++ ++ return data; ++} ++ ++void ++grub_buffer_reset (grub_buffer_t buf) ++{ ++ buf->pos = buf->used = 0; ++} ++ ++grub_err_t ++grub_buffer_advance_read_pos (grub_buffer_t buf, grub_size_t n) ++{ ++ grub_size_t newpos; ++ ++ if (grub_add (buf->pos, n, &newpos)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); ++ ++ if (newpos > buf->used) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, ++ N_("new read is position beyond the end of the written data")); ++ ++ buf->pos = newpos; ++ ++ return GRUB_ERR_NONE; ++} +diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c +index d1cf061..6ab7aa4 100644 +--- a/grub-core/kern/parser.c ++++ b/grub-core/kern/parser.c +@@ -1,7 +1,7 @@ + /* parser.c - the part of the parser that can return partial tokens */ + /* + * GRUB -- GRand Unified Bootloader +- * Copyright (C) 2005,2007,2009 Free Software Foundation, Inc. ++ * Copyright (C) 2005,2007,2009,2021 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -18,6 +18,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -107,8 +108,8 @@ check_varstate (grub_parser_state_t s) + } + + +-static void +-add_var (char *varname, char **bp, char **vp, ++static grub_err_t ++add_var (grub_buffer_t varname, grub_buffer_t buf, + grub_parser_state_t state, grub_parser_state_t newstate) + { + const char *val; +@@ -116,17 +117,74 @@ add_var (char *varname, char **bp, char **vp, + /* Check if a variable was being read in and the end of the name + was reached. */ + if (!(check_varstate (state) && !check_varstate (newstate))) +- return; ++ return GRUB_ERR_NONE; ++ ++ if (grub_buffer_append_char (varname, '\0') != GRUB_ERR_NONE) ++ return grub_errno; + +- *((*vp)++) = '\0'; +- val = grub_env_get (varname); +- *vp = varname; ++ val = grub_env_get ((const char *) grub_buffer_peek_data (varname)); ++ grub_buffer_reset (varname); + if (!val) +- return; ++ return GRUB_ERR_NONE; + + /* Insert the contents of the variable in the buffer. */ +- for (; *val; val++) +- *((*bp)++) = *val; ++ return grub_buffer_append_data (buf, val, grub_strlen (val)); ++} ++ ++static grub_err_t ++terminate_arg (grub_buffer_t buffer, int *argc) ++{ ++ grub_size_t unread = grub_buffer_get_unread_bytes (buffer); ++ ++ if (unread == 0) ++ return GRUB_ERR_NONE; ++ ++ if (*(const char *) grub_buffer_peek_data_at (buffer, unread - 1) == '\0') ++ return GRUB_ERR_NONE; ++ ++ if (grub_buffer_append_char (buffer, '\0') != GRUB_ERR_NONE) ++ return grub_errno; ++ ++ (*argc)++; ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_err_t ++process_char (char c, grub_buffer_t buffer, grub_buffer_t varname, ++ grub_parser_state_t state, int *argc, ++ grub_parser_state_t *newstate) ++{ ++ char use; ++ ++ *newstate = grub_parser_cmdline_state (state, c, &use); ++ ++ /* ++ * If a variable was being processed and this character does ++ * not describe the variable anymore, write the variable to ++ * the buffer. ++ */ ++ if (add_var (varname, buffer, state, *newstate) != GRUB_ERR_NONE) ++ return grub_errno; ++ ++ if (check_varstate (*newstate)) ++ { ++ if (use) ++ return grub_buffer_append_char (varname, use); ++ } ++ else if (*newstate == GRUB_PARSER_STATE_TEXT && ++ state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) ++ { ++ /* ++ * Don't add more than one argument if multiple ++ * spaces are used. ++ */ ++ return terminate_arg (buffer, argc); ++ } ++ else if (use) ++ return grub_buffer_append_char (buffer, use); ++ ++ return GRUB_ERR_NONE; + } + + grub_err_t +@@ -135,24 +193,36 @@ grub_parser_split_cmdline (const char *cmdline, + int *argc, char ***argv) + { + grub_parser_state_t state = GRUB_PARSER_STATE_TEXT; +- /* XXX: Fixed size buffer, perhaps this buffer should be dynamically +- allocated. */ +- char buffer[1024]; +- char *bp = buffer; ++ grub_buffer_t buffer, varname; + char *rd = (char *) cmdline; +- char varname[200]; +- char *vp = varname; +- char *args; ++ char *rp = rd; + int i; + + *argc = 0; + *argv = NULL; ++ ++ buffer = grub_buffer_new (1024); ++ if (buffer == NULL) ++ return grub_errno; ++ ++ varname = grub_buffer_new (200); ++ if (varname == NULL) ++ goto fail; ++ + do + { +- if (!rd || !*rd) ++ if (rp == NULL || *rp == '\0') + { ++ if (rd != cmdline) ++ { ++ grub_free (rd); ++ rd = rp = NULL; ++ } + if (getline) +- getline (&rd, 1, getline_data); ++ { ++ getline (&rd, 1, getline_data); ++ rp = rd; ++ } + else + break; + } +@@ -160,39 +230,14 @@ grub_parser_split_cmdline (const char *cmdline, + if (!rd) + break; + +- for (; *rd; rd++) ++ for (; *rp != '\0'; rp++) + { + grub_parser_state_t newstate; +- char use; + +- newstate = grub_parser_cmdline_state (state, *rd, &use); ++ if (process_char (*rp, buffer, varname, state, argc, ++ &newstate) != GRUB_ERR_NONE) ++ goto fail; + +- /* If a variable was being processed and this character does +- not describe the variable anymore, write the variable to +- the buffer. */ +- add_var (varname, &bp, &vp, state, newstate); +- +- if (check_varstate (newstate)) +- { +- if (use) +- *(vp++) = use; +- } +- else +- { +- if (newstate == GRUB_PARSER_STATE_TEXT +- && state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) +- { +- /* Don't add more than one argument if multiple +- spaces are used. */ +- if (bp != buffer && *(bp - 1)) +- { +- *(bp++) = '\0'; +- (*argc)++; +- } +- } +- else if (use) +- *(bp++) = use; +- } + state = newstate; + } + } +@@ -200,43 +245,60 @@ grub_parser_split_cmdline (const char *cmdline, + + /* A special case for when the last character was part of a + variable. */ +- add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); ++ if (add_var (varname, buffer, state, GRUB_PARSER_STATE_TEXT) != GRUB_ERR_NONE) ++ goto fail; + +- if (bp != buffer && *(bp - 1)) +- { +- *(bp++) = '\0'; +- (*argc)++; +- } ++ /* Ensure that the last argument is terminated. */ ++ if (terminate_arg (buffer, argc) != GRUB_ERR_NONE) ++ goto fail; + + /* If there are no args, then we're done. */ + if (!*argc) +- return 0; +- +- /* Reserve memory for the return values. */ +- args = grub_malloc (bp - buffer); +- if (!args) +- return grub_errno; +- grub_memcpy (args, buffer, bp - buffer); ++ { ++ grub_errno = GRUB_ERR_NONE; ++ goto out; ++ } + + *argv = grub_calloc (*argc + 1, sizeof (char *)); + if (!*argv) +- { +- grub_free (args); +- return grub_errno; +- } ++ goto fail; + + /* The arguments are separated with 0's, setup argv so it points to + the right values. */ +- bp = args; + for (i = 0; i < *argc; i++) + { +- (*argv)[i] = bp; +- while (*bp) +- bp++; +- bp++; ++ char *arg; ++ ++ if (i > 0) ++ { ++ if (grub_buffer_advance_read_pos (buffer, 1) != GRUB_ERR_NONE) ++ goto fail; ++ } ++ ++ arg = (char *) grub_buffer_peek_data (buffer); ++ if (arg == NULL || ++ grub_buffer_advance_read_pos (buffer, grub_strlen (arg)) != GRUB_ERR_NONE) ++ goto fail; ++ ++ (*argv)[i] = arg; + } + +- return 0; ++ /* Keep memory for the return values. */ ++ grub_buffer_take_data (buffer); ++ ++ grub_errno = GRUB_ERR_NONE; ++ ++ out: ++ if (rd != cmdline) ++ grub_free (rd); ++ grub_buffer_free (buffer); ++ grub_buffer_free (varname); ++ ++ return grub_errno; ++ ++ fail: ++ grub_free (*argv); ++ goto out; + } + + /* Helper for grub_parser_execute. */ +diff --git a/include/grub/buffer.h b/include/grub/buffer.h +new file mode 100644 +index 0000000..f4b10cf +--- /dev/null ++++ b/include/grub/buffer.h +@@ -0,0 +1,144 @@ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2021 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see . ++ */ ++ ++#ifndef GRUB_BUFFER_H ++#define GRUB_BUFFER_H 1 ++ ++#include ++#include ++#include ++#include ++#include ++ ++struct grub_buffer ++{ ++ grub_uint8_t *data; ++ grub_size_t sz; ++ grub_size_t pos; ++ grub_size_t used; ++}; ++ ++/* ++ * grub_buffer_t represents a simple variable sized byte buffer with ++ * read and write cursors. It currently only implements ++ * functionality required by the only user in GRUB (append byte[s], ++ * peeking data at a specified position and updating the read cursor. ++ * Some things that this doesn't do yet are: ++ * - Reading a portion of the buffer by copying data from the current ++ * read position in to a caller supplied destination buffer and then ++ * automatically updating the read cursor. ++ * - Dropping the read part at the start of the buffer when an append ++ * requires more space. ++ */ ++typedef struct grub_buffer *grub_buffer_t; ++ ++/* Allocate a new buffer with the specified initial size. */ ++extern grub_buffer_t grub_buffer_new (grub_size_t sz); ++ ++/* Free the buffer and its resources. */ ++extern void grub_buffer_free (grub_buffer_t buf); ++ ++/* Return the number of unread bytes in this buffer. */ ++static inline grub_size_t ++grub_buffer_get_unread_bytes (grub_buffer_t buf) ++{ ++ return buf->used - buf->pos; ++} ++ ++/* ++ * Ensure that the buffer size is at least the requested ++ * number of bytes. ++ */ ++extern grub_err_t grub_buffer_ensure_space (grub_buffer_t buf, grub_size_t req); ++ ++/* ++ * Append the specified number of bytes from the supplied ++ * data to the buffer. ++ */ ++static inline grub_err_t ++grub_buffer_append_data (grub_buffer_t buf, const void *data, grub_size_t len) ++{ ++ grub_size_t req; ++ ++ if (grub_add (buf->used, len, &req)) ++ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); ++ ++ if (grub_buffer_ensure_space (buf, req) != GRUB_ERR_NONE) ++ return grub_errno; ++ ++ grub_memcpy (&buf->data[buf->used], data, len); ++ buf->used = req; ++ ++ return GRUB_ERR_NONE; ++} ++ ++/* Append the supplied character to the buffer. */ ++static inline grub_err_t ++grub_buffer_append_char (grub_buffer_t buf, char c) ++{ ++ return grub_buffer_append_data (buf, &c, 1); ++} ++ ++/* ++ * Forget and return the underlying data buffer. The caller ++ * becomes the owner of this buffer, and must free it when it ++ * is no longer required. ++ */ ++extern void *grub_buffer_take_data (grub_buffer_t buf); ++ ++/* Reset this buffer. Note that this does not deallocate any resources. */ ++void grub_buffer_reset (grub_buffer_t buf); ++ ++/* ++ * Return a pointer to the underlying data buffer at the specified ++ * offset from the current read position. Note that this pointer may ++ * become invalid if the buffer is mutated further. ++ */ ++static inline void * ++grub_buffer_peek_data_at (grub_buffer_t buf, grub_size_t off) ++{ ++ if (grub_add (buf->pos, off, &off)) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected.")); ++ return NULL; ++ } ++ ++ if (off >= buf->used) ++ { ++ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("peek out of range")); ++ return NULL; ++ } ++ ++ return &buf->data[off]; ++} ++ ++/* ++ * Return a pointer to the underlying data buffer at the current ++ * read position. Note that this pointer may become invalid if the ++ * buffer is mutated further. ++ */ ++static inline void * ++grub_buffer_peek_data (grub_buffer_t buf) ++{ ++ return grub_buffer_peek_data_at (buf, 0); ++} ++ ++/* Advance the read position by the specified number of bytes. */ ++extern grub_err_t grub_buffer_advance_read_pos (grub_buffer_t buf, grub_size_t n); ++ ++#endif /* GRUB_BUFFER_H */ +-- +2.25.1 + diff --git a/meta/recipes-bsp/grub/files/CVE-2021-20225.patch b/meta/recipes-bsp/grub/files/CVE-2021-20225.patch new file mode 100644 index 0000000000..b864febe62 --- /dev/null +++ b/meta/recipes-bsp/grub/files/CVE-2021-20225.patch @@ -0,0 +1,58 @@ +From 2a330dba93ff11bc00eda76e9419bc52b0c7ead6 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Fri, 22 Jan 2021 16:07:29 +1100 +Subject: lib/arg: Block repeated short options that require an argument + +Fuzzing found the following crash: + + search -hhhhhhhhhhhhhf + +We didn't allocate enough option space for 13 hints because the +allocation code counts the number of discrete arguments (i.e. argc). +However, the shortopt parsing code will happily keep processing +a combination of short options without checking if those short +options require an argument. This means you can easily end writing +past the allocated option space. + +This fixes a OOB write which can cause heap corruption. + +Fixes: CVE-2021-20225 + +Reported-by: Daniel Axtens +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=2a330dba93ff11bc00eda76e9419bc52b0c7ead6] +CVE: CVE-2021-20225 +Signed-off-by: Hitendra Prajapati +--- + grub-core/lib/arg.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c +index 3288609..537c5e9 100644 +--- a/grub-core/lib/arg.c ++++ b/grub-core/lib/arg.c +@@ -299,6 +299,19 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv, + it can have an argument value. */ + if (*curshort) + { ++ /* ++ * Only permit further short opts if this one doesn't ++ * require a value. ++ */ ++ if (opt->type != ARG_TYPE_NONE && ++ !(opt->flags & GRUB_ARG_OPTION_OPTIONAL)) ++ { ++ grub_error (GRUB_ERR_BAD_ARGUMENT, ++ N_("missing mandatory option for `%s'"), ++ opt->longarg); ++ goto fail; ++ } ++ + if (parse_option (cmd, opt, 0, usr) || grub_errno) + goto fail; + } +-- +2.25.1 + diff --git a/meta/recipes-bsp/grub/files/CVE-2021-20233.patch b/meta/recipes-bsp/grub/files/CVE-2021-20233.patch new file mode 100644 index 0000000000..d2069afc18 --- /dev/null +++ b/meta/recipes-bsp/grub/files/CVE-2021-20233.patch @@ -0,0 +1,50 @@ +From 2f533a89a8dfcacbf2c9dbc77d910f111f24bf33 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Fri, 22 Jan 2021 17:10:48 +1100 +Subject: commands/menuentry: Fix quoting in setparams_prefix() + +Commit 9acdcbf32542 (use single quotes in menuentry setparams command) +says that expressing a quoted single quote will require 3 characters. It +actually requires (and always did require!) 4 characters: + + str: a'b => a'\''b + len: 3 => 6 (2 for the letters + 4 for the quote) + +This leads to not allocating enough memory and thus out of bounds writes +that have been observed to cause heap corruption. + +Allocate 4 bytes for each single quote. + +Commit 22e7dbb2bb81 (Fix quoting in legacy parser.) does the same +quoting, but it adds 3 as extra overhead on top of the single byte that +the quote already needs. So it's correct. + +Fixes: 9acdcbf32542 (use single quotes in menuentry setparams command) +Fixes: CVE-2021-20233 + +Reported-by: Daniel Axtens +Signed-off-by: Daniel Axtens + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?h=grub-2.06&id=2f533a89a8dfcacbf2c9dbc77d910f111f24bf33] +CVE: CVE-2021-20233 +Signed-off-by: Hitendra Prajapati +--- + grub-core/commands/menuentry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c +index 9164df7..720e6d8 100644 +--- a/grub-core/commands/menuentry.c ++++ b/grub-core/commands/menuentry.c +@@ -230,7 +230,7 @@ setparams_prefix (int argc, char **args) + len += 3; /* 3 = 1 space + 2 quotes */ + p = args[i]; + while (*p) +- len += (*p++ == '\'' ? 3 : 1); ++ len += (*p++ == '\'' ? 4 : 1); + } + + result = grub_malloc (len + 2); +-- +2.25.1 + diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index d09eecd8ac..5a6e213936 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -106,6 +106,9 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch \ file://CVE-2022-2601.patch \ file://CVE-2022-3775.patch \ + file://CVE-2020-27749.patch \ + file://CVE-2021-20225.patch \ + file://CVE-2021-20233.patch \ " SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" From patchwork Sat Jul 8 15:55:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27097 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 93982C0015E for ; Sat, 8 Jul 2023 15:56:17 +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.344.1688831768170936859 for ; Sat, 08 Jul 2023 08:56:08 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Bf/LPCGv; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-262e3c597b9so2162949a91.0 for ; Sat, 08 Jul 2023 08:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831767; x=1691423767; 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=KwNFE5OtSJVXxMhggnLOIPwBVMc2N1TI5YUWhzpsSVk=; b=Bf/LPCGvOk+DNY53YYwVG6cSUcWBw4yny0+1ZJSeSgPXJOm3ADOTBDtil10yvwCylI Xe05/HSGHH7/3K5BaLVQpj460NF+V0NXnWaDpvWq5cqqMcmBR56rC7QnY/Lhrknp2NQD o/8oOwivcFazF9Ea+Tx+XC/tRhuiYqmNW8p+G+XChDUTwaF3i/BP07mWGfcfLzEsL5R8 JY6WSFtHwOKEFNdSmqJK+HtvHAt8Ytcxrc1AskdcjTokwuxC21CsUX9bAYjuzvApIQYg HlqiYUyP9rI9yxvSgcKXGtxcJXMS4AOrNU5SgmXmJI17qBwGw7EPLulJ0EslvM0Fw8bx 6pNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831767; x=1691423767; 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=KwNFE5OtSJVXxMhggnLOIPwBVMc2N1TI5YUWhzpsSVk=; b=RAa3dviCdYc1f6QwrevZ95z43WRRqerkPwkK4JOp9YYwe0bRlLnR7RyT9724ZnPXLs hhP0k5vtzbGNkrAvcvINpX+mk5XEYywss1JxXBEYi5lfhKMLGc6NkkE4u2JfD/9fMDW0 JpyjyJ0mRGhpPnT+Dbz2Uzozc2edEmtDDqW0cqVBm0rgqDdvYx4yWQcFdftoRsZ5mto1 3FOnreGd1FD4+mMriNW2LrRZi0st2f4ku4BvmiiQFEprSxMUCz7kUggiZ1mryhb9lrC8 dUz3P7BII2fAQ582CpfkuLJIJJ4SsGGrxbqXz7vY6/MHm3wN3LwnsymiJSDWv3BNEUEb pVAQ== X-Gm-Message-State: ABy/qLbnBeCQCLDUA+focXiogXPQbG7FnnEtYXu3iDhBs4Bsz49DWvth 9mmm5O8juycMG0AjJjfsx2AsY2N79x4wk8cNfus= X-Google-Smtp-Source: APBJJlHog99SeJW0M+tsV/P1X7aI8/QXR6XlDNSjpA+s/sCF2mqyFHQ4ueRlo2g66+6CGkp4/G6j+Q== X-Received: by 2002:a17:90a:a182:b0:263:6e10:7cdd with SMTP id t2-20020a17090aa18200b002636e107cddmr8004103pjp.38.1688831766873; Sat, 08 Jul 2023 08:56:06 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/17] python3: upgrade to 3.8.17 Date: Sat, 8 Jul 2023 05:55:38 -1000 Message-Id: <01a1f016a6558566a36098a993adaf4b40e30c78.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184024 From: Chee Yang Lee License-Update: update year to 2023 https://github.com/python/cpython/commit/30afa75ad8deca57a2bd0218f8fd6b3437c89507 Release Notes for 3.8.15: Security content in this release CVE-2022-40674: bundled libexpat was upgraded from 2.4.7 to 2.4.9 which fixes a heap use-after-free vulnerability in function doContent gh-97616: a fix for a possible buffer overflow in list *= int gh-97612: a fix for possible shell injection in the example script get-remote-certificate.py (this issue originally had a CVE assigned to it, which its author withdrew) gh-96577: a fix for a potential buffer overrun in msilib https://www.python.org/downloads/release/python-3815/ Release Notes for 3.8.16: Security content in this release gh-98739: Updated bundled libexpat to 2.5.0 to fix CVE-2022-43680 (heap use-after-free). gh-98517: Port XKCP’s fix for the buffer overflows in SHA-3 to fix CVE-2022-37454. gh-98433: The IDNA codec decoder used on DNS hostnames by socket or asyncio related name resolution functions no longer involves a quadratic algorithm to fix CVE-2022-45061. This prevents a potential CPU denial of service if an out-of-spec excessive length hostname involving bidirectional characters were decoded. Some protocols such as urllib http 3xx redirects potentially allow for an attacker to supply such a name. gh-68966: The deprecated mailcap module now refuses to inject unsafe text (filenames, MIME types, parameters) into shell commands to address CVE-2015-20107. Instead of using such text, it will warn and act as if a match was not found (or for test commands, as if the test failed). gh-100001: python -m http.server no longer allows terminal control characters sent within a garbage request to be printed to the stderr server log. gh-87604: Avoid publishing list of active per-interpreter audit hooks via the gc module. https://www.python.org/downloads/release/python-3816/ Release Notes for 3.8.17: Security content in this release gh-103142: The version of OpenSSL used in Windows and Mac installers has been upgraded to 1.1.1u to address CVE-2023-2650, CVE-2023-0465, CVE-2023-0466, CVE-2023-0464, as well as CVE-2023-0286, CVE-2022-4303, and CVE-2022-4303 fixed previously in 1.1.1t (gh-101727). gh-102153: urllib.parse.urlsplit() now strips leading C0 control and space characters following the specification for URLs defined by WHATWG in response to CVE-2023-24329. gh-99889: Fixed a security in flaw in uu.decode() that could allow for directory traversal based on the input if no out_file was specified. gh-104049: Do not expose the local on-disk location in directory indexes produced by http.client.SimpleHTTPRequestHandler. gh-103935: trace.__main__ now uses io.open_code() for files to be executed instead of raw open(). gh-101283: subprocess.Popen now uses a safer approach to find cmd.exe when launching with shell=True. gh-102953: The extraction methods in tarfile, and shutil.unpack_archive(), have a new filter argument that allows limiting tar features than may be surprising or dangerous, such as creating files outside the destination directory. See Extraction filters for details. https://www.python.org/downloads/release/python-3817/ Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- .../python/files/CVE-2022-45061.patch | 100 ----------------- .../python/python3/CVE-2022-37454.patch | 105 ------------------ .../{python3_3.8.14.bb => python3_3.8.17.bb} | 8 +- 3 files changed, 3 insertions(+), 210 deletions(-) delete mode 100644 meta/recipes-devtools/python/files/CVE-2022-45061.patch delete mode 100644 meta/recipes-devtools/python/python3/CVE-2022-37454.patch rename meta/recipes-devtools/python/{python3_3.8.14.bb => python3_3.8.17.bb} (98%) diff --git a/meta/recipes-devtools/python/files/CVE-2022-45061.patch b/meta/recipes-devtools/python/files/CVE-2022-45061.patch deleted file mode 100644 index 647bf59908..0000000000 --- a/meta/recipes-devtools/python/files/CVE-2022-45061.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 064ec20bf7a181ba5fa961aaa12973812aa6ca5d Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Mon, 7 Nov 2022 18:57:10 -0800 -Subject: [PATCH] [3.11] gh-98433: Fix quadratic time idna decoding. (GH-99092) - (GH-99222) - -There was an unnecessary quadratic loop in idna decoding. This restores -the behavior to linear. - -(cherry picked from commit d315722564927c7202dd6e111dc79eaf14240b0d) - -(cherry picked from commit a6f6c3a3d6f2b580f2d87885c9b8a9350ad7bf15) - -Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> -Co-authored-by: Gregory P. Smith - -CVE: CVE-2022-45061 -Upstream-Status: Backport [https://github.com/python/cpython/pull/99231/commits/064ec20bf7a181ba5fa961aaa12973812aa6ca5d] -Signed-off-by: Omkar Patil - ---- - Lib/encodings/idna.py | 32 +++++++++---------- - Lib/test/test_codecs.py | 6 ++++ - ...2-11-04-09-29-36.gh-issue-98433.l76c5G.rst | 6 ++++ - 3 files changed, 27 insertions(+), 17 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2022-11-04-09-29-36.gh-issue-98433.l76c5G.rst - -diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py -index ea4058512fe3..bf98f513366b 100644 ---- a/Lib/encodings/idna.py -+++ b/Lib/encodings/idna.py -@@ -39,23 +39,21 @@ def nameprep(label): - - # Check bidi - RandAL = [stringprep.in_table_d1(x) for x in label] -- for c in RandAL: -- if c: -- # There is a RandAL char in the string. Must perform further -- # tests: -- # 1) The characters in section 5.8 MUST be prohibited. -- # This is table C.8, which was already checked -- # 2) If a string contains any RandALCat character, the string -- # MUST NOT contain any LCat character. -- if any(stringprep.in_table_d2(x) for x in label): -- raise UnicodeError("Violation of BIDI requirement 2") -- -- # 3) If a string contains any RandALCat character, a -- # RandALCat character MUST be the first character of the -- # string, and a RandALCat character MUST be the last -- # character of the string. -- if not RandAL[0] or not RandAL[-1]: -- raise UnicodeError("Violation of BIDI requirement 3") -+ if any(RandAL): -+ # There is a RandAL char in the string. Must perform further -+ # tests: -+ # 1) The characters in section 5.8 MUST be prohibited. -+ # This is table C.8, which was already checked -+ # 2) If a string contains any RandALCat character, the string -+ # MUST NOT contain any LCat character. -+ if any(stringprep.in_table_d2(x) for x in label): -+ raise UnicodeError("Violation of BIDI requirement 2") -+ # 3) If a string contains any RandALCat character, a -+ # RandALCat character MUST be the first character of the -+ # string, and a RandALCat character MUST be the last -+ # character of the string. -+ if not RandAL[0] or not RandAL[-1]: -+ raise UnicodeError("Violation of BIDI requirement 3") - - return label - -diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py -index d1faf0126c1e..37ade7d80d02 100644 ---- a/Lib/test/test_codecs.py -+++ b/Lib/test/test_codecs.py -@@ -1532,6 +1532,12 @@ def test_builtin_encode(self): - self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org") - self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.") - -+ def test_builtin_decode_length_limit(self): -+ with self.assertRaisesRegex(UnicodeError, "too long"): -+ (b"xn--016c"+b"a"*1100).decode("idna") -+ with self.assertRaisesRegex(UnicodeError, "too long"): -+ (b"xn--016c"+b"a"*70).decode("idna") -+ - def test_stream(self): - r = codecs.getreader("idna")(io.BytesIO(b"abc")) - r.read(3) -diff --git a/Misc/NEWS.d/next/Security/2022-11-04-09-29-36.gh-issue-98433.l76c5G.rst b/Misc/NEWS.d/next/Security/2022-11-04-09-29-36.gh-issue-98433.l76c5G.rst -new file mode 100644 -index 000000000000..5185fac2e29d ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2022-11-04-09-29-36.gh-issue-98433.l76c5G.rst -@@ -0,0 +1,6 @@ -+The IDNA codec decoder used on DNS hostnames by :mod:`socket` or :mod:`asyncio` -+related name resolution functions no longer involves a quadratic algorithm. -+This prevents a potential CPU denial of service if an out-of-spec excessive -+length hostname involving bidirectional characters were decoded. Some protocols -+such as :mod:`urllib` http ``3xx`` redirects potentially allow for an attacker -+to supply such a name. diff --git a/meta/recipes-devtools/python/python3/CVE-2022-37454.patch b/meta/recipes-devtools/python/python3/CVE-2022-37454.patch deleted file mode 100644 index a41cc301e2..0000000000 --- a/meta/recipes-devtools/python/python3/CVE-2022-37454.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 948c6794711458fd148a3fa62296cadeeb2ed631 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Fri, 28 Oct 2022 03:07:50 -0700 -Subject: [PATCH] [3.8] gh-98517: Fix buffer overflows in _sha3 module - (GH-98519) (#98527) - -This is a port of the applicable part of XKCP's fix [1] for -CVE-2022-37454 and avoids the segmentation fault and the infinite -loop in the test cases published in [2]. - -[1]: https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a -[2]: https://mouha.be/sha-3-buffer-overflow/ - -Regression test added by: Gregory P. Smith [Google LLC] -(cherry picked from commit 0e4e058602d93b88256ff90bbef501ba20be9dd3) - -Co-authored-by: Theo Buehler - -CVE: CVE-2022-37454 -Upstream-Status: Backport [https://github.com/python/cpython/commit/948c6794711458fd148a3fa62296cadeeb2ed631] -Signed-off-by: Pawan Badganchi ---- - Lib/test/test_hashlib.py | 9 +++++++++ - .../2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst | 1 + - Modules/_sha3/kcp/KeccakSponge.inc | 15 ++++++++------- - 3 files changed, 18 insertions(+), 7 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst - -diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py -index 8b53d23ef525..e6cec4e306e5 100644 ---- a/Lib/test/test_hashlib.py -+++ b/Lib/test/test_hashlib.py -@@ -434,6 +434,15 @@ def test_case_md5_huge(self, size): - def test_case_md5_uintmax(self, size): - self.check('md5', b'A'*size, '28138d306ff1b8281f1a9067e1a1a2b3') - -+ @unittest.skipIf(sys.maxsize < _4G - 1, 'test cannot run on 32-bit systems') -+ @bigmemtest(size=_4G - 1, memuse=1, dry_run=False) -+ def test_sha3_update_overflow(self, size): -+ """Regression test for gh-98517 CVE-2022-37454.""" -+ h = hashlib.sha3_224() -+ h.update(b'\x01') -+ h.update(b'\x01'*0xffff_ffff) -+ self.assertEqual(h.hexdigest(), '80762e8ce6700f114fec0f621fd97c4b9c00147fa052215294cceeed') -+ - # use the three examples from Federal Information Processing Standards - # Publication 180-1, Secure Hash Standard, 1995 April 17 - # http://www.itl.nist.gov/div897/pubs/fip180-1.htm -diff --git a/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -new file mode 100644 -index 000000000000..2d23a6ad93c7 ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2022-10-21-13-31-47.gh-issue-98517.SXXGfV.rst -@@ -0,0 +1 @@ -+Port XKCP's fix for the buffer overflows in SHA-3 (CVE-2022-37454). -diff --git a/Modules/_sha3/kcp/KeccakSponge.inc b/Modules/_sha3/kcp/KeccakSponge.inc -index e10739deafa8..cf92e4db4d36 100644 ---- a/Modules/_sha3/kcp/KeccakSponge.inc -+++ b/Modules/_sha3/kcp/KeccakSponge.inc -@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) { - #ifdef SnP_FastLoop_Absorb - /* processing full blocks first */ - -@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsigned char *data, size_t dat - } - else { - /* normal lane: using the message queue */ -- -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - #ifdef KeccakReference - displayBytes(1, "Block to be absorbed (part)", curData, partialBlock); - #endif -@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - i = 0; - curData = data; - while(i < dataByteLen) { -- if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + rateInBytes))) { -+ if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= rateInBytes)) { - for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) { - SnP_Permute(instance->state); - SnP_ExtractBytes(instance->state, curData, 0, rateInBytes); -@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned char *data, size_t dataByte - SnP_Permute(instance->state); - instance->byteIOIndex = 0; - } -- partialBlock = (unsigned int)(dataByteLen - i); -- if (partialBlock+instance->byteIOIndex > rateInBytes) -+ if (dataByteLen-i > rateInBytes-instance->byteIOIndex) - partialBlock = rateInBytes-instance->byteIOIndex; -+ else -+ partialBlock = (unsigned int)(dataByteLen - i); - i += partialBlock; - - SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, partialBlock); diff --git a/meta/recipes-devtools/python/python3_3.8.14.bb b/meta/recipes-devtools/python/python3_3.8.17.bb similarity index 98% rename from meta/recipes-devtools/python/python3_3.8.14.bb rename to meta/recipes-devtools/python/python3_3.8.17.bb index 960e41aced..ba5f564d8e 100644 --- a/meta/recipes-devtools/python/python3_3.8.14.bb +++ b/meta/recipes-devtools/python/python3_3.8.17.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly LICENSE = "PSF-2.0 & BSD-0-Clause" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c84eccf626bb6fde43e6ea5e28d8feb5" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07fc4b9a9c0c0e48050ed38a5e72552b" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \ @@ -34,8 +34,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://makerace.patch \ - file://CVE-2022-45061.patch \ - file://CVE-2022-37454.patch \ " SRC_URI_append_class-native = " \ @@ -44,8 +42,8 @@ SRC_URI_append_class-native = " \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[md5sum] = "78710eed185b71f4198d354502ff62c9" -SRC_URI[sha256sum] = "5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3" +SRC_URI[md5sum] = "70223497e664524303ca2364208647e1" +SRC_URI[sha256sum] = "2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" From patchwork Sat Jul 8 15:55:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27094 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 A3205C001DF for ; Sat, 8 Jul 2023 15:56:17 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.334.1688831769738808088 for ; Sat, 08 Jul 2023 08:56:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=e59Yv3Tl; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-55b22f82ac8so2666858a12.1 for ; Sat, 08 Jul 2023 08:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831769; x=1691423769; 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=ZmmogTFLL4oQS0DV6JnOIMSKXocWeCPp3enqdNjH7kc=; b=e59Yv3Tl6Njx1ajUMy9cV4zIKct6hbgP4YFYapAB5eF4zud1h/q5KdVdM+u9EbqjiX JiLbL4vXnjkoTQ6wmXeeA0bDdNnYXqBwZ22eR+pD3nYag2I6RnjGe5spnMkDMKVV3F7O k6wI+0GmJ+wE0dvtgnEbHH07NBme44t/T75aAQKnk7aMmHR6q26X2gAuRqTdyWs8YpRQ 6wC9VTzbPcyT1s0flwHj4P418ZQqP+79xhq888eyiREKR/KqkYwxHT71Q13s01uI0EVx IQMxJGdTLZfQBC/equWkdKew+B/V9rkRI3sQgd2LxBRGhccwXcWO903jtXBaoCNBVNJ3 1SQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831769; x=1691423769; 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=ZmmogTFLL4oQS0DV6JnOIMSKXocWeCPp3enqdNjH7kc=; b=M+YsZ1UDA5Ck21+/h6QoZc8dZQ2WqUGHkfpjuahdw4NHORJwRBMCjr/T8BZ20pdw67 Cwxk3VtA9Axt7PhvFZYNnADFfw7ny9CxzYzdVYGh9p66F2pMxxLpCd7YkmSCoSIm0bdj +WnYhCo3N4raW9SjqwqQIghRE2PSnyXZhKtSClfOxU8H5iT1ZIhzaIFTnbKieZypziFU lNZ8/xb6Pjo8pNo7B/heKIQUAz5dKz100/XBFu+liUD7Mk7Zfuh2kb/Worzcn0fLYC2s Fr6khTY1ja60WuNo5ww+vFYsVCuQJy9sb3663IE+J3P4GLRye6obhVw84QpqzCcaVpea 1YFg== X-Gm-Message-State: ABy/qLY51joTm9W00fRJL5pQ3qD0sryEbSbeHvj6mvNKSrdtGfgohfr3 /oBOr+23QArxJXw0o0KbssV4ac6Moz3SYz5LF1o= X-Google-Smtp-Source: APBJJlE5tW/Dr/+RrfGA/BzpdzqS35VO9hl1WoU3fyJrPZkYVBWGQ08mxZdakhdHhqk52Ug2N+88JQ== X-Received: by 2002:a17:90a:8a14:b0:261:219b:13b3 with SMTP id w20-20020a17090a8a1400b00261219b13b3mr12445309pjn.16.1688831768761; Sat, 08 Jul 2023 08:56:08 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/17] mobile-broadband-provider-info: upgrade 20221107 -> 20230416 Date: Sat, 8 Jul 2023 05:55:39 -1000 Message-Id: <698a70eab4384ee4938cb4550fa8469d62db786b.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184025 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 125f72393c9b6fea02757cdc3a22696945e0f490) Signed-off-by: Steve Sakoman --- .../mobile-broadband-provider-info_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index e802bcee18..a4030b7b32 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -5,8 +5,8 @@ SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "22a5de3ef637990ce03141f786fbdb327e9c5a3f" -PV = "20221107" +SRCREV = "aae7c68671d225e6d35224613d5b98192b9b2ffe" +PV = "20230416" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" From patchwork Sat Jul 8 15:55:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27096 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 A3E60C001E0 for ; Sat, 8 Jul 2023 15:56:17 +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.web10.337.1688831771665086338 for ; Sat, 08 Jul 2023 08:56:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=OY228a3s; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-262d9e75438so2136636a91.2 for ; Sat, 08 Jul 2023 08:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831771; x=1691423771; 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=jW75ezQsxhrtvA1jS2bv79tNC48t6Dl8jIUQGgXvDR8=; b=OY228a3s4A2Z9SNHxc3BR5Q/rcXajIfFXpHesF0Ot8hX4ZPgBXTOQKqeJw/eOKvQI9 HMstloKwm0hPrd482UdeelTNbr0fAeMmlI3usWCGTrv0cD8BEQrQauuvlHc2r0XRppBk K3C0EfAwc7VCV1oMB9MVw+KYTuO4p8hw/u9tBfXFMJk9DILhU2moJumUQcqn4Ir439ez rbnpAN2Vu7cZyV2hcdKvw4Vl9wnUDjW3kCN/Ze0nJvZLKzrAeWX8HEzEiu0+jBeZZVJi E2jZmltUGOm4ipytcfNygSqPoHRYiIF+vkvKGrI7th/4OzZCwrEY0V3JGeJAQzNOeElZ VGzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831771; x=1691423771; 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=jW75ezQsxhrtvA1jS2bv79tNC48t6Dl8jIUQGgXvDR8=; b=JV0BJ1frKdc0cqEMp6GbxSDgGkKgNkDJZr2tfn0Q24a4sLVfqheFzU9cD+o4bmnkdE fNYD3jPpNDA9uqrHs1MHoI2HGQRBYt+AQ7YAV0cx17xsjSufcHS5ENFd+vkzea+D8ZGw JvcPmevy8DBNIJHxLDGJ8QGWkegtcyIsfcGa3OKlC39iK4RBXOYJg748hmVsFCZjrYv8 ofVUn5Y+It+osw4iu690Hbi9fV3vmEDqZodhCsF01Ruhs0sU81dETtNyQ46JsXrBV9oD Iaqrth7JHJVqshYLdStLfmpsSWqHlAvHaE8Bqo19WYKi+5ju7iurz9hsLTguXkebSJ/x HTeQ== X-Gm-Message-State: ABy/qLafrf/rmTRRy25zAlXWItYK2gdUn2JefA3M0FQImTE7EKRcLpfW jT9gdN6wm2w7oKiXkVNduV7dsJt7pDcbXg1ig7k= X-Google-Smtp-Source: APBJJlHp7Pkg2ZPCGEegx34yTOZyDE7XWAkGrKWoOsTgQzS9QpSKkbAOvu1aiwBdfmruQ/PwqgJ7kA== X-Received: by 2002:a17:90a:8804:b0:25b:be3a:e6ae with SMTP id s4-20020a17090a880400b0025bbe3ae6aemr7899174pjn.18.1688831770637; Sat, 08 Jul 2023 08:56:10 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/17] oe-depends-dot: Handle new format for task-depends.dot Date: Sat, 8 Jul 2023 05:55:40 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184026 From: Rusty Howell The .dot file created by `bitbake -g` changed formats a while ago, which broke oe-depends-dot. Also add some useful examples to the --help output. Signed-off-by: Rusty Howell Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- scripts/oe-depends-dot | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/scripts/oe-depends-dot b/scripts/oe-depends-dot index 5eb3e12769..1c2d51c6ec 100755 --- a/scripts/oe-depends-dot +++ b/scripts/oe-depends-dot @@ -15,7 +15,7 @@ class Dot(object): def __init__(self): parser = argparse.ArgumentParser( description="Analyse recipe-depends.dot generated by bitbake -g", - epilog="Use %(prog)s --help to get help") + formatter_class=argparse.RawDescriptionHelpFormatter) parser.add_argument("dotfile", help = "Specify the dotfile", nargs = 1, action='store', default='') parser.add_argument("-k", "--key", @@ -32,6 +32,21 @@ class Dot(object): " For example, A->B, B->C, A->C, then A->C can be removed.", action="store_true", default=False) + parser.epilog = """ +Examples: +First generate the .dot file: + bitbake -g core-image-minimal + +To find out why a package is being built: + %(prog)s -k -w ./task-depends.dot + +To find out what a package depends on: + %(prog)s -k -d ./task-depends.dot + +Reduce the .dot file packages only, no tasks: + %(prog)s -r ./task-depends.dot +""" + self.args = parser.parse_args() if len(sys.argv) != 3 and len(sys.argv) < 5: @@ -99,6 +114,10 @@ class Dot(object): if key == "meta-world-pkgdata": continue dep = m.group(2) + key = key.split('.')[0] + dep = dep.split('.')[0] + if key == dep: + continue if key in depends: if not key in depends[key]: depends[key].add(dep) From patchwork Sat Jul 8 15:55:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27092 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 93225EB64DC for ; Sat, 8 Jul 2023 15:56:17 +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.346.1688831773618922522 for ; Sat, 08 Jul 2023 08:56:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=e1jnPuGU; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b89b75dc1cso27354755ad.1 for ; Sat, 08 Jul 2023 08:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831773; x=1691423773; 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=C1othMzndnIsqU8PnqUxvHHUk7tQYeerePij3/F/r1w=; b=e1jnPuGUBaWvyXnoMLwVcoGeuEsAV1BMvo24aBZnOUowNVZx4uW7iTDmEE7VmEqD/L YDi09PW0SEVWv1EGYv71w2e/rvYB37Fg/I0K3XpHwvH5fRjfZypDjAOcjLmmn0I80KKR opb2AEpeVbH9OynB77vjKQ10HYoyFiTcnm91xwmyZIn2MbSs4JPEA7d0GnNDcpQxy9SV QP3Etvw5X6heqLynH1nxJySOWMuq0PkmC5VY5bZuZcI0GDsy5+MDJXXJ4BM+p8uv8eIu QtfEDlUHcd08xqCvh6lkE2t//EO/+LU1MwWAVLQSxLY7EAirfoIg4ImU4TbY9z5eU9SY UE+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831773; x=1691423773; 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=C1othMzndnIsqU8PnqUxvHHUk7tQYeerePij3/F/r1w=; b=ZeoXXATp8iGkg5XtgKFN9O+tAyaippwFKzrw5tlN+bAVJzJuWEGoM+6BIbITe3uEpa npuXuwwTPJ4soeOPvQxZV4e5Osf3haWGb6EKZcGDi/jHrpYv/hh5p+i+AXKw7Vtc9ScR GjNy9DyzXHw/DeFJECxoFuhzkpZXucPqgwDjD2bI9Zo3RLkrAXFH4/fOalh9vnd/arhu DubfukiMRM6RSsAvk7W1GRYdV6eCRqkgHak3mkSaz0hHvd7exuw9Ejoqr5chGTPNtBaJ 56JLcwb/AwEm4jpz0N+jrqaV6q2NxAQPSAPZt2/aUdKfuqDsuNOW2TBj9QTM2yc7UhPv bH1Q== X-Gm-Message-State: ABy/qLZ9OQ2uOqPRJCcjc2svWMHcyzeUnb0rrxGWlwG+LwW3pTIamM8S PF76GVy6e4XVPJtDm6p3ptKz/vyDdsS40baxpBY= X-Google-Smtp-Source: APBJJlF5wqTg9+oXKNhoyZdXAuY9iXt2GQF+V0GfODJOgeKDLHcC6G99ai99pbwnojB0lQ/9/2SqEA== X-Received: by 2002:a17:90a:c584:b0:259:a7a6:26f9 with SMTP id l4-20020a17090ac58400b00259a7a626f9mr16866663pjt.21.1688831772631; Sat, 08 Jul 2023 08:56:12 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 07/17] go.bbclass: don't use test to check output from ls Date: Sat, 8 Jul 2023 05:55:41 -1000 Message-Id: <236a3e0bf753669b4fddbd91be5fdb10c2e6093f.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184027 From: Martin Jansa * avoids possibly confusing error message in log.do_install like: ls: cannot access 'etcd/3.5.7-r0/build/bin/linux_arm64/': No such file or directory Signed-off-by: Martin Jansa Signed-off-by: Alexandre Belloni (cherry picked from commit 2f1777e6ac5269a71203b6a2c562a43503be95ae) Signed-off-by: Steve Sakoman --- meta/classes/go.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 16e46398b1..21b1a0271e 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -118,7 +118,7 @@ go_do_install() { tar -C ${B} -cf - --exclude-vcs --exclude '*.test' --exclude 'testdata' pkg | \ tar -C ${D}${libdir}/go --no-same-owner -xf - - if [ -n "`ls ${B}/${GO_BUILD_BINDIR}/`" ]; then + if ls ${B}/${GO_BUILD_BINDIR}/* >/dev/null 2>/dev/null ; then install -d ${D}${bindir} install -m 0755 ${B}/${GO_BUILD_BINDIR}/* ${D}${bindir}/ fi From patchwork Sat Jul 8 15:55:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27095 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 87B08EB64DA for ; Sat, 8 Jul 2023 15:56:17 +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.web10.338.1688831775608789876 for ; Sat, 08 Jul 2023 08:56:15 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=5Sw+/ejP; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-262e839647eso2287261a91.2 for ; Sat, 08 Jul 2023 08:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831774; x=1691423774; 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=ZdFBJLxKAfV9Y7ZM7MHavdkTizvX4XDPfGpLHxe+uOc=; b=5Sw+/ejPiCRDv+3uMr4VwmguoMBoc8qUNzUImMjwx9ZsRf6NcjVsqYZDZM0UJNGXz8 gF+A5tIz9XaB4a4vwNY22KH7qPPNWWBeMV84z+803O0JiLm5FUjvof86Iwa7/S8BcMSY hy1hNTZel3BydvnpIodqH21YwhvCIQXUb0Jx7atCKgdqmkhMD/3b8yjjXkMaRkLazK+1 VLjQlpF3If0G0C5U+OXVHLcxy1Afy5BGdetvlpCAlegFIltP1m3BT6kHN7/7i3vKOsIN Z5R2U9IVqKbuRouFtx4l1xBDmjmocJMDy7aliD2/unKa6Qh8cf8+7Y3YQcxX6NDXsCCF gvaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831774; x=1691423774; 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=ZdFBJLxKAfV9Y7ZM7MHavdkTizvX4XDPfGpLHxe+uOc=; b=N+WS4YHZlYd6FO/VNpcW3EBQL/0zUPjzwTpd/n1uPmiLcMQoJJ15cj7z6HcO3Of/ls CJ2mHGdSDZzjdQpgJUoF3QOZHFrYdTTbGE4rvnaxFkPA+sDbIB1LLyV4i6MbrdlcUFaq ueaLA5JeSKaakUE7xGi4Qfbjnt3jTzES70NQmVg9y/2+3++j1W5oPwj82xOXfyEr7M5J 1duXlMaGMJoeRbKpvHfrkBU5Jf7G5wo6UaMoMiCORafiW9IoeeMXYtW26KecyrkXIMvr kqmsi+i6fEQ9uqvN2xwxYFh26lEORikCVDLjFtORVPyVk6SKv2atgJTNqP3LzbJvlk3O PTeQ== X-Gm-Message-State: ABy/qLao+toEM3Tjn6xvBkISNPOiQryREAwhjxPuKXJGDBirrgFw5bfk nFNkrjid5ClurlSJXiByXFmPc9IVvLIoCIC8Zd0= X-Google-Smtp-Source: APBJJlGHBWneD1yTVo7LQmsaWIoa/s4NpQnVZiOey3QoJLWmNCJa1nBgl/oc2QHzj3kQTtTt5l4ZFQ== X-Received: by 2002:a17:90b:390d:b0:262:f99b:a530 with SMTP id ob13-20020a17090b390d00b00262f99ba530mr8382725pjb.34.1688831774573; Sat, 08 Jul 2023 08:56:14 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/17] conf: add nice level to the hash config ignred variables Date: Sat, 8 Jul 2023 05:55:42 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184028 From: Lorenzo Arena This is needed as each user could be setting different nice levels while building, however this should not make the shared cache unusable. Signed-off-by: Lorenzo Arena Signed-off-by: Alexandre Belloni (cherry picked from commit 42784f9360345da1c01d988070253e7ffd5ac4ac) 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 91f003d6dd..457b7790c2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -897,7 +897,7 @@ BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ - BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT" + BB_SETSCENE_ENFORCE BB_CMDLINE BB_SERVER_TIMEOUT BB_NICE_LEVEL" BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \ file-checksums python func task export unexport noexec nostamp dirs cleandirs \ From patchwork Sat Jul 8 15:55:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27093 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 94879C001DE for ; Sat, 8 Jul 2023 15:56:17 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.339.1688831777154311496 for ; Sat, 08 Jul 2023 08:56:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=LMmg+K99; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-668711086f4so1972244b3a.1 for ; Sat, 08 Jul 2023 08:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831776; x=1691423776; 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=huVsUK7vqal4auyaNIRRiLjJBgffI4fLBfXY1acwRuQ=; b=LMmg+K99vhe/o4dLkmqsR5QDNswW65Kj6rHzbmBnIskkf6zcQ5+9Idp1IRM2o+nPdu blTniNt3gSshCr4sHg73ATlsxuat+c9PUBNotjrSTSOa6jWYkOBhUwXGiffZbQCrXg91 Y/2VfBO0z4U/MbF1OoaUvqyea1u3VmUddFS3C9X92yNoymmmTUHNjI7A5nc2ko9/QXYr 4xshD8wiTot5VmTNUC0NqTTui2LM6QlT09xHlg5Zr6K3qj+Ftmsl9G1J2xzVV0QebN+Z qzsxqOku4ApIs2IzICJNSVLQUtfVwd17A2Uc0n5EtxZGSoU9nMX18OKjk4+9VKnVRss6 YyuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831776; x=1691423776; 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=huVsUK7vqal4auyaNIRRiLjJBgffI4fLBfXY1acwRuQ=; b=AgjlEQtiw9LHSKgAoxgF95DG62s9b9BR6mFn6pxHvE7I6+ekHza6bH537Y+Wkpwchi GGc/cVvZ1pIpY0sOLKT/0yA46k/ZIZKXadOXYpQQT4O7pA3KYgN+gu8tQqTG4vDI/WYf gMKgfGY7C6y+GdUfFG2YjKyGRY5/DmVFKKkg/YQz+y3bCIixy/KkEmyr6CYz7uMfbdxk K/GRdv/1g2Y1bDq9P4JPxzkXgWl4zhL8PJoEaEU0QanpfHY6HkT/DjXWw5D5J0BHgsta mm/Z4tABj68rC1SujYPRY6Ff0WJ1FylUX/KyyUC6LpIQ+nRdTTM28ub50fsZ1ZG3/SKd N4iA== X-Gm-Message-State: ABy/qLYxZ2kppICcy/NPW4b9Wzo3eYg40zU1IE4+fxbzliXy5p+snYEv o8m+K+qIwtJjxBFYL7K+5eooy8B6WFXNOtOS4Wc= X-Google-Smtp-Source: APBJJlERBNWU/oHFp4tcTSIh4xFlL8ZOcSZFlszeRc5++Feo7Garbsde1SGWdU1v1X3IB1qxFnvpAw== X-Received: by 2002:a17:90a:8c01:b0:25c:18ad:6b82 with SMTP id a1-20020a17090a8c0100b0025c18ad6b82mr12428448pjo.21.1688831776310; Sat, 08 Jul 2023 08:56:16 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/17] oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo Date: Sat, 8 Jul 2023 05:55:43 -1000 Message-Id: <5f3128e3a85e3a5d67d5dc1f2585fe6c236e443c.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184029 From: Thomas Roos Devtool selftests require poky dir a git repo, when downloading poky as a tar, this is not the case. Those tests will now skipped. [YOCTO #12389] Signed-off-by: Thomas Roos Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 95a5bc130dc51ea9de95c64dbf0e9c7892415d50) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/devtool.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 5febdde28e..9efe342a0d 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -8,6 +8,7 @@ import shutil import tempfile import glob import fnmatch +import unittest import oeqa.utils.ftools as ftools from oeqa.selftest.case import OESelftestTestCase @@ -38,6 +39,13 @@ def setUpModule(): canonical_layerpath = os.path.realpath(canonical_layerpath) + '/' edited_layers.append(layerpath) oldmetapath = os.path.realpath(layerpath) + + # when downloading poky from tar.gz some tests will be skipped (BUG 12389) + try: + runCmd('git rev-parse --is-inside-work-tree', cwd=canonical_layerpath) + except: + raise unittest.SkipTest("devtool tests require folder to be a git repo") + result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath) oldreporoot = result.output.rstrip() newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot)) From patchwork Sat Jul 8 15:55:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27098 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 8BD4EEB64DA for ; Sat, 8 Jul 2023 15:56:27 +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.340.1688831779159391841 for ; Sat, 08 Jul 2023 08:56:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=uWR0ko/j; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-262e3c597b9so2163004a91.0 for ; Sat, 08 Jul 2023 08:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831778; x=1691423778; 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=DHJCW2lWSvNnYuC02cYcLpeNcet0v6NSU0H/WTAoX74=; b=uWR0ko/jcGIx50ftOnAHDiStvb0/8Ls7yHfHM+rw56QtkN6l1h77OHHE9J/nZyVxSh jbb8LMZoy/7K6zUVpegK7Xe+mR43FTBbiTFvl0ZV4AjzvCXMEpIpXmIIyLCfoC5pOVOm qeoLCHZZ7NGLO4xRJ3LB5Bdv5b5L+OpvEm6RxLt33j968Pz/VxgG5Je7Czv021zk2JMt lPKt9mV/YK2Q3Ds0zoo/JLYywJwduqxwbjGKtrRUqnb11iagNScmxNlHKEyFX9MfgImj 0BL6tTxCywIBf6b/mPFHyRgWD+EYeKtoZHsEiGK5aZRsy8FSd6H31tIeMIeX9CjDVFW6 KLOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831778; x=1691423778; 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=DHJCW2lWSvNnYuC02cYcLpeNcet0v6NSU0H/WTAoX74=; b=GXLZ2xWNCfguwGysBiuqzMPUViQ9tzUDlxzmwEEXLtEzA8+rVYjtOeNfYSRjYahXxW zOOVmTHucF+KXhdo5eHjSrj+hR2hX9ESRICQO06tiZkLEhqgefZzSglVjfs+70A0eSp/ hFwTtuwsebcy+s7cIsS/T1b4agSosOyKy6b6qAJPoqpvRenM4kdlNUQNYF5bzDhYtrx9 xyGcNpFSnIruk1yyEr3QBLjaUvmHtHNgeWcix9/Zruy21gjRw5c9RDjHAsDlG08tz8og iETNdxIzxj1BIxSCo6OXedo5YUsBXwGqloMHSI/xig1ZIbdZUFePr3uu6JGMfKrH4kCI V7vA== X-Gm-Message-State: ABy/qLZZllwKRetCfZea6XGXk5054QSiXBR+Wu5DNPxTFFbHXxiNhoa5 B3FvrrUCPp+kXqUq0UbacK9gTC8EEMkVIZZGia8= X-Google-Smtp-Source: APBJJlGAKTP0I0ZwW6E7cpJO3BJ/KdyCVghyirtq33Wka6COb+pxDwGgMDu1TfK+UlQfeV5VOLifDA== X-Received: by 2002:a17:90a:bd0d:b0:263:ff36:3aa0 with SMTP id y13-20020a17090abd0d00b00263ff363aa0mr8014606pjr.41.1688831778165; Sat, 08 Jul 2023 08:56:18 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/17] lib/terminal.py: Add urxvt terminal Date: Sat, 8 Jul 2023 05:55:44 -1000 Message-Id: <9dad23306348af9f54c5fcdfacdbc1e775bf5742.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184030 From: Pavel Zhukov This fixes failure [1] of menuconfig task in rxvt-unicode terminal in case if xterm/Konsole/Gnome is not installed. Tested with rxvt-unicode-256color [1] WARNING: Terminal screen is supported but did not start ERROR: No valid terminal found, unable to open devshell. Tried the following commands: tmux split-window -c "{cwd}" "do_terminal" tmux new-window -c "{cwd}" -n "zephyr-helloworld Configuration" "do_terminal" xfce4-terminal -T "zephyr-helloworld Configuration" -e "do_terminal" terminology -T="zephyr-helloworld Configuration" -e do_terminal mate-terminal --disable-factory -t "zephyr-helloworld Configuration" -x do_terminal konsole --separate --workdir . -p tabtitle="zephyr-helloworld Configuration" -e do_terminal gnome-terminal -t "zephyr-helloworld Configuration" -- do_terminal xterm -T "zephyr-helloworld Configuration" -e do_terminal rxvt -T "zephyr-helloworld Configuration" -e do_terminal tmux new -c "{cwd}" -d -s devshell -n devshell "do_terminal" screen -D -m -t "zephyr-helloworld Configuration" -S devshell do_terminal DEBUG: Python function do_menuconfig finished Signed-off-by: Pavel Zhukov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8d2fe4df8ae33e033caf4119a76715f085be1d15) Signed-off-by: Steve Sakoman --- meta/lib/oe/terminal.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 2ac39df9e1..a0c166d884 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -102,6 +102,10 @@ class Rxvt(XTerminal): command = 'rxvt -T "{title}" -e {command}' priority = 1 +class URxvt(XTerminal): + command = 'urxvt -T "{title}" -e {command}' + priority = 1 + class Screen(Terminal): command = 'screen -D -m -t "{title}" -S devshell {command}' From patchwork Sat Jul 8 15:55:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27101 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 9E5EFC0015E for ; Sat, 8 Jul 2023 15:56:27 +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.web11.348.1688831780823037548 for ; Sat, 08 Jul 2023 08:56:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=PngzVRLH; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b9d80e33fbso557235ad.0 for ; Sat, 08 Jul 2023 08:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831780; x=1691423780; 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=ILUq9Z8iMABFgPQpfMaOvJze3gF95BMvINItie0FjnE=; b=PngzVRLHtdI51S+e7pajIroHV2icQwy+9HFnhQca3Q8EZdl4h1IoAOvzkElhQiNfUE 2Vt6VqO9xQs8WuiK5ID5FeM1UvUhd3tovmlyvrjK/Aabiy3TKRzKHrrpOBmCxqM3rHWM D+3Yb3JdRPOFmr4ZE6pnBkuR1qZnweNBFz2DMtEOH05zm7ckYoHMnmrf69cgKWLIs2/I 99u46tTIWg8g21bZpfHRRnxWCrQgzhPKx+e8VMjfTMIXQEkNEQozSV3yX9Vnh82YvDzP 8f6rXysnxTHui9vvCkvnUJh+lFuf3oi1yz7MIcAv8IAwTFsc78wkv9JzNhfuo9131I/2 cbTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831780; x=1691423780; 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=ILUq9Z8iMABFgPQpfMaOvJze3gF95BMvINItie0FjnE=; b=L5ILP3DSvvEcPX9m/SiIQHZTryX+u6f7Eg8nBPwzVUVGKCipSkHiZhipa1TiCzhDHR sM8FcL/y4sNPFO+K+IgEL750pCvGC71loyQN+sNfr8izZDXEkDnD4wYzOZqZPT6PzxuP oD+S39OaOk3+dYZKNkj+WjH0T4B0ha/SSRSn/HY6L62OZ5xiD+oNuP79SOe0hwK+d1/x B4t0b6EUN8+dwJdkFHjNjJa2GrWQWV1UAd1T249+83w3ghSYjny/9fKZ1nJXBHt6jRST /JYuLfZBpzKIWPg9+M5zrRSvHaiErynuHFCwjBRUiVsCZ01mM4dYPcjbGur1Y9W+K1Jd oayg== X-Gm-Message-State: ABy/qLZWQNe5E+5IA6qIXHNDvZy6KGb+VZwCZcY2S2KXubZAIn732//f Fy8dFYRQuhJjLYiLEgyqfhUvgO4+shavyOmRhpo= X-Google-Smtp-Source: APBJJlF79SCHdvlM9oOdhs4Jw4okfU4z0IY6vTM1gaiPOY4UCFLj2WjSA+mPVnYVV790BfMO0AAkiA== X-Received: by 2002:a17:902:b117:b0:1b1:b2fa:1903 with SMTP id q23-20020a170902b11700b001b1b2fa1903mr4839907plr.41.1688831779934; Sat, 08 Jul 2023 08:56:19 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/17] kmod: remove unused ptest.patch Date: Sat, 8 Jul 2023 05:55:45 -1000 Message-Id: <4342d2a60e2ba8a7aeb683b78f1eef94eb2c2edc.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184031 From: Martin Jansa * it was removed from SRC_URI in 2015: https://git.openembedded.org/openembedded-core/commit/?id=f80d136bdd578468035a88125fa1b84973fd912b Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit cfc4586b4bf080a3a4aa419dffc76c5da2a95b74) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/kmod/kmod/ptest.patch | 25 ----------------------- 1 file changed, 25 deletions(-) delete mode 100644 meta/recipes-kernel/kmod/kmod/ptest.patch diff --git a/meta/recipes-kernel/kmod/kmod/ptest.patch b/meta/recipes-kernel/kmod/kmod/ptest.patch deleted file mode 100644 index 831dbcb909..0000000000 --- a/meta/recipes-kernel/kmod/kmod/ptest.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add 'install-ptest' rule. - -Signed-off-by: Tudor Florea -Upstream-Status: Pending - -diff -ruN a/Makefile.am b/Makefile.am ---- a/Makefile.am 2013-07-12 17:11:05.278331557 +0200 -+++ b/Makefile.am 2013-07-12 17:14:27.033788016 +0200 -@@ -204,6 +204,16 @@ - - distclean-local: $(DISTCLEAN_LOCAL_HOOKS) - -+install-ptest: -+ @$(MKDIR_P) $(DESTDIR)/testsuite -+ @for file in $(TESTSUITE); do \ -+ install $$file $(DESTDIR)/testsuite; \ -+ done; -+ @sed -e 's/^Makefile/_Makefile/' < Makefile > $(DESTDIR)/Makefile -+ @$(MKDIR_P) $(DESTDIR)/tools -+ @cp $(noinst_SCRIPTS) $(noinst_PROGRAMS) $(DESTDIR)/tools -+ @cp -r testsuite/rootfs testsuite/.libs $(DESTDIR)/testsuite -+ - # ------------------------------------------------------------------------------ - # custom release helpers - # ------------------------------------------------------------------------------ From patchwork Sat Jul 8 15:55:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27102 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 9E629C001DE for ; Sat, 8 Jul 2023 15:56:27 +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.350.1688831782798721095 for ; Sat, 08 Jul 2023 08:56:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=S8npY0Na; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1b8ad8383faso21061175ad.0 for ; Sat, 08 Jul 2023 08:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831782; x=1691423782; 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=Qi+COrKqfHoSuH1v8vMmA9pmlOCQxb3n+Vtr9ASvE68=; b=S8npY0NajecCc01QxJLjul8tUgsAtQdvxWWWZ2voFJHg+IHxnfoHobSoy/UJG3WuA6 k3E5X/ZYF4WWVlTD+pKMKhnivizOlm6O0kFvfccxvnSbHWjY+1DRL0ogCC70dN8KkJvA X5bl6tPK+p9QnTfpH7Kv3bmoCGs+kabZMZO2VDuCwdvxLdmVkRvX/J/lykeR0TgbD7CP y+6mqXIZ6rGiPGPhwEDQ2mU5fG9fh3XNkyLjVgW7z4GXmWtjGbkqQoEt4ge4rdJUu/M8 /0J5Yv39p643opNY1XpcX3Fmpn77xeMgg2FlPIQoEZUp2VVjMjwRxCXbUEB+SPoKFBLK i9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831782; x=1691423782; 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=Qi+COrKqfHoSuH1v8vMmA9pmlOCQxb3n+Vtr9ASvE68=; b=hxsSWREg1Hj9SSzdkW5SchOwJF7ao7Euzd14iuKYuNIyhKxfwpwr+q/OOk6AjIg5uc mt1rYTIaBg78t3ua6ZZ1nBQIUJf/EXDXlXJriL5EG18lwyg6zmIg3i2Sy9oJcjeGbrUi 5+ME2At1cMIzl3EjXVFWNMHnDGyKgru3HRHSpgcGWCQSjpP8VeZVFbB5iDpxsg0MZNJS 15W4eTYk34wCMo/hnK/d8kldsiAR8xNE66eCXXtLzz4ndJzBaPZ++fDSeP2YS6b2ILfs dvD+gitIqBvVK3mrOEOhRMdIcrcw95glHWB3p2glbdMM7sgGeK0/wXJ870NCmyh0StYr nr/A== X-Gm-Message-State: ABy/qLZujDlEOaNlG3Op8uAinswMFAQ6sTddx8eCqYMbqILo/FBeBPC2 +13D+dxg2P/aYF1XtOkA765aS2umwY0RVr+Nkx0= X-Google-Smtp-Source: APBJJlHr8uIE8dkn1ECNYwZM+e9EIzgM61DbBITKkhJECpUgj9o3plbvVKrIb1/mkvPZgnzGj4A4hg== X-Received: by 2002:a17:90b:4a92:b0:263:5d42:79f7 with SMTP id lp18-20020a17090b4a9200b002635d4279f7mr8801058pjb.23.1688831781778; Sat, 08 Jul 2023 08:56:21 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 12/17] pm-utils: fix multilib conflictions Date: Sat, 8 Jul 2023 05:55:46 -1000 Message-Id: <292ff56250d2f916370c508fd7a94f3ab769a356.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184032 From: Kai Kang It fails to instal pm-utils and lib32-pm-utils at same time: Error: Transaction test error: file /usr/bin/pm-is-supported conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-hibernate conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-powersave conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-suspend conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-suspend-hybrid conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 All of the conflicted files either is script which source a file in ${libdir}, or a link file to some file in ${libdir}. Compare the content of installed files in ${libdir} exclude binaries, only the paths of ${libdir} diff. So re-define libdir with ${nonarch_libdir} to fix the conflicts. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit f836541bcfdbf033a37537530b4e3b87b0a7f003) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb index cac09101c4..fa3b993788 100644 --- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb @@ -19,9 +19,12 @@ PACKAGECONFIG[manpages] = "--enable-doc, --disable-doc, libxslt-native xmlto-nat RDEPENDS_${PN} = "grep bash" +EXTRA_OECONF = "--libdir=${nonarch_libdir}" + do_configure_prepend () { ( cd ${S}; autoreconf -f -i -s ) } -FILES_${PN} += "${libdir}/${BPN}/*" +FILES_${PN} += "${nonarch_libdir}/${BPN}/*" FILES_${PN}-dbg += "${datadir}/doc/pm-utils/README.debugging" +FILES_${PN}-dev += "${nonarch_libdir}/pkgconfig/pm-utils.pc" From patchwork Sat Jul 8 15:55:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27100 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 8BDBAC3DA41 for ; Sat, 8 Jul 2023 15:56:27 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web11.353.1688831784549044264 for ; Sat, 08 Jul 2023 08:56:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=E12zdfuz; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-55b22f82ac8so2666920a12.1 for ; Sat, 08 Jul 2023 08:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831784; x=1691423784; 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=G1muMYAtmL0u9bGnqoIQuSrY3bWmt/9CNjv4ZTaSnCU=; b=E12zdfuzI49cFcJ2pnKJpa7QCRitcb4hjFf80v1S/y7HWS/BDgW7vN1WYyT+UL0wef ei08Uj0swz35M9tOBKSdoRKWmpIwdo9F9ymLxYFLtK7loftIh7+qpPYzMxlR47Z0wgZO u2Mql0gTbxXpZqPCFHhylykDVRVc/wHyt3FE2Gxc5tfzGuVOFyhQqtZkJRrk53NF3ISP ijJOwY+bf/aOcowbCWUr0BIa166wp392arrzBw6mLsV/BHy3reEYSax1NObC6WE5IAhM OK/BjKaC8BBCcgMkEiO5Xducv98My1eTSaTHULzuuRt/w76Qs0tsr4CcRU87X3iWYpXQ fK/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831784; x=1691423784; 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=G1muMYAtmL0u9bGnqoIQuSrY3bWmt/9CNjv4ZTaSnCU=; b=dLnhtqZGt2y3tRhqRuEGVZSWka4bRt7Q07A/hs5AqhdUBt09qsnltShH/lSUPA3WnE r8zwWrOrdKmLGA6Zw+EVz0gX+x86DRcf6LyrmklKziuPZxbJqWpZDOvBfA41LHx5H5Wm Cff21RFRecbuSlzHDTkQDOmw2XeisO0EWdFNkouI9obOXBG7yGy67cYo2wa3VYerhxni 9nb96pU3SpfwJAEJKAEZyp6UmIUz/Nu3LWxSYaRRwlq3GHNqyNTp3psnykHBqNWXPvoY P8yXkAFPTDPzEydg6VJKAb1ADQOKOlUfmXf9XxEPARtEbaJfeO0b6tnzeJfUxdHOQdJh FiQQ== X-Gm-Message-State: ABy/qLbYC884ynY/1fxbfjAW1+3fIYDfnlSOoThCmCDMlQYtuyv2tx1H aAOrK8/m4R+4IdTMRhNYVdjp3p7SxvUqEVOFgdM= X-Google-Smtp-Source: APBJJlEN4Tk6i4X8EfmoPQgzvcYUX4VOhXZzpvXlX0UmfADw5WDEeFxiQYQqRvR2lscPcyLc+51Fcw== X-Received: by 2002:a17:90a:fe07:b0:262:ca9c:edcb with SMTP id ck7-20020a17090afe0700b00262ca9cedcbmr6370824pjb.9.1688831783600; Sat, 08 Jul 2023 08:56:23 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 13/17] scripts/runqemu: split lock dir creation into a reusable function Date: Sat, 8 Jul 2023 05:55:47 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184033 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 004d6bcb067ecf1d796801fa43a98820c4efd3c7) Signed-off-by: Steve Sakoman --- scripts/runqemu | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 51607f10e5..42abda0962 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1034,6 +1034,17 @@ class BaseConfig(object): self.set('NETWORK_CMD', '-netdev bridge,br=%s,id=net0,helper=%s -device virtio-net-pci,netdev=net0 ' % ( self.net_bridge, os.path.join(self.bindir_native, 'qemu-oe-bridge-helper'))) + def make_lock_dir(self, lockdir): + if not os.path.exists(lockdir): + # There might be a race issue when multi runqemu processess are + # running at the same time. + try: + os.mkdir(lockdir) + os.chmod(lockdir, 0o777) + except FileExistsError: + pass + return + def setup_slirp(self): """Setup user networking""" @@ -1052,14 +1063,7 @@ class BaseConfig(object): mac = 2 lockdir = "/tmp/qemu-port-locks" - if not os.path.exists(lockdir): - # There might be a race issue when multi runqemu processess are - # running at the same time. - try: - os.mkdir(lockdir) - os.chmod(lockdir, 0o777) - except FileExistsError: - pass + self.make_lock_dir(lockdir) # Find a free port to avoid conflicts for p in ports[:]: @@ -1099,14 +1103,7 @@ class BaseConfig(object): logger.error("ip: %s" % ip) raise OEPathError("runqemu-ifup, runqemu-ifdown or ip not found") - if not os.path.exists(lockdir): - # There might be a race issue when multi runqemu processess are - # running at the same time. - try: - os.mkdir(lockdir) - os.chmod(lockdir, 0o777) - except FileExistsError: - pass + self.make_lock_dir(lockdir) cmd = (ip, 'link') logger.debug('Running %s...' % str(cmd)) From patchwork Sat Jul 8 15:55:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27099 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 8BD96EB64DC for ; Sat, 8 Jul 2023 15:56:27 +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.342.1688831786408292808 for ; Sat, 08 Jul 2023 08:56:26 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=RSB1lxxe; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6686a05bc66so1694173b3a.1 for ; Sat, 08 Jul 2023 08:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831785; x=1691423785; 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=XMuLYDWxv1RP/588SubKOMX+hefTJEbJlYaerI0gXD8=; b=RSB1lxxeXgPzYLdGaHsKHEA3fpUUjZNa25mDopVF0O5mIbQ6cinGP8B4g/AQDRzYSr AMyNtay06AwQSIEIDqBVnSOLomqYcyfNEJJ8ffNws71ODn+vopMBdAjvqHHOfERuycB/ sjdpnYDDFonui3KHl21eYqq55cR/I6Jx0VqkkApDCn7HrHFK83W1/ap2oZsNpz3Cfvj0 lyy3B3kVhqs/ilRPS438xOVLMPlcOrpE3yhP6zHqV1rWkEp9GXadN5fo6JxwLWI/xxVD 2ZnYNyuEdrlgilhM2jkqtZXNHBcRTS+N6drk9BIbP0RSCBguQMTmHD5ti7V+5O5OwAQu A9Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831785; x=1691423785; 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=XMuLYDWxv1RP/588SubKOMX+hefTJEbJlYaerI0gXD8=; b=kTWWTSHslW+wqi2JJnhu07iSFDItPh9SpCVcztIMRXpKMVFBj8O8ZhgxnjuPRwgiua ygv27lOTDUGIiwyQSevE+nYYjlf0pAkm1dQ/Ji5B8TUpPcss7EgaENvp/j5C1V5TuJsp UUNA4apywbXhaWnfZ8knLByEoQsvlQXzAc2YLxccSGdHWXaklsQ/AqLPdg1mqFNkI4uJ xttLPLu7SrAJsNUDAq12V3CymSh2FcaDs/xk6Eg23xrBA1eoaK9PJWFV6GttL7roeoTn kzF8DWeGIcR4HoHLtPhYBni7+YrvUVCetNQQEeRjESACjHdZpX1GDrOSowI30spLcAD7 rCqQ== X-Gm-Message-State: ABy/qLag9TaVrwmyAXVyyI5ox44AR2Fzy6KCVLWv2/qUtP5d75nB7qSW MsxnN2zZkMdF/H/wUwzBqXTzW7B1H+XPnFbGq9c= X-Google-Smtp-Source: APBJJlHmUOWTEEUti4zauHajy9b4Y7LXnj3lzKOhLC844vxMcUG+Fz4lhIjn0kMLSLLUPO/JvJB8Dw== X-Received: by 2002:a17:90b:4b41:b0:263:e423:5939 with SMTP id mi1-20020a17090b4b4100b00263e4235939mr6248765pjb.28.1688831785454; Sat, 08 Jul 2023 08:56:25 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 14/17] scripts/runqemu: allocate unfsd ports in a way that doesn't race or clash with unrelated processes Date: Sat, 8 Jul 2023 05:55:48 -1000 Message-Id: <816d12f125974fc064d17c735b7769f7a9744597.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184034 From: Alexander Kanavin There is already a neat check_free_port() function for finding an available port atomically, so use that and make two additional tweaks: - no need to allocate two separate ports; per unfsd documentation they can be the same - move lockfile release until after unfsd has been shut down and the port(s) used has been freed [YOCTO #15077] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit dee96e82fb04ea99ecd6c25513c7bd368df3bd37) Signed-off-by: Steve Sakoman --- scripts/runqemu | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 42abda0962..4dfc0e2d38 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -974,17 +974,14 @@ class BaseConfig(object): else: self.nfs_server = '192.168.7.1' - # Figure out a new nfs_instance to allow multiple qemus running. - ps = subprocess.check_output(("ps", "auxww")).decode('utf-8') - pattern = '/bin/unfsd .* -i .*\.pid -e .*/exports([0-9]+) ' - all_instances = re.findall(pattern, ps, re.M) - if all_instances: - all_instances.sort(key=int) - self.nfs_instance = int(all_instances.pop()) + 1 - - nfsd_port = 3049 + 2 * self.nfs_instance - mountd_port = 3048 + 2 * self.nfs_instance + nfsd_port = 3048 + self.nfs_instance + lockdir = "/tmp/qemu-port-locks" + self.make_lock_dir(lockdir) + while not self.check_free_port('localhost', nfsd_port, lockdir): + self.nfs_instance += 1 + nfsd_port += 1 + mountd_port = nfsd_port # Export vars for runqemu-export-rootfs export_dict = { 'NFS_INSTANCE': self.nfs_instance, @@ -1420,13 +1417,13 @@ class BaseConfig(object): logger.debug('Running %s' % str(cmd)) subprocess.check_call(cmd) self.release_taplock() - self.release_portlock() if self.nfs_running: logger.info("Shutting down the userspace NFS server...") cmd = ("runqemu-export-rootfs", "stop", self.rootfs) logger.debug('Running %s' % str(cmd)) subprocess.check_call(cmd) + self.release_portlock() if self.saved_stty: subprocess.check_call(("stty", self.saved_stty)) From patchwork Sat Jul 8 15:55:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27104 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 8BAC5EB64DA for ; Sat, 8 Jul 2023 15:56:37 +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.web11.357.1688831788188135976 for ; Sat, 08 Jul 2023 08:56:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=oGByFulh; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2640a8ceefdso2228505a91.3 for ; Sat, 08 Jul 2023 08:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831787; x=1691423787; 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=77RUO2Z8P8ugG/cl+Iy6oeQCGKKb6QjTbHvOEmN8Cyc=; b=oGByFulhb1eOGxzXkILFZZRXKpYLrmkwcuLlDvNuqvNX0EHfk7+JCuffI5QpHrZKAT WmG1D8nNZ2vWcIwwNReshdQ8A5y8VJBZ3reZtZVw8adgus3u8ITZElmuS9FcETa91WRD 4mRM6jR93nc17juZbeTg1GOm1p16VNrVRkKocSrFmKUMLRhXEOnU212MKegwT2QV1THz +axl7jVYjWw2lwTashD0gQwwNCWtk0VA02M/ZTkGVQ/26d+qv9iq/HnfKEc52BMeiEpb QN9PHeijeKuFp8SQkK6u2YqRbeaqFsx8I9uOmocs2d9wyTxR0bs5aIqB4IqJ6833GKVG Ss3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831787; x=1691423787; 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=77RUO2Z8P8ugG/cl+Iy6oeQCGKKb6QjTbHvOEmN8Cyc=; b=H2UjDnDuRqmHaHhXAtSRSt0da2ntZ81EgK2MGlVeig8hY5dhTOi3Ak3E8bStuc+5YN c/QCc5YA+zMCbJHI4ixz65GrpRFMb4YfOru0D0oXVyelIeRWDdDoljWvCldRdZEVVL1g Oj5yayNVs5bDKD0SZspSpdMkwDSG09LW20TekZuBBLKzBlqm+uvDYc6icBqGSpNWcg71 3sr0Omw97Isd3nH2XGzet1QaSSMfImq6g9rBonAdfFmjEO/VV1nDAxvHf+lmiMmtUsEt f/UPAI+zzJiFK4B2VklyIW7W9GGG+ULMZccOYkM8ZUNg78DENSi9ZKhIWA/an44bQ599 h4hQ== X-Gm-Message-State: ABy/qLaigdRMS6IB+WcLt1eK8sEbLxs679j5tJZUxVQuIKRw3/MMCat2 iRr08xPXEgMxE7kJbHTbB3nXOsUR532XXUQ4Vc0= X-Google-Smtp-Source: APBJJlF3+1duWhZbISEWpV5wF4iSjdPLhOSpDtTbjhTI1lOF6XBoGl2oarRf98R30G/1OJ3hnczN+A== X-Received: by 2002:a17:90a:b011:b0:263:4164:dfba with SMTP id x17-20020a17090ab01100b002634164dfbamr7990850pjq.6.1688831787264; Sat, 08 Jul 2023 08:56:27 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 15/17] oeqa/selftest/bbtests: add non-existent prefile/postfile tests Date: Sat, 8 Jul 2023 05:55:49 -1000 Message-Id: <74fed908b807056cbb10c20d62d494f3089f52ee.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184035 From: Fabien Mahot Fixes [YOCTO #10725] Signed-off-by: Fabien Mahot Reviewed-by: Yoann Congal Signed-off-by: Richard Purdie (cherry picked from commit b0c33655fad5b2e7d96a45b6210527dfb766797b) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/bbtests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index e659be5341..0b88316950 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -185,6 +185,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertTrue(find, "No version returned for searched recipe. bitbake output: %s" % result.output) def test_prefile(self): + # Test when the prefile does not exist + result = runCmd('bitbake -r conf/prefile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified prefile didn't exist: %s" % result.output) + # Test when the prefile exists preconf = os.path.join(self.builddir, 'conf/prefile.conf') self.track_for_cleanup(preconf) ftools.write_file(preconf ,"TEST_PREFILE=\"prefile\"") @@ -195,6 +199,10 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.assertIn('localconf', result.output) def test_postfile(self): + # Test when the postfile does not exist + result = runCmd('bitbake -R conf/postfile.conf', ignore_status=True) + self.assertEqual(1, result.status, "bitbake didn't error and should have when a specified postfile didn't exist: %s" % result.output) + # Test when the postfile exists postconf = os.path.join(self.builddir, 'conf/postfile.conf') self.track_for_cleanup(postconf) ftools.write_file(postconf , "TEST_POSTFILE=\"postfile\"") From patchwork Sat Jul 8 15:55:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27105 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 8BD59EB64DC for ; Sat, 8 Jul 2023 15:56:37 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web10.346.1688831789974621005 for ; Sat, 08 Jul 2023 08:56:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=cqD4Cpbz; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-55bac17b442so2333043a12.3 for ; Sat, 08 Jul 2023 08:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831789; x=1691423789; 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=iqRx21G6Y4Ib/4LY/v2a43G4vueOTgqli+2JMKUdeyE=; b=cqD4CpbzKlHu9NCgkrl3fjaHaQOTlMGadgfU7CpCjaBX/rgDdMUpJJ8amaJjYjm2+q TlA0UnpQvuDU/B0mvkivzyEasjKU7UuHe5Bvj2uazjDOH2pUnPn8N5om6zkQ1NQtiYrk M2mHZMAO3acKAkZJTAx8Gly95z0Ymz5oNiNKEaJPtlVneoclIHl/5Q2aW8XdUJ+OwQ3m CjYCKVgh+mvcQKsJIO70lTsTey1kwZ/AP8kddfrAPBYYlItzMtHmEmDLvipT5N0Gxy2H I0ilPLbqEj00rMrNRZOvTNHqyWrsrNtd6IlP/MyFa4/ylXT9PBYQGR5mwSaZAjuJnwj/ fxPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831789; x=1691423789; 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=iqRx21G6Y4Ib/4LY/v2a43G4vueOTgqli+2JMKUdeyE=; b=gRPKe5mywnUAEby8s4bdZJl63x3b5JSgLVv/m7dIHeD1i/JhxpZn2czN4v4wIW55/s Zstvywaq86eTxkXRiJOBFzMdWUHM6juFIJ9lxDyCGiBQxvl7ESP+vLN+1ihaE5Ngp4Gr khcg/a0HtMUXQQS267PfLNHvjo8F6waHOw6jp6syeU1hAChiJEqq6MvWl+Xz+mexQpLu 73TTFtghFWuCQIWWFp23pXFHjqwK4vxOe9CgOq7eQQ5YST3ogPdIWojUYAb5UkdsF8Vu 1QmS3SK4NjQdeYv352bk//e36CjaugbHiBH49XKouvNYMEwnFbOAU9f7jMRVUC28lUv2 7mWg== X-Gm-Message-State: ABy/qLa7ilMg9S/VO6XvmFZvHV89RNWA/41emx0xeJqvkpswkbjXR4Is 6iZKjLqILO7oDOpy/q5aZaOwZKhgz7nVm+TZDfs= X-Google-Smtp-Source: APBJJlHe8XEKNWiG5BIfBlPXC8DcFn9MraWbqhsf82U46qBqIq2E4vouBkCtt+v4FZGoz0vHsclxgA== X-Received: by 2002:a17:90b:23c7:b0:263:7d57:16e9 with SMTP id md7-20020a17090b23c700b002637d5716e9mr8443219pjb.21.1688831789067; Sat, 08 Jul 2023 08:56:29 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 16/17] useradd-staticids.bbclass: improve error message Date: Sat, 8 Jul 2023 05:55:50 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184036 From: Mikko Rapeli Current error message is difficult to read: ERROR: Nothing PROVIDES 'image' trs-image was skipped: image - image: normal username test does not have a static ID defined. Add test to one of these files It's not clear that first "image" is recipe name, second "image" is binary package name and that "test" is the user account which does not have a static ID defined. Improve the error message so that these are more explicit. Now the error message looks like: image was skipped: Recipe image, package image: normal username "test" does not have a static ID defined. Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 07898218f3908a83e07178b6530dfa48d55d4ec2) Signed-off-by: Steve Sakoman --- meta/classes/useradd-staticids.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass index 3a1b5f1320..908b24969f 100644 --- a/meta/classes/useradd-staticids.bbclass +++ b/meta/classes/useradd-staticids.bbclass @@ -41,7 +41,7 @@ def update_useradd_static_config(d): def handle_missing_id(id, type, pkg, files, var, value): # For backwards compatibility we accept "1" in addition to "error" error_dynamic = d.getVar('USERADD_ERROR_DYNAMIC') - msg = "%s - %s: %sname %s does not have a static ID defined." % (d.getVar('PN'), pkg, type, id) + msg = 'Recipe %s, package %s: %sname "%s" does not have a static ID defined.' % (d.getVar('PN'), pkg, type, id) if files: msg += " Add %s to one of these files: %s" % (id, files) else: From patchwork Sat Jul 8 15:55:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27103 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 8BE3DC3DA40 for ; Sat, 8 Jul 2023 15:56:37 +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.web11.359.1688831791741337778 for ; Sat, 08 Jul 2023 08:56:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=XIxnt9Fd; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8bd586086so21377165ad.2 for ; Sat, 08 Jul 2023 08:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1688831791; x=1691423791; 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=T234txAC8RE23tO9kmy88RMKVpMZ/yaU+MlDZDS0wQI=; b=XIxnt9Fd/wX0wkACP31Z5eu13F/X2K7apoXHDBD2809B1YXzjvbGQqWrHfhOsdA3+4 T1xe78Y+HmJKdTcuBixuKCjt7ZRib+ETeiN7J7JWf8+Dfqv1hSX2fUMU6Qo3BUKHZebo GmUQTD3XOqaoTLEOzotBXpujzeOUj1LKZt/KdXIpy0IhKlJ9a+zg+NtYPhs1kbOkM3Vt 9KstWmVerve9AodAsH3rRjL+odF1XEZzaUGwXs6NIJdvCByGe8al59qjJHDbGgzQWOgw uNEQx4EHD0u5X0qnmMrLIm1OAX1PX43panbV7cxhbggGjBJyg5agwr+ljwGdbelFfkhe ACDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688831791; x=1691423791; 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=T234txAC8RE23tO9kmy88RMKVpMZ/yaU+MlDZDS0wQI=; b=ix6as7GrmXbpauRMXRP6jfr14gyKxDln1Wj2Lz2Mh/96QCMhm+RIxwfxR9wrBiTJTQ FRliHDudFhLzcjIJZlMBJSZYt0hfq9XmpkuoFObWX/pMIBUyKKn9z+A9fBHBf9Qme0iY E06duKoYQObhAUVeQ+x4zBZA4rMtu7bsye8f1XKU0NWXuQmfdMbWbXAzITsrVQK0ZRJ5 iD43OtUijyYOp0qNJdSEgw8hAz8lbiON5kM2+YYbIiJhI0+cv5q5d/PnE4l9QLw83bIk kRRu7sqFlImtUQzpYuZEMtWimboYl4f94VNMFPsyPcjmQ9DtH4Al4D0ds/e6A3sfGmaS JP9w== X-Gm-Message-State: ABy/qLZ5v7Zqg4uBH1Zc6QIQdkGxHQR1JdiFmqfhacscPDvgykUkioD/ RVaX5SpvdZ0MMtRp/foVmjsM58cfkl5cHHc54FY= X-Google-Smtp-Source: APBJJlF9dV7X8ejx7971iVSvwF0XIcwgygvks4Dcztt3yXaz5Mnywehb9pHfxefxGggJVNOd+KLMQA== X-Received: by 2002:a17:902:e5cd:b0:1b9:cc6b:4093 with SMTP id u13-20020a170902e5cd00b001b9cc6b4093mr3657350plf.19.1688831790858; Sat, 08 Jul 2023 08:56:30 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id u14-20020a17090a410e00b00263f6687690sm3257801pjf.18.2023.07.08.08.56.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jul 2023 08:56:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 17/17] grub: submit determinism.patch upstream Date: Sat, 8 Jul 2023 05:55:51 -1000 Message-Id: <1fe434d42a3365f232b07864638128b7ac70f627.1688831566.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 08 Jul 2023 15:56:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184037 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 61947762e410c685f667e0af6440fb8a33cd6777) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/grub/files/determinism.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/grub/files/determinism.patch b/meta/recipes-bsp/grub/files/determinism.patch index 3c1f562c71..bd4e7188ec 100644 --- a/meta/recipes-bsp/grub/files/determinism.patch +++ b/meta/recipes-bsp/grub/files/determinism.patch @@ -11,7 +11,7 @@ missing sorting of the list used to generate it. Add such a sort. Also ensure the generated unidata.c file is deterministic by sorting the keys of the dict. -Upstream-Status: Pending +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-06/index.html] Richard Purdie Index: grub-2.04/grub-core/genmoddep.awk