From patchwork Sat May 20 16:04:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24233 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 525D6C77B7D for ; Sat, 20 May 2023 16:05:25 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.13613.1684598719094240004 for ; Sat, 20 May 2023 09:05: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=cBxrxCOL; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-64d30ab1ef2so1353775b3a.2 for ; Sat, 20 May 2023 09:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598718; x=1687190718; 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=oWjA9fIz4PL1lT6H1Bq+jYL+y5L1+anVWSzTTmCANCo=; b=cBxrxCOLuh/0WBptb/BomMtZjpjyhuX7GoJ89WKSwnBL861hIw2A66WYG3XO1DIDni VepfMCsM8g+1WUzMXMdDhkHaMYaHTIYAdt0nzMD4oWqcpEXXxTecwuCru38wgLUCnUZ4 AF3BffLNmWmTLU9AWXJpZg32fAc6xOja1S/siPH/CraIEj3mdQrb7JxRReDEDC6cVTUL VnUlLVf6pvwNIwrijQuR792/fEj/77u0PmXDU6RfvdXXmrkUXTJpIZBbAUV29LjQ88hS eRzjlgseXEhkp+c9vkfeCuq4dJMJx3rLqKf0EoEd7guKLUB4nRaqOdXQkstv6hXQRr0e Gt3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598718; x=1687190718; 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=oWjA9fIz4PL1lT6H1Bq+jYL+y5L1+anVWSzTTmCANCo=; b=CvvOPKbTa3x/uGFZKmuOND4cRaicofC+Wxtk0/kkoi9jGANCANHXcHZI7U++Ka731Z sJAbl7gy/g82Hoi3rcCTI7frXJmEqSjJFZuRUSRD0LjMgbbtIvQDGo9CKniSqi27lz/O TZBekWfycr1x36IcjiEFUym+GuswJUjqiRjfZH3yvC5SHR4RC+TwM9rKWULx5qNcZxe7 IgNABltPxVfqnrAXi/xMSHeZovCGin+XzdN09rhf12BMLP076g5hb5OZZdykBqamAH4T YiNKdFo6VE6hUpBNLZ1ZLup2O62r04Kus8qvtIVTJNchVbMn/sqxyUMbXaGjzwHmIiwt IQ9w== X-Gm-Message-State: AC+VfDzrrEtRYeoN3436u/AKxOEuCHwRdHZCC/5lge0zLkjn3BXkQ7h5 xHaf20bEh1anZaSm0OGo3IcWxBEmsXqt2rnylU4= X-Google-Smtp-Source: ACHHUZ4HtNS7x+djrvBip7WoqSqqqpX7EpBi6GkLnBXbBmu1VJYjlVxlTUnimCsXRkqQjX/VlAuMRQ== X-Received: by 2002:a05:6a00:18a3:b0:640:e12a:3a20 with SMTP id x35-20020a056a0018a300b00640e12a3a20mr8505041pfh.1.1684598718099; Sat, 20 May 2023 09:05:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/11] git: fix CVE-2023-29007 Date: Sat, 20 May 2023 06:04:57 -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, 20 May 2023 16:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181564 From: Hitendra Prajapati Git is a revision control system. Prior to versions 2.30.9, 2.31.8, 2.32.7, 2.33.8, 2.34.8, 2.35.8, 2.36.6, 2.37.7, 2.38.5, 2.39.3, and 2.40.1, a specially crafted `.gitmodules` file with submodule URLs that are longer than 1024 characters can used to exploit a bug in `config.c::git_config_copy_or_rename_section_in_file()`. This bug can be used to inject arbitrary configuration into a user's `$GIT_DIR/config` when attempting to remove the configuration section associated with that submodule. When the attacker injects configuration values which specify executables to run (such as `core.pager`, `core.editor`, `core.sshCommand`, etc.) this can lead to a remote code execution. A fix A fix is available in versions 2.30.9, 2.31.8, 2.32.7, 2.33.8, 2.34.8, 2.35.8, 2.36.6, 2.37.7, 2.38.5, 2.39.3, and 2.40.1. As a workaround, avoid running `git submodule deinit` on untrusted repositories or without prior inspection of any submodule sections in `$GIT_DIR/config`. References: https://nvd.nist.gov/vuln/detail/CVE-2023-29007 Upstream patches: https://github.com/git/git/commit/528290f8c61222433a8cf02fb7cfffa8438432b4 https://github.com/git/git/commit/29198213c9163c1d552ee2bdbf78d2b09ccc98b8 https://github.com/git/git/commit/a5bb10fd5e74101e7c07da93e7c32bbe60f6173a https://github.com/git/git/commit/e91cfe6085c4a61372d1f800b473b73b8d225d0d https://github.com/git/git/commit/3bb3d6bac5f2b496dfa2862dc1a84cbfa9b4449a Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../git/files/CVE-2023-29007.patch | 159 ++++++++++++++++++ meta/recipes-devtools/git/git.inc | 1 + 2 files changed, 160 insertions(+) create mode 100644 meta/recipes-devtools/git/files/CVE-2023-29007.patch diff --git a/meta/recipes-devtools/git/files/CVE-2023-29007.patch b/meta/recipes-devtools/git/files/CVE-2023-29007.patch new file mode 100644 index 0000000000..e166c01412 --- /dev/null +++ b/meta/recipes-devtools/git/files/CVE-2023-29007.patch @@ -0,0 +1,159 @@ +From 057c07a7b1fae22fdeef26c243f4cfbe3afc90ce Mon Sep 17 00:00:00 2001 +From: Taylor Blau +Date: Fri, 14 Apr 2023 11:46:59 -0400 +Subject: [PATCH] Merge branch 'tb/config-copy-or-rename-in-file-injection' + +Avoids issues with renaming or deleting sections with long lines, where +configuration values may be interpreted as sections, leading to +configuration injection. Addresses CVE-2023-29007. + +* tb/config-copy-or-rename-in-file-injection: + config.c: disallow overly-long lines in `copy_or_rename_section_in_file()` + config.c: avoid integer truncation in `copy_or_rename_section_in_file()` + config: avoid fixed-sized buffer when renaming/deleting a section + t1300: demonstrate failure when renaming sections with long lines + +Signed-off-by: Taylor Blau + +Upstream-Status: Backport [https://github.com/git/git/commit/528290f8c61222433a8cf02fb7cfffa8438432b4] +CVE: CVE-2023-29007 +Signed-off-by: Hitendra Prajapati +--- + config.c | 36 +++++++++++++++++++++++++----------- + t/t1300-config.sh | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+), 11 deletions(-) + +diff --git a/config.c b/config.c +index e7052b3..676b687 100644 +--- a/config.c ++++ b/config.c +@@ -2987,9 +2987,10 @@ void git_config_set_multivar(const char *key, const char *value, + multi_replace); + } + +-static int section_name_match (const char *buf, const char *name) ++static size_t section_name_match (const char *buf, const char *name) + { +- int i = 0, j = 0, dot = 0; ++ size_t i = 0, j = 0; ++ int dot = 0; + if (buf[i] != '[') + return 0; + for (i = 1; buf[i] && buf[i] != ']'; i++) { +@@ -3042,6 +3043,8 @@ static int section_name_is_ok(const char *name) + return 1; + } + ++#define GIT_CONFIG_MAX_LINE_LEN (512 * 1024) ++ + /* if new_name == NULL, the section is removed instead */ + static int git_config_copy_or_rename_section_in_file(const char *config_filename, + const char *old_name, +@@ -3051,11 +3054,12 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename + char *filename_buf = NULL; + struct lock_file lock = LOCK_INIT; + int out_fd; +- char buf[1024]; ++ struct strbuf buf = STRBUF_INIT; + FILE *config_file = NULL; + struct stat st; + struct strbuf copystr = STRBUF_INIT; + struct config_store_data store; ++ uint32_t line_nr = 0; + + memset(&store, 0, sizeof(store)); + +@@ -3092,16 +3096,25 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename + goto out; + } + +- while (fgets(buf, sizeof(buf), config_file)) { +- int i; +- int length; ++ while (!strbuf_getwholeline(&buf, config_file, '\n')) { ++ size_t i, length; + int is_section = 0; +- char *output = buf; +- for (i = 0; buf[i] && isspace(buf[i]); i++) ++ char *output = buf.buf; ++ ++ line_nr++; ++ ++ if (buf.len >= GIT_CONFIG_MAX_LINE_LEN) { ++ ret = error(_("refusing to work with overly long line " ++ "in '%s' on line %"PRIuMAX), ++ config_filename, (uintmax_t)line_nr); ++ goto out; ++ } ++ ++ for (i = 0; buf.buf[i] && isspace(buf.buf[i]); i++) + ; /* do nothing */ +- if (buf[i] == '[') { ++ if (buf.buf[i] == '[') { + /* it's a section */ +- int offset; ++ size_t offset; + is_section = 1; + + /* +@@ -3118,7 +3131,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename + strbuf_reset(©str); + } + +- offset = section_name_match(&buf[i], old_name); ++ offset = section_name_match(&buf.buf[i], old_name); + if (offset > 0) { + ret++; + if (new_name == NULL) { +@@ -3193,6 +3206,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename + out_no_rollback: + free(filename_buf); + config_store_data_clear(&store); ++ strbuf_release(&buf); + return ret; + } + +diff --git a/t/t1300-config.sh b/t/t1300-config.sh +index 983a0a1..9b67f6b 100755 +--- a/t/t1300-config.sh ++++ b/t/t1300-config.sh +@@ -616,6 +616,36 @@ test_expect_success 'renaming to bogus section is rejected' ' + test_must_fail git config --rename-section branch.zwei "bogus name" + ' + ++test_expect_success 'renaming a section with a long line' ' ++ { ++ printf "[b]\\n" && ++ printf " c = d %1024s [a] e = f\\n" " " && ++ printf "[a] g = h\\n" ++ } >y && ++ git config -f y --rename-section a xyz && ++ test_must_fail git config -f y b.e ++' ++ ++test_expect_success 'renaming an embedded section with a long line' ' ++ { ++ printf "[b]\\n" && ++ printf " c = d %1024s [a] [foo] e = f\\n" " " && ++ printf "[a] g = h\\n" ++ } >y && ++ git config -f y --rename-section a xyz && ++ test_must_fail git config -f y foo.e ++' ++ ++test_expect_success 'renaming a section with an overly-long line' ' ++ { ++ printf "[b]\\n" && ++ printf " c = d %525000s e" " " && ++ printf "[a] g = h\\n" ++ } >y && ++ test_must_fail git config -f y --rename-section a xyz 2>err && ++ test_i18ngrep "refusing to work with overly long line in .y. on line 2" err ++' ++ + cat >> .git/config << EOF + [branch "zwei"] a = 1 [branch "vier"] + EOF +-- +2.25.1 + diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 36318eed20..8b864053eb 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -28,6 +28,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ file://CVE-2023-22490-2.patch \ file://CVE-2023-22490-3.patch \ file://CVE-2023-23946.patch \ + file://CVE-2023-29007.patch \ " S = "${WORKDIR}/git-${PV}" From patchwork Sat May 20 16:04:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24229 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 45E14C7EE2A for ; Sat, 20 May 2023 16:05:25 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web11.13401.1684598721228215861 for ; Sat, 20 May 2023 09:05:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=cgzoPbCO; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-64d44b198baso410670b3a.0 for ; Sat, 20 May 2023 09:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598720; x=1687190720; 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=Vf5g+ZtcTKH8bPjK2XJqO5Hwn0GOdjUkCmVjjZduh5Q=; b=cgzoPbCOLI7Gek8Bj28rHFlYUsxHOF+Lj+mZ/Rc5nTHzsMqdNozjM2LzCjv40Koxce YjbglhpeYOeh+UfJPNpVRFegIGsjbkPmEgclKgFlbB4xTWKFItm2V4vykPdLowyw4FVl N/WhDEV+DdnQFMOKLc8OXC3fozQLh/SRobPffieOGPNvhHppu5pzecMXqG7bGzkIqX/G USaxsM067MFgEuvQ61RtHUqyI4pqDjaasZ4N90tdGQ2MUrKFJc1vhaK5dv9XoRMUcT00 o2p1o6vKwYbPLud6qQbD6Pgxq+jz9I8JHuE4sFRtD8rjt4Ra9JLEjHqFIOAKk3yXYfkP ittg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598720; x=1687190720; 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=Vf5g+ZtcTKH8bPjK2XJqO5Hwn0GOdjUkCmVjjZduh5Q=; b=c2c5WOE8T0wdPDnfst0D9t2DmVIIMtjwbufjd36y16r4QlT43TgunHXwvrZfnPJtZe LI1N+dCiBP5kKrEpn0KADCQAhhBr5fPwVkh5HD54R4ZYqSwdnUu7o5BADVInEwY4FkJ/ BQYOLic7T9zPtT98VUxotU91UrPtAh2bLOPHJ1AkQkaY8qSGaWujgG1CoqjZOW0RCaNY BmqK4k1Cm2wPURHgnubtQ7UpWpgje2Sjl2GBTitryu070YqQgk1O2r5GM4xJJ1bk12Hl ehzoujawL5FGIty513FrI0pxZhCuuPjpS0mP5XFTLYlwVBWLfWlv/3YepoQq/9gXu61Z Jp0g== X-Gm-Message-State: AC+VfDxl0ehAeTt14ce6uwAlw82deYXxio9PrFS76ZZY+v7DLwxlwuyY IAPJbq/nrG9lDH9H+OYRmu6/mPlpLIVLYVy7MQM= X-Google-Smtp-Source: ACHHUZ7spN/E4ckPBN5ci/ElrK2RnAxlvwsMn8Ntp5SGVgpaJVjqI93eE1RIA7+uPuU5dL2NA/3L4Q== X-Received: by 2002:a05:6a00:1f05:b0:64d:411b:3a0c with SMTP id be5-20020a056a001f0500b0064d411b3a0cmr3451206pfb.14.1684598719799; Sat, 20 May 2023 09:05:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/11] git: fix CVE-2023-25652 Date: Sat, 20 May 2023 06:04:58 -1000 Message-Id: <6747482316b8f7839a09bf041d8c11b559f84b44.1684598568.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, 20 May 2023 16:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181565 From: Hitendra Prajapati Git is a revision control system. Prior to versions 2.30.9, 2.31.8, 2.32.7, 2.33.8, 2.34.8, 2.35.8, 2.36.6, 2.37.7, 2.38.5, 2.39.3, and 2.40.1, by feeding specially crafted input to `git apply --reject`, a path outside the working tree can be overwritten with partially controlled contents (corresponding to the rejected hunk(s) from the given patch). A fix is available in versions 2.30.9, 2.31.8, 2.32.7, 2.33.8, 2.34.8, 2.35.8, 2.36.6, 2.37.7, 2.38.5, 2.39.3, and 2.40.1. As a workaround, avoid using `git apply` with `--reject` when applying patches from an untrusted source. Use `git apply --stat` to inspect a patch before applying; avoid applying one that create a conflict where a link corresponding to the `*.rej` file exists. References: https://nvd.nist.gov/vuln/detail/CVE-2023-25652 Upstream-Status: Backport from https://github.com/git/git/commit/9db05711c98efc14f414d4c87135a34c13586e0b Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../git/files/CVE-2023-25652.patch | 94 +++++++++++++++++++ meta/recipes-devtools/git/git.inc | 1 + 2 files changed, 95 insertions(+) create mode 100644 meta/recipes-devtools/git/files/CVE-2023-25652.patch diff --git a/meta/recipes-devtools/git/files/CVE-2023-25652.patch b/meta/recipes-devtools/git/files/CVE-2023-25652.patch new file mode 100644 index 0000000000..d6b17a2b8a --- /dev/null +++ b/meta/recipes-devtools/git/files/CVE-2023-25652.patch @@ -0,0 +1,94 @@ +From 9db05711c98efc14f414d4c87135a34c13586e0b Mon Sep 17 00:00:00 2001 +From: Johannes Schindelin +Date: Thu, 9 Mar 2023 16:02:54 +0100 +Subject: [PATCH] apply --reject: overwrite existing `.rej` symlink if it + exists + +The `git apply --reject` is expected to write out `.rej` files in case +one or more hunks fail to apply cleanly. Historically, the command +overwrites any existing `.rej` files. The idea being that +apply/reject/edit cycles are relatively common, and the generated `.rej` +files are not considered precious. + +But the command does not overwrite existing `.rej` symbolic links, and +instead follows them. This is unsafe because the same patch could +potentially create such a symbolic link and point at arbitrary paths +outside the current worktree, and `git apply` would write the contents +of the `.rej` file into that location. + +Therefore, let's make sure that any existing `.rej` file or symbolic +link is removed before writing it. + +Reported-by: RyotaK +Helped-by: Taylor Blau +Helped-by: Junio C Hamano +Helped-by: Linus Torvalds +Signed-off-by: Johannes Schindelin + +Upstream-Status: Backport [https://github.com/git/git/commit/9db05711c98efc14f414d4c87135a34c13586e0b] +CVE: CVE-2023-25652 +Signed-off-by: Hitendra Prajapati +--- + apply.c | 14 ++++++++++++-- + t/t4115-apply-symlink.sh | 15 +++++++++++++++ + 2 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/apply.c b/apply.c +index 4f303bf..aa7111d 100644 +--- a/apply.c ++++ b/apply.c +@@ -4531,7 +4531,7 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch) + FILE *rej; + char namebuf[PATH_MAX]; + struct fragment *frag; +- int cnt = 0; ++ int fd, cnt = 0; + struct strbuf sb = STRBUF_INIT; + + for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) { +@@ -4571,7 +4571,17 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch) + memcpy(namebuf, patch->new_name, cnt); + memcpy(namebuf + cnt, ".rej", 5); + +- rej = fopen(namebuf, "w"); ++ fd = open(namebuf, O_CREAT | O_EXCL | O_WRONLY, 0666); ++ if (fd < 0) { ++ if (errno != EEXIST) ++ return error_errno(_("cannot open %s"), namebuf); ++ if (unlink(namebuf)) ++ return error_errno(_("cannot unlink '%s'"), namebuf); ++ fd = open(namebuf, O_CREAT | O_EXCL | O_WRONLY, 0666); ++ if (fd < 0) ++ return error_errno(_("cannot open %s"), namebuf); ++ } ++ rej = fdopen(fd, "w"); + if (!rej) + return error_errno(_("cannot open %s"), namebuf); + +diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh +index 1acb7b2..2b034ff 100755 +--- a/t/t4115-apply-symlink.sh ++++ b/t/t4115-apply-symlink.sh +@@ -125,4 +125,19 @@ test_expect_success SYMLINKS 'symlink escape when deleting file' ' + test_path_is_file .git/delete-me + ' + ++test_expect_success SYMLINKS '--reject removes .rej symlink if it exists' ' ++ test_when_finished "git reset --hard && git clean -dfx" && ++ ++ test_commit file && ++ echo modified >file.t && ++ git diff -- file.t >patch && ++ echo modified-again >file.t && ++ ++ ln -s foo file.t.rej && ++ test_must_fail git apply patch --reject 2>err && ++ test_i18ngrep "Rejected hunk" err && ++ test_path_is_missing foo && ++ test_path_is_file file.t.rej ++' ++ + test_done +-- +2.25.1 + diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 8b864053eb..e64472ea28 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -29,6 +29,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ file://CVE-2023-22490-3.patch \ file://CVE-2023-23946.patch \ file://CVE-2023-29007.patch \ + file://CVE-2023-25652.patch \ " S = "${WORKDIR}/git-${PV}" From patchwork Sat May 20 16:04:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24230 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 42655C77B7A for ; Sat, 20 May 2023 16:05:25 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.13402.1684598722428523776 for ; Sat, 20 May 2023 09:05:22 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=iRl2Iyk6; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-64d4e4598f0so437178b3a.2 for ; Sat, 20 May 2023 09:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598721; x=1687190721; 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=7fCwKGstJF+JltVtpNt9eBdk7DM4ihf6Updv0n71uiI=; b=iRl2Iyk6jGkud42CDcU0+9tD61FZiBA5VkNok3y/kJg84QqC2aeT5aw0dTXee4N16H wHjjCRHLRnrWaIryHCqz6iSAzEHLSS2uBqFCDW/46E1ApFVNFv0f1+/nAYucn5IXvLFq 7c0b2YPd83w2yPp5bZOwN/c9Sa/LRWRbX61G1UAvoctY/QN0SzaAkgb+mVjadp9sFx/C 3opm4DJVrSfD74o+HT6hjxgtw/YhS9NvC8Za9Uh7BVHW13tN4kssxh5FBqV/C0v+zrnM t4cx/HVULTjEhpzvKB9bNkegnXMQ7puEzO6uIrJvsDj9FJuuUPt9Z9dsO72bUjjvNBVI R2rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598721; x=1687190721; 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=7fCwKGstJF+JltVtpNt9eBdk7DM4ihf6Updv0n71uiI=; b=YpRg8SvpphoYbHOxL6p+LLcZ+XgH/BdH+9QSiAEMDb1B5NDenJz65E2Lm4i3jXdFfU 9xwDlQAKkYWgxfkK+ipTmda5Xp+wp7jXTzXC3fO4FcPj2zSMwzCgUPF03wxxCpTpPbBK QlKotTOFQiSuk9eGuRKAkN0zOoZZrXgR2UzT3KWdW3PVgkqlHCCS0fz0wbjpMV784dWw DrXBShWZg2kDAs0dOKPrNfXrAPGm5NAXdTPnurRsUz+Vwe1DrHf3ob4J0DrnKUsySJjs O/gyNIbXhr+hwgQgdcbYVAOfwPhmi7+yeBIA4vO9sMxHK+w17VOdZgJiSrtZJ4xmoY/k rN3g== X-Gm-Message-State: AC+VfDx2UZjZuT3ubIhLRbJQZb+6vkLeF0ljAdH5KAQPY78DgBWeEM3/ W1Rt/T26oVfMb5MINe4wVzbBJ28Xhn4ckAPFU2s= X-Google-Smtp-Source: ACHHUZ7t9qPaMXi9U2C5YOAHcIBVNQT5Xbu8U3Rp1/iNk7GaKXz5pq+LA+jRF7KYergWls9ey8Eyhw== X-Received: by 2002:a05:6a20:6f8b:b0:106:999f:64df with SMTP id gv11-20020a056a206f8b00b00106999f64dfmr5338907pzb.58.1684598721362; Sat, 20 May 2023 09:05:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/11] curl: ammend fix for CVE-2023-27534 to fix error when ssh is enabled Date: Sat, 20 May 2023 06:04:59 -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, 20 May 2023 16:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181566 From: Siddharth The upstream patch for CVE-2023-27534 does three things: 1) creates new path with dynbuf(dynamic buffer) 2) solves the tilde error which causes CVE-2023-27534 3) modifies the below added functionality to not add a trailing "/" to the user home dir if it already ends with one with dynbuf. dynbuf functionalities are added in curl in later versions and are not essential to fix the vulnerability but does add extra feature in later versions. This patch completes the 3rd task of the patch which was implemented without using dynbuf Upstream-Status: Backport from [https://github.com/curl/curl/commit/6c51adeb71da076c5c40a45e339e06bb4394a86b] Signed-off-by: Hitendra Prajapati Signed-off-by: Siddharth Doshi Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-27534-pre1.patch | 51 ++++++++ .../curl/curl/CVE-2023-27534.patch | 122 +++--------------- meta/recipes-support/curl/curl_7.69.1.bb | 1 + 3 files changed, 68 insertions(+), 106 deletions(-) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-27534-pre1.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-27534-pre1.patch b/meta/recipes-support/curl/curl/CVE-2023-27534-pre1.patch new file mode 100644 index 0000000000..46c57afb73 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-27534-pre1.patch @@ -0,0 +1,51 @@ +From 6c51adeb71da076c5c40a45e339e06bb4394a86b Mon Sep 17 00:00:00 2001 +From: Eric Vigeant +Date: Wed, 2 Nov 2022 11:47:09 -0400 +Subject: [PATCH] cur_path: do not add '/' if homedir ends with one + +When using SFTP and a path relative to the user home, do not add a +trailing '/' to the user home dir if it already ends with one. + +Closes #9844 + +CVE: CVE-2023-27534 +Note: +- The upstream patch for CVE-2023-27534 does three things: +1) creates new path with dynbuf(dynamic buffer) +2) solves the tilde error which causes CVE-2023-27534 +3) modifies the below added functionality to not add a trailing "/" to the user home dir if it already ends with one with dynbuf. +- dynbuf functionalities are added in curl in later versions and are not essential to fix the vulnerability but does add extra feature in later versions. +- This patch completes the 3rd task of the patch which was implemented without using dynbuf +Upstream-Status: Backport from [https://github.com/curl/curl/commit/6c51adeb71da076c5c40a45e339e06bb4394a86b] + +Signed-off-by: Hitendra Prajapati +Signed-off-by: Siddharth Doshi +--- + lib/curl_path.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/lib/curl_path.c b/lib/curl_path.c +index f429634..40b92ee 100644 +--- a/lib/curl_path.c ++++ b/lib/curl_path.c +@@ -70,10 +70,14 @@ CURLcode Curl_getworkingpath(struct connectdata *conn, + /* It is referenced to the home directory, so strip the + leading '/' */ + memcpy(real_path, homedir, homelen); +- real_path[homelen] = '/'; +- real_path[homelen + 1] = '\0'; ++ /* Only add a trailing '/' if homedir does not end with one */ ++ if(homelen == 0 || real_path[homelen - 1] != '/') { ++ real_path[homelen] = '/'; ++ homelen++; ++ real_path[homelen] = '\0'; ++ } + if(working_path_len > 3) { +- memcpy(real_path + homelen + 1, working_path + 3, ++ memcpy(real_path + homelen, working_path + 3, + 1 + working_path_len -3); + } + } +-- +2.24.4 + diff --git a/meta/recipes-support/curl/curl/CVE-2023-27534.patch b/meta/recipes-support/curl/curl/CVE-2023-27534.patch index aeeffd5fea..3ecd181290 100644 --- a/meta/recipes-support/curl/curl/CVE-2023-27534.patch +++ b/meta/recipes-support/curl/curl/CVE-2023-27534.patch @@ -3,121 +3,31 @@ From: Daniel Stenberg Date: Thu, 9 Mar 2023 16:22:11 +0100 Subject: [PATCH] curl_path: create the new path with dynbuf +Closes #10729 + CVE: CVE-2023-27534 -Upstream-Status: Backport [https://github.com/curl/curl/commit/4e2b52b5f7a3bf50a0f1494155717b02cc1df6d6] +Note: This patch is needed to backport CVE-2023-27534 +Upstream-Status: Backport from [https://github.com/curl/curl/commit/4e2b52b5f7a3bf50a0f1494155717b02cc1df6d6] Signed-off-by: Hitendra Prajapati +Signed-off-by: Siddharth Doshi --- - lib/curl_path.c | 71 ++++++++++++++++++++++++------------------------- - 1 file changed, 35 insertions(+), 36 deletions(-) + lib/curl_path.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/curl_path.c b/lib/curl_path.c -index f429634..e17db4b 100644 +index 40b92ee..598c5dd 100644 --- a/lib/curl_path.c +++ b/lib/curl_path.c -@@ -30,6 +30,8 @@ - #include "escape.h" - #include "memdebug.h" - -+#define MAX_SSHPATH_LEN 100000 /* arbitrary */ -+ - /* figure out the path to work with in this particular request */ - CURLcode Curl_getworkingpath(struct connectdata *conn, - char *homedir, /* when SFTP is used */ -@@ -37,60 +39,57 @@ CURLcode Curl_getworkingpath(struct connectdata *conn, - real path to work with */ - { - struct Curl_easy *data = conn->data; -- char *real_path = NULL; - char *working_path; - size_t working_path_len; -+ struct dynbuf npath; - CURLcode result = - Curl_urldecode(data, data->state.up.path, 0, &working_path, - &working_path_len, FALSE); - if(result) - return result; - -+ /* new path to switch to in case we need to */ -+ Curl_dyn_init(&npath, MAX_SSHPATH_LEN); -+ - /* Check for /~/, indicating relative to the user's home directory */ -- if(conn->handler->protocol & CURLPROTO_SCP) { -- real_path = malloc(working_path_len + 1); -- if(real_path == NULL) { -+ if((data->conn->handler->protocol & CURLPROTO_SCP) && -+ (working_path_len > 3) && (!memcmp(working_path, "/~/", 3))) { -+ /* It is referenced to the home directory, so strip the leading '/~/' */ -+ if(Curl_dyn_addn(&npath, &working_path[3], working_path_len - 3)) { - free(working_path); - return CURLE_OUT_OF_MEMORY; - } -- if((working_path_len > 3) && (!memcmp(working_path, "/~/", 3))) -- /* It is referenced to the home directory, so strip the leading '/~/' */ -- memcpy(real_path, working_path + 3, working_path_len - 2); -- else -- memcpy(real_path, working_path, 1 + working_path_len); +@@ -60,7 +60,7 @@ CURLcode Curl_getworkingpath(struct connectdata *conn, + memcpy(real_path, working_path, 1 + working_path_len); } -- else if(conn->handler->protocol & CURLPROTO_SFTP) { + else if(conn->handler->protocol & CURLPROTO_SFTP) { - if((working_path_len > 1) && (working_path[1] == '~')) { -- size_t homelen = strlen(homedir); -- real_path = malloc(homelen + working_path_len + 1); -- if(real_path == NULL) { -- free(working_path); -- return CURLE_OUT_OF_MEMORY; -- } -- /* It is referenced to the home directory, so strip the -- leading '/' */ -- memcpy(real_path, homedir, homelen); -- real_path[homelen] = '/'; -- real_path[homelen + 1] = '\0'; -- if(working_path_len > 3) { -- memcpy(real_path + homelen + 1, working_path + 3, -- 1 + working_path_len -3); -- } -+ else if((data->conn->handler->protocol & CURLPROTO_SFTP) && -+ (working_path_len > 2) && !memcmp(working_path, "/~/", 3)) { -+ size_t len; -+ const char *p; -+ int copyfrom = 3; -+ if(Curl_dyn_add(&npath, homedir)) { -+ free(working_path); -+ return CURLE_OUT_OF_MEMORY; - } -- else { -- real_path = malloc(working_path_len + 1); -- if(real_path == NULL) { -- free(working_path); -- return CURLE_OUT_OF_MEMORY; -- } -- memcpy(real_path, working_path, 1 + working_path_len); -+ /* Copy a separating '/' if homedir does not end with one */ -+ len = Curl_dyn_len(&npath); -+ p = Curl_dyn_ptr(&npath); -+ if(len && (p[len-1] != '/')) -+ copyfrom = 2; -+ -+ if(Curl_dyn_addn(&npath, -+ &working_path[copyfrom], working_path_len - copyfrom)) { -+ free(working_path); -+ return CURLE_OUT_OF_MEMORY; - } - } - -- free(working_path); -+ if(Curl_dyn_len(&npath)) { -+ free(working_path); - -- /* store the pointer for the caller to receive */ -- *path = real_path; -+ /* store the pointer for the caller to receive */ -+ *path = Curl_dyn_ptr(&npath); -+ } -+ else -+ *path = working_path; - - return CURLE_OK; - } ++ if((working_path_len > 2) && !memcmp(working_path, "/~/", 3)) { + size_t homelen = strlen(homedir); + real_path = malloc(homelen + working_path_len + 1); + if(real_path == NULL) { -- -2.25.1 +2.24.4 diff --git a/meta/recipes-support/curl/curl_7.69.1.bb b/meta/recipes-support/curl/curl_7.69.1.bb index 32d18ddb3a..13ec117099 100644 --- a/meta/recipes-support/curl/curl_7.69.1.bb +++ b/meta/recipes-support/curl/curl_7.69.1.bb @@ -43,6 +43,7 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://CVE-2022-35260.patch \ file://CVE-2022-43552.patch \ file://CVE-2023-23916.patch \ + file://CVE-2023-27534-pre1.patch \ file://CVE-2023-27534.patch \ file://CVE-2023-27538.patch \ file://CVE-2023-27533.patch \ From patchwork Sat May 20 16:05:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24232 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 52B82C7EE2E for ; Sat, 20 May 2023 16:05:25 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.13616.1684598724062426687 for ; Sat, 20 May 2023 09:05:24 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=MTtwRFV0; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-64d2a613ec4so1799761b3a.1 for ; Sat, 20 May 2023 09:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598723; x=1687190723; 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=uCW3Z0t5RY10PiBh4pfS/eDM/xRKX8XbICv5qN+lEsU=; b=MTtwRFV0/PXRE4Xjo7VW+lq0W/+UJhK+rFYWOCe7Rr5gasZTaPXyGRhuiaemmAFRYP risBPyuhqtkY14YbhVdLJFVlL8ECh13AvseMUgBy6MsUgm5P3lK17nQ6fm0W2PalZsFD U6G466KoeCz8GH9sFc7m8vwpoA23bSLhrgri4f6T7wDd6xQGfCsecrwkoB4Sy6Jcd3bQ BQ+LQw3anuwxVZaJ2iFMEZ6xYcxnG6ppq1rtIltSNRYT3j3IhlMmnztti+iKiYppQvyk K2/nhJzNyDkXCFPV9zAwLWX38HhuLOnCXToZUj9XipIaOjNsVHL8OK5dZwpfbYzt4i2Q RUng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598723; x=1687190723; 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=uCW3Z0t5RY10PiBh4pfS/eDM/xRKX8XbICv5qN+lEsU=; b=lfyztQSa00LMV2dcNUcIjX7WVqewaXZaib7zoLsDjRedCjCbA6Kv1OE0kuKQWfUGPs PaSXae8aMkme6Bl0kgQFUlGOYvqZRcu9JfMMS99+ngJwiWJHk9vOZ6fKBfigIoFt7v5r etlwqMSmSDyn1kOom5FoQh7INglEtGJbFnElSQI8i9K5EVIaBuB+t51Ek7e2UUWeIuRi SpE8oA+8PItl8nTvfsfpk4i/M4vU4tJgYyD3y+XA4IH7sVYLVvwPU4HHbMlCl4pN74g+ YrUs5j3RnuGkcpU8pJGEkURFPwfYRhYmME1i2B8s7QSXHzoR4JC/mAal9gjzDaKbDm0o gEoA== X-Gm-Message-State: AC+VfDxQaHGHfMC5thSxGXCRcEUJ0Xjmt/Ak2laztkngRKC9n7/e+LEe iagF3/IjvHDAsyKkpsfs2f+ohcj0If9EsjmZ8Tw= X-Google-Smtp-Source: ACHHUZ5miuTUolOzsADlSMYeNwRB2BvB70cyBZV7TKmX6PNi6PXdXp8y8xFcQ99dt1Hg5Qg+qCXIpQ== X-Received: by 2002:a05:6a00:14c4:b0:647:b071:20c4 with SMTP id w4-20020a056a0014c400b00647b07120c4mr7424023pfu.1.1684598723088; Sat, 20 May 2023 09:05:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/11] pypi.bbclass: Set CVE_PRODUCT to PYPI_PACKAGE Date: Sat, 20 May 2023 06:05:00 -1000 Message-Id: <1c37b96cd4fdfad21bf24b8b883e371c3bca56de.1684598568.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, 20 May 2023 16:05:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181567 From: Alex Kiernan The CVE product name for PyPI packages is (usually) the same as the PyPI package name (and not our recipe name), so use that as the default. Signed-off-by: Alex Kiernan Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie (cherry picked from commit 61f6b0ad09bf87cdc2d3f08770b7c44cad1d0e58) Signed-off-by: Sanjay Chitroda Signed-off-by: Steve Sakoman --- meta/classes/pypi.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/pypi.bbclass b/meta/classes/pypi.bbclass index 87b4c85fc0..c68367449a 100644 --- a/meta/classes/pypi.bbclass +++ b/meta/classes/pypi.bbclass @@ -24,3 +24,5 @@ S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" UPSTREAM_CHECK_URI ?= "https://pypi.org/project/${PYPI_PACKAGE}/" UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P(\d+[\.\-_]*)+)/" + +CVE_PRODUCT ?= "python:${PYPI_PACKAGE}" From patchwork Sat May 20 16:05:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24235 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 17A02C7EE2A for ; Sat, 20 May 2023 16:05:35 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.13617.1684598725657960300 for ; Sat, 20 May 2023 09:05:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=vBsId9oS; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-64d3bc502ddso1800862b3a.0 for ; Sat, 20 May 2023 09:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598725; x=1687190725; 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=oMI+8xApQ/erQjMlY7+TX7pb7/HLZYq9lvk8mn5jk9Q=; b=vBsId9oSd8UMl6LmeO4qEvLmi5wO8axBxy3BMCnvvXaB8iF2da1GtfzUMHK0kYLhiJ bHharlwP8U1Jbk5ou8bO9VaPlRTDejwOt/vOA0J5FNCOJdHG8gnem+GlEWXlYaiLd8lb Yjj++UzOYeG/z/SJqsGXMmcYL8BQlrcZaYpb6auTTbx/GuPWsUFRagve2uv39sd0mS6k 7wsXp1hRPUag0LCRwILdnGP1STm3hj6A9AkvwAZJd3SBUbubrkxIaPE8iSL8VaP2Zdf+ R8lo4nUzoOf6OkA1RsnkTygJob/VXLuMvJ8sbyUjrUzEburd/hqexi7G6Wc277AJejgU NnRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598725; x=1687190725; 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=oMI+8xApQ/erQjMlY7+TX7pb7/HLZYq9lvk8mn5jk9Q=; b=LikDG3B6A8+F2DwIhzF4kZHj/kIPQk3lqJ2z+s2Ek5tSvTuwj6WntA7fFPsYX1Fefm 1hqU+fI7uSgjlILJIrOc9UF8mH+GiBosQPmlWceyhTUwFmrPWRblG28ERWenwwMazFhx eUWYWwOvyIqu1OGye93KKlbpzA5A3NcI/Y1KuqemuFLteMdfQ9qX5JmabV9tueg+2nnC CiBTnIhZx/BP2mtr7ZZccSA3sv9JT1HXPKB+L2MsJrIifeFRDNEJuzNMLNpnwolxKDgD aSqEsBkYztL/FXySrUTFjVHFjVZV0ZBCC2rrkJeFj6JRC5HvdeE8vNuzYoaUVqm7wp0F a5EQ== X-Gm-Message-State: AC+VfDybtoniOOJNVkIYEkrIyiSlj5j0QuzAtWw6LroeA2o80sicYQY5 j14lwJOHaroDmaN+ohFzXA5wR3H+oxlfzAPshgc= X-Google-Smtp-Source: ACHHUZ7pelvGT5NZhKB3bZfBIq5l8+LzelIH5T27K3t2s8jJlVL9IQxtXSJ+uA8SapRAEOKrXOcNCQ== X-Received: by 2002:a05:6a00:190f:b0:64d:4a94:1a60 with SMTP id y15-20020a056a00190f00b0064d4a941a60mr2437693pfi.18.1684598724778; Sat, 20 May 2023 09:05:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/11] linux-firmware: upgrade 20230210 -> 20230404 Date: Sat, 20 May 2023 06:05:01 -1000 Message-Id: <0a6a31e24414e156e005ef1d6a72ff668d83796a.1684598568.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, 20 May 2023 16:05:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181568 From: Dmitry Baryshkov The LICENCE.qat_firmware license file was updated to reflect Intel licensing (it removed a term regarding patent licenses). License-Update: additional files Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli (cherry picked from commit fd43b59ab32e2115fcda7ad63d3a5ccc2683c7d5) Signed-off-by: Steve Sakoman --- ...inux-firmware_20230210.bb => linux-firmware_20230404.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230210.bb => linux-firmware_20230404.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb index fb1ea61906..9ac70b2a3a 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230210.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb @@ -108,7 +108,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ - file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ + file://LICENCE.qat_firmware;md5=72de83dfd9b87be7685ed099a39fbea4 \ file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ file://LICENSE.qcom_yamato;md5=d0de0eeccaf1843a850bf7a6777eec5c \ file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ @@ -134,7 +134,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "aadb3cccbde1e53fc244a409e9bd5a22" +WHENCE_CHKSUM = "0782deea054d4b1b7f10c92c3a245da4" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -212,7 +212,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "6e3d9e8d52cffc4ec0dbe8533a8445328e0524a20f159a5b61c2706f983ce38a" +SRC_URI[sha256sum] = "c3f9ad2bb5311cce2490f37a8052f836703d6936aabd840246b6576f1f71f607" inherit allarch From patchwork Sat May 20 16:05:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24237 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 296AEC77B7D for ; Sat, 20 May 2023 16:05:35 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.13616.1684598724062426687 for ; Sat, 20 May 2023 09:05:27 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=MylU7I5/; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-64d2a613ec4so1799778b3a.1 for ; Sat, 20 May 2023 09:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598726; x=1687190726; 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=TP+UZepMZbwC0RsOPWX3s4EP+OC0tUTnX2IL4TnjtH8=; b=MylU7I5/nY1E35nmd50Io+6nhPck4fCH42uJgGIoetAYjnPelPggRVFJ1LPveQsU2e IQMs1+BWxr2mZh232RqIRlvN+EnDiiEz5vUkyMcb7P5BJ2ghzcXEVBGMeNxLGGheCHZV dvc0xwJgDG5GB38P3aJ2vbCeP1o2Wx18eXutMzbW7L7LD3Se7TxFIa758UqHK/4RPgTX I3YMsyy9w9subGwx8R+6gA+pRI/PA72fI/PH9MlE3JjMBOEry8V5TblTP19lZNIRBv/2 Op9ft7ThAGGIB2kcZGMxyNgiClp34FUZzouQ7SyZ+20h+SljyuUlWAV+GwRpssHtCtbi w9aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598726; x=1687190726; 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=TP+UZepMZbwC0RsOPWX3s4EP+OC0tUTnX2IL4TnjtH8=; b=WUct2YTCZMY6uaVucfVRx/u1IhJPuAMDm9iImsrza4PKJ2B+6XiCay66zyKEEEUFTn HL03IcBsFTipJdfEEbSUsGu2OTVnyr9g7Z3E9TpDCzmO/FRynv28EOwnV/iWQqCVO2zd GGbSXi1xRpLyWqrI2FFIpzaIqa0Uau/OG/0VibZjcg6UXSzYrMrSyYjPsusEno0jT7if RsC04/Rh1rHhE8oh+5BDMT1iPKOyFujCr/SowUiTEwPpTF2OUDTRfkC66xyE1cscVTRW hSePiKErnkFvkQGXPovnnPTZPDLiwStBmpNIy8u61/M95ATObJjzlXe3bvGbQN+droL9 W6Fw== X-Gm-Message-State: AC+VfDy1MZEd8H4m250OHePhJu1DyD66JhPurtxeCuVVVV2DDKoOGn93 c17qDl+R8kNz3I0RSHW6ABTpxXXYXT2IyDmLp7g= X-Google-Smtp-Source: ACHHUZ5Jpy/zGvmYPgLKgDFaTFCJ3KY+m+oc+mec9H+A07X/6XqnsM3Mdyo8ATSldDjbLLL3J4pbNg== X-Received: by 2002:a05:6a20:3ca7:b0:103:e735:d157 with SMTP id b39-20020a056a203ca700b00103e735d157mr6094457pzj.59.1684598726442; Sat, 20 May 2023 09:05:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/11] cpio: Fix wrong CRC with ASCII CRC for large files Date: Sat, 20 May 2023 06:05:02 -1000 Message-Id: <0a8fb1c00e75e8434e0ef433d9074d54f038fba1.1684598568.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, 20 May 2023 16:05:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181569 From: Marek Vasut Due to signedness, the checksum is not computed when filesize is bigger a 2GB. Pick a fix for this problem from CPIO ML, where the fix has been posted for 5 years. Since CPIO upstream is effectively unresponsive and any and all attempts to communicate with the maintainer and get the fix applied upstream failed, add the fix here instead. (From OE-Core rev: bfff138af4bdd356ac66571e6ad91c1a5599b935) Signed-off-by: Marek Vasut Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- ...g-CRC-with-ASCII-CRC-for-large-files.patch | 39 +++++++++++++++++++ meta/recipes-extended/cpio/cpio_2.13.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch diff --git a/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch new file mode 100644 index 0000000000..4b96e4316c --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch @@ -0,0 +1,39 @@ +From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Fri, 28 Jul 2017 13:20:52 +0200 +Subject: [PATCH] Wrong CRC with ASCII CRC for large files + +Due to signedness, the checksum is not computed when filesize is bigger +a 2GB. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-cpio/2017-07/msg00004.html] +Signed-off-by: Stefano Babic +--- + src/copyout.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/copyout.c b/src/copyout.c +index 1f0987a..727aeca 100644 +--- a/src/copyout.c ++++ b/src/copyout.c +@@ -34,13 +34,13 @@ + compute and return a checksum for them. */ + + static uint32_t +-read_for_checksum (int in_file_des, int file_size, char *file_name) ++read_for_checksum (int in_file_des, unsigned int file_size, char *file_name) + { + uint32_t crc; + char buf[BUFSIZ]; +- int bytes_left; +- int bytes_read; +- int i; ++ unsigned int bytes_left; ++ unsigned int bytes_read; ++ unsigned int i; + + crc = 0; + +-- +2.7.4 + diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb index 7c8a465cd0..86527da744 100644 --- a/meta/recipes-extended/cpio/cpio_2.13.bb +++ b/meta/recipes-extended/cpio/cpio_2.13.bb @@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \ file://CVE-2021-38185.patch \ + file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \ " SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810" From patchwork Sat May 20 16:05:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24234 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 179CCC7EE29 for ; Sat, 20 May 2023 16:05:35 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.13407.1684598729817408687 for ; Sat, 20 May 2023 09:05:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=O9kndrLT; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-64d2a87b9daso1788381b3a.0 for ; Sat, 20 May 2023 09:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598729; x=1687190729; 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=Ug7OGf0yQrJUDGNrvwkfA6LnLbeMWFxvwNYAKh58q10=; b=O9kndrLTLTJGj7LpejPZ0QZjmqOk+ZFLE/n3if+u5lZS4U3iJ5sA/gW0ybHmLATibR kW4ywCZmO11GWdT44JkUNaTV641V8Hxuz5quwrgUwBiCXIIXE3KIxItrLsfn8MF6/vnb PGkjrmJCfslFQs116dK2wHm0Ju5A/EqCE96uycJgZIaTCMGvOZWNSMLfBYFET2OhT4Y/ 8oiovrJEJsuzhbmN93zUrwjlsZyzx65wK+UaHTtdtF7oGUcn9bsX1TQrhX08EgBcXv0I vJ1u3ZrIfRHqhWqUsAqAKybHNxX7SGpHtSMkeaskNo5xHIbz2vfVzGZk8ekQoRJTUeDc inwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598729; x=1687190729; 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=Ug7OGf0yQrJUDGNrvwkfA6LnLbeMWFxvwNYAKh58q10=; b=keUzU9cwNGqxyeKV2BzneuANIxHHQQhCnyTgmIQysSDlDwM5pESRpibVuzv/oS9R1y Jw2tVxTZ/0pOcQdviO8x/SI1mXV3WR0ji2joAQGkslMKch///nOOVeNinr4Y1XYSvFig DJ7bVGHqJuLIdStZE/N19civFEA1Q/CYfta9nTE1Jb6ivg0fD1E2zdBTvZh+WzDGaLOq oE8ZsAUxl5bUaMtBOqoAeOF5LohHGPUXpQHnDzbvSrUGyvBDRhwnbJKPFoWqABH/b95p lWyk8Ob40bYXV3pg1PZByIHvjjs9McZD6G2mvL3d/Z8bTRav/v1V58zNsr3IF6SK94nd vxQQ== X-Gm-Message-State: AC+VfDw1fucv3Owt9wE2Nz3TuC2R3FBVAwQmH3xeuRXeJWq0ktoWt4RN Ggx/Vu8y3huzIOQu+G2lAXxnzTF228okbfDoQrQ= X-Google-Smtp-Source: ACHHUZ6f8X4P77cXHhB6jkgxr0MJ0OMEyON0soTS3Xv1Eyt4U3XioYX17UAqi9sVFobIUKEBubX6ag== X-Received: by 2002:a05:6a20:e617:b0:106:70af:a5b9 with SMTP id my23-20020a056a20e61700b0010670afa5b9mr6051248pzb.31.1684598728869; Sat, 20 May 2023 09:05:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 07/11] perf: Depend on native setuptools3 Date: Sat, 20 May 2023 06:05:03 -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, 20 May 2023 16:05:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181570 From: Khem Raj perf has need for python setuptools when scripting is enabled from 6.0.0 onwards it seems to throw an explicit error Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit da3d00178809bbf7cc453401e0c5937796ebc2c1) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/perf/perf.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 9c9bf1647f..91bf648caa 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -13,7 +13,7 @@ PR = "r9" PACKAGECONFIG ??= "scripting tui libunwind" PACKAGECONFIG[dwarf] = ",NO_DWARF=1" -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3" +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native" # gui support was added with kernel 3.6.35 # since 3.10 libnewt was replaced by slang # to cover a wide range of kernel we add both dependencies From patchwork Sat May 20 16:05:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24236 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 1799AC77B7A for ; Sat, 20 May 2023 16:05:35 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web11.13408.1684598731539956448 for ; Sat, 20 May 2023 09:05:31 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=T7SNa4zT; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-64d4e45971bso239146b3a.2 for ; Sat, 20 May 2023 09:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598730; x=1687190730; 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=5Xn8zoASQ6H8AOE8KUCfph6Nmd66GEvN6UFomdL3ul4=; b=T7SNa4zTv9mtRBDlR1eCwiDSSPvpnfacnp2ye7afyUdpt0iv+yV/TlP8/sM3UOSS2U Au632sSK7Gptk2yRlKXzTX7yLYLMo+S6qGeKeA+ZHR4Z8yTkOBobAXG4EuAufDPxreN8 weYflep9WKTtpbLOYeC7CcDxHElw0IBTR9QibYvk/2VMkMaMYDuJuKEjXB7Z/qbo7335 cQIqujgYZ31gsQEqcPDuMly56+/Lmwt8ejguU6XbUL2h0e4F1g2IfStGKiFycKAhSqKR KU/ryuNSby/7EbeHid43FVReHqtF1r5stdPaISW4JAO/7fjpQSpoUypCNXKYDJE8kZMe AFMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598730; x=1687190730; 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=5Xn8zoASQ6H8AOE8KUCfph6Nmd66GEvN6UFomdL3ul4=; b=AbeIJ2QwlAZpez/2CtZBXxhb65qGWTL/LDPl1HPUKb2TXFCAyWVdkkCf3QzvO1nbcy iI7xpnhiN3FcB35fSYGxnY8ccZw4Rh7ZCXvyx2cdVNOlyWRNyXpSAKdUicVtd2btNJPz h4GC60N5jon8WZx94AFSLbHG3kEoCsqyzEiMkU4YaP5+l3Zlp7An2SI7YRCkCcixbKoG Y/jrmej6IMRsmrCCUDhIkxAWHglvQ+Ilely/pMU/93fHpFP5zbHvKkS4CStbPsJXTVti H+Qlg3rYTk81+genVzTLC8ZvYBeu+eaRN24V8zDhmbo5DnZjEUKhVmXBrAw6tAp2pGYb 54NA== X-Gm-Message-State: AC+VfDwG/IoL7yFohQARbbDrGjXwfrnd0MSMBZSYEL63FzbDaW0iWd3I vph0XNGCqTmAzXK4dOgFQ3/xb2l5ko0lQFre7aI= X-Google-Smtp-Source: ACHHUZ7xJ7gZzZ9tIhvNUbhJkCIu2293UN9fZukQmuHDaMyz2MH4iewNAH9ylfbHUUGacfxpGdUxoQ== X-Received: by 2002:a05:6a00:1389:b0:64c:9b56:6215 with SMTP id t9-20020a056a00138900b0064c9b566215mr8339675pfg.25.1684598730604; Sat, 20 May 2023 09:05:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/11] wic/bootimg-efi: if fixed-size is set then use that for mkdosfs Date: Sat, 20 May 2023 06:05:04 -1000 Message-Id: <2126242c19b0c3dea12c605da8b24b08a9cb803f.1684598568.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, 20 May 2023 16:05:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181571 From: Randolph Sapp This is a bit of a compatibility issue more than anything. Some devices get upset if the FAT file system contains less blocks than the partition. The fixed-size argument is currently respected by the partition creation step but not by the file system creation step. Let's make it so the file system respects this value as well. Signed-off-by: Randolph Sapp Signed-off-by: Steve Sakoman (cherry picked from commit d16301ccdfb97bf126738262eec594008c282df1) Signed-off-by: Steve Sakoman --- scripts/lib/wic/plugins/source/bootimg-efi.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 2cfdc10ecd..05e8471116 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -277,6 +277,13 @@ class BootimgEFIPlugin(SourcePlugin): logger.debug("Added %d extra blocks to %s to get to %d total blocks", extra_blocks, part.mountpoint, blocks) + # required for compatibility with certain devices expecting file system + # block count to be equal to partition block count + if blocks < part.fixed_size: + blocks = part.fixed_size + logger.debug("Overriding %s to %d total blocks for compatibility", + part.mountpoint, blocks) + # dosfs image, created by mkdosfs bootimg = "%s/boot.img" % cr_workdir From patchwork Sat May 20 16:05:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24238 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 29D89C7EE2F for ; Sat, 20 May 2023 16:05:35 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.13411.1684598733406398178 for ; Sat, 20 May 2023 09:05:33 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=z8IG5KrR; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-64d293746e0so2926101b3a.2 for ; Sat, 20 May 2023 09:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598732; x=1687190732; 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=rtT28HNrjKqEziWuAT+ChjN5RrSXlg49qGU+clgwsGs=; b=z8IG5KrR+xkBKMymk2xAp06vHMQEu7OXGV8mDY2484559daRtwdMOXP0ZQeqCOHM8L /9MAX17yX2jXtyKdcCXAjh3Hhvx5CGE5k9vWyuzwMsBwglyaYTGtAsx1+klHfM6l2T7I PJy4RTN0thUp+v1odhg8NosOJY9Txcb5uk0y26bl5xqE+L1wUSGtZ5h465/r0VbXfPK4 ox2atqjSQ8hK0VZuLnaJSt8Pn/2q4IHi8ADoE2p7aT1+vd/teLIiZd6K6bk87kUUGANw T05ei7io0KYp3LngXSh9qsXrFDpTyrEHc+HrudZBOGImeoQFAukTDo9vOO7ZQzuptPNG tNBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598732; x=1687190732; 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=rtT28HNrjKqEziWuAT+ChjN5RrSXlg49qGU+clgwsGs=; b=POrVwovOzWI2q0HbeDHAZlXXG/qV5azAqVqsb7eMStyc0iDSiRcMDKfQCsJfmzhKGp 3b/nCQPcUO1Wk83CX8urTH4aP0ecQcbTTzdmJto6mB1tdj9uKdBW7xjz9z5ejRm0XNzr q9+51e+3H/by2u0AQIx2yT0pgNoVEdXGMNNiM+LvR1DFQGDZJVnVHueiLzh0d4N1lk8E togea9gvZ3W+t3IxOTz4HxMz/nCl/NJKBl6GITRaM4QSBztORqhtYEOJ4ky+g3bzZ1aC EC+gMAQXHwMAdqRKL51TWJO0MuuZ8nlY7s2wXM2hTdAGmL6ZTRUug33Bcw96uLHiFyfA Sp5A== X-Gm-Message-State: AC+VfDzTsUnbH9rZfR7IuMsN/PaoPN39y17FIGwxJdNHRdZQVZ4XQb9q Tw8j3SqgqH+U8KdosIsSe0aTg37iDK6BKdqxpOY= X-Google-Smtp-Source: ACHHUZ6d2X8JT+YcNfiz8TAXX6lGAYnKdF7pzs4eR68/6nYuZsBQrOVeh/YYxGmSalSSE4vZaGkogg== X-Received: by 2002:a05:6a21:100a:b0:100:a636:6f22 with SMTP id nk10-20020a056a21100a00b00100a6366f22mr4535165pzb.19.1684598732218; Sat, 20 May 2023 09:05:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:31 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/11] populate_sdk_ext.bbclass: set METADATA_REVISION with an DISTRO override Date: Sat, 20 May 2023 06:05:05 -1000 Message-Id: <8f0e2e505d11697d0a1280b0a77a3fe8d72a4d49.1684598568.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, 20 May 2023 16:05:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181572 From: Martin Jansa * otherwise it ends '' inside esdk, because of parsing order: # $METADATA_REVISION [3 operations] # set /OE/build/test-D/conf/local.conf:43 # "f2da54ef432eac89b0f18eaad68e602b6990b5de" # immediate /OE/build/test-D/layers/poky/meta/classes/metadata_scm.bbclass:9 # "${@oe.buildcfg.detect_revision(d)}" # set /OE/build/test-D/layers/poky/meta/classes/metadata_scm.bbclass:10 # [vardepvalue] "${METADATA_REVISION}" # pre-expansion value: # "" METADATA_REVISION="" * This causes base-files.do_install and following tasks to have different signatures between esdk and the build directory where this esdk was created: bitbake-diffsigs {test-D,poky/build-uninative-disabled}/tmp/stamps/qemux86_64-poky-linux/base-files/*do_install*sigdata* NOTE: Starting bitbake server... basehash changed from 5b6981cf58bfd57d416b0e31611b73a26baae635dd1ac31c08d46f95064c3ffc to dbdce042da4d7813d632b6d1cc87a16f728ad20e55fecbc392830e6acf72babd Variable METADATA_REVISION value changed from '' to 'f2da54ef432eac89b0f18eaad68e602b6990b5de' and an warning from "python3 /OE/build/test-D/ext-sdk-prepare.py" when eSDK is being prepared for use: WARNING: The base-files:do_install sig is computed to be 83b9c9a6ef1145baac5a1e0d08814b9156af239c58fc42df95c25a9cd8a7f201, but the sig is locked to 3dc22233059075978e5503691e98e79e7cc60db94259dfcd886bca2291c0add7 in SIGGEN_LOCKEDSIGS_t-qemux86-64 [RP: Add commit about why we need the override for future reference] Signed-off-by: Martin Jansa Signed-off-by: Luca Ceresoli (cherry picked from commit 675ea7281c17f77bf5dea17cfd4d9da0928382a0) Signed-off-by: Steve Sakoman --- meta/classes/populate_sdk_ext.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index a43ff3fb32..1bdfd92847 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -363,7 +363,8 @@ python copy_buildsystem () { f.write('BUILDCFG_HEADER = ""\n\n') # Write METADATA_REVISION - f.write('METADATA_REVISION = "%s"\n\n' % d.getVar('METADATA_REVISION')) + # Needs distro override so it can override the value set in the bbclass code (later than local.conf) + f.write('METADATA_REVISION:%s = "%s"\n\n' % (d.getVar('DISTRO'), d.getVar('METADATA_REVISION'))) f.write('# Provide a flag to indicate we are in the EXT_SDK Context\n') f.write('WITHIN_EXT_SDK = "1"\n\n') From patchwork Sat May 20 16:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24239 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 165A5C7EE29 for ; Sat, 20 May 2023 16:05:45 +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.13621.1684598734945930672 for ; Sat, 20 May 2023 09:05:35 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Alc+LaV9; 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-64d2c865e4eso1708403b3a.0 for ; Sat, 20 May 2023 09:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598734; x=1687190734; 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=QFO4vt0yutBSa/nNqk6LbdgHLTYKn2rU8CRS7nOFWBk=; b=Alc+LaV9OYRBSof8a0U/Zvkn17CrtTspTE+InLIAypZel/hiiFKy1Ijg23msroGdGh 822UhyW1BvBsz2SltC7gmB/ckYmPaXrgQfnW9ZWb1PPMlMTzIZItpZsesV5xhV6wBqfc PModAfu/6caakTMkNZOAOy4CCr9hGAUCwBJEzDgkEeYALR3eku8rrAXo21T6/cXAXvbG HeQe8PJwrwAEy0xMzx0PMHPGyHBZ8rvr2kCpmbPf+R+LspqldGHJVR02FX1SCE2VKZVQ Ukw/NH+5JU/DgIwm1iD9qrduFruWyxYyRXf0DPeDXbwosFaSGUg/UFAGoimBujpSfRSJ USQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598734; x=1687190734; 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=QFO4vt0yutBSa/nNqk6LbdgHLTYKn2rU8CRS7nOFWBk=; b=MHetD7naElnbwSSBYSAbzoXpMQlGpYsG5Rra+fMVr7gnx+5p+L7luYBqYaBd/Oi+2v GvPXyV3u+cmfGPlBhjq1fEKcAcofv+JNAjMX2/T/i6RBw4zqJXH1ZvNsl6KXBDlKPcbL s35abphDdUeVhL2H98TFHLBjDgRlf+wCToQrxpepCW0zhu6y2O2vH1U+q8U7OmVNnHCi h/90BbGU1vlgvdfntAEBf2FwVNWEMAPCfE7xwiEniiUgXOrnf0R7rIXKanWdprY6cK5n ORx5Vi8v25TgOrsyBumzcwi3Fa65o1S0YLXr7egzJOyBTPvBibcl4P0ai6TlHuumxju1 aTng== X-Gm-Message-State: AC+VfDzib5ivI8BE8OWtTJiMAYB9U5apQV/SRq84fe0GhEp37OWr/us5 fcf/0kqE3o7c2Gskx9QmdIC0FrxybVGpHygzbac= X-Google-Smtp-Source: ACHHUZ5wyzlqcteOiEfrlkVT6HVsR4vznit2pf3Vfi9j8G3eIVm+UGwQFwpQq1MRkSxTgvxzQGwfoA== X-Received: by 2002:a05:6a00:1a15:b0:64d:88b:a342 with SMTP id g21-20020a056a001a1500b0064d088ba342mr6547954pfv.30.1684598734018; Sat, 20 May 2023 09:05:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/11] oeqa/utils/metadata.py: Fix running oe-selftest running with no distro set Date: Sat, 20 May 2023 06:05:06 -1000 Message-Id: <1a28c6cfe0e6c4b44d01778f8034231040c6d4ad.1684598568.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, 20 May 2023 16:05:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181573 From: Thomas Roos This will use default values when no distribution is set. [YOCTO #15086] Signed-off-by: Thomas Roos Signed-off-by: Luca Ceresoli (cherry picked from commit 888fe63b46efceeff08dbe8c4f66fec33d06cb7a) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py index 8013aa684d..15ec190c4a 100644 --- a/meta/lib/oeqa/utils/metadata.py +++ b/meta/lib/oeqa/utils/metadata.py @@ -27,9 +27,9 @@ def metadata_from_bb(): data_dict = get_bb_vars() # Distro information - info_dict['distro'] = {'id': data_dict['DISTRO'], - 'version_id': data_dict['DISTRO_VERSION'], - 'pretty_name': '%s %s' % (data_dict['DISTRO'], data_dict['DISTRO_VERSION'])} + info_dict['distro'] = {'id': data_dict.get('DISTRO', 'NODISTRO'), + 'version_id': data_dict.get('DISTRO_VERSION', 'NO_DISTRO_VERSION'), + 'pretty_name': '%s %s' % (data_dict.get('DISTRO', 'NODISTRO'), data_dict.get('DISTRO_VERSION', 'NO_DISTRO_VERSION'))} # Host distro information os_release = get_os_release() From patchwork Sat May 20 16:05:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 24240 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 164FBC77B7D for ; Sat, 20 May 2023 16:05:45 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.13415.1684598736825796674 for ; Sat, 20 May 2023 09:05:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Mo9kyxLz; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-64d2467d640so3187879b3a.1 for ; Sat, 20 May 2023 09:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1684598736; x=1687190736; 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=GumG+LeRB/7sq6oP0bvk7i9ity3JnYBGXvfWPeAlkPA=; b=Mo9kyxLzY3Q/cku6Kg0ZtSs17DZSwba0uZ2lDUyv+CuoKsYKTqF8Or1QYlvO1wAw31 vAbFHc9B5m/XbNnvCzy7K+2NeO2VHpHfO926BMJgQ72YF1BcB5DXG69wcqE/g4cNW1QD fLRpBaJyc9bNXCsSYUU71N5kkcyrnTY7eW02MIoBoIhXDrM4wAf2qfFTTKbr+d2R4OND X786LXxXuSWzOoGA62c6OPuuV/3Cd+bOh5yLVGb4DmDusXOkpuqGnsW/xATSM2Y6DfuL 8WfWwH2PxoUBvFEXBLvhASnupLxhyt8mSuJ7eeN6okRpFZrc2Br/v7SH4GS22/S6D04R r1Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684598736; x=1687190736; 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=GumG+LeRB/7sq6oP0bvk7i9ity3JnYBGXvfWPeAlkPA=; b=PQPBFGtMbynqNrjCdtfh53I1tWnlRIHPtSAMvTFvi0YOlctBiLKPmnvIeTz0Q/wfPg RDcqgQIDNuggyKqpeD2V1JnPWTsN+DSzYHsWJBfHAvD0tZPF0aPLnOO99fOvq1Ush2NP hEY4HEpfNLLJ9j0T3LZhis7nMZvO71zxeL7RMdyA4WGq3EevIrkjWdGXJKRJ4l5EXTaA alR5w/lGYrRdR3fp3pMW59TnANFKr1LrD8sHBz5dw5Gh6mjbKpxpKXEToY1mpHykBvzL ZDkRKCqYWN69r5ZgIPM17S/amNCnKyBxaZreNOLBcMQyH4HiPwAIksPZr5Bwiksx94RQ taxQ== X-Gm-Message-State: AC+VfDw5RZeQdqwQ45dUK7YeVJW2lEAmB5RQCPsPp0atawIl2BRcC62O bvO50Ij8zktQcE2Zmt+znq2j7LUNu4F7imLmv0I= X-Google-Smtp-Source: ACHHUZ53/PsSY+qDy/NhQgC70Ol8GDz7VAhLnNHmO/DMnnr280onISTzb2m79wCpe8ZrbO0uXtp7qg== X-Received: by 2002:a05:6a00:15c7:b0:62d:d045:392 with SMTP id o7-20020a056a0015c700b0062dd0450392mr8452802pfu.32.1684598735730; Sat, 20 May 2023 09:05:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id a24-20020a62e218000000b00642f1e03dc1sm1457790pfi.174.2023.05.20.09.05.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:05:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/11] selftest: skip virgl test on ubuntu 22.10, fedora 37, and all rocky Date: Sat, 20 May 2023 06:05:07 -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, 20 May 2023 16:05:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181574 This test will fail any time the host has libdrm > 2.4.107 Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runtime_test.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 5439bd426b..d80f85dba2 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -177,6 +177,8 @@ class TestImage(OESelftestTestCase): distro = oe.lsb.distro_identifier() if distro and distro.startswith('almalinux'): self.skipTest('virgl isn\'t working with Alma Linux') + if distro and distro.startswith('rocky'): + self.skipTest('virgl isn\'t working with Rocky Linux') if distro and distro == 'debian-8': self.skipTest('virgl isn\'t working with Debian 8') if distro and distro == 'centos-7': @@ -189,10 +191,14 @@ class TestImage(OESelftestTestCase): self.skipTest('virgl isn\'t working with Fedora 35') if distro and distro == 'fedora-36': self.skipTest('virgl isn\'t working with Fedora 36') + if distro and distro == 'fedora-37': + self.skipTest('virgl isn\'t working with Fedora 37') if distro and distro == 'opensuseleap-15.0': self.skipTest('virgl isn\'t working with Opensuse 15.0') if distro and distro == 'ubuntu-22.04': self.skipTest('virgl isn\'t working with Ubuntu 22.04') + if distro and distro == 'ubuntu-22.10': + self.skipTest('virgl isn\'t working with Ubuntu 22.10') qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')