From patchwork Mon May 20 13:33:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43861 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24CDBC25B7B for ; Mon, 20 May 2024 13:33:46 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.61046.1716212020198772632 for ; Mon, 20 May 2024 06:33:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=z4uGRYXz; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6f4603237e0so1658007b3a.0 for ; Mon, 20 May 2024 06:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212019; x=1716816819; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dpJstW6TNLFsCNL/V2qqRcalum8FxHFzbN0s/WNZX2U=; b=z4uGRYXzlPLCA6qQPe7c1uElRHFs61T/R9S7pbjlLFBKTxOCfTE1NMTeIusQjgzHSk /zGj6D1PeM9YD/kcxC0gSq1tUPXBrfhpodEFb5RCeWLngzBpCjhbw/XEWg2IZ99FjaHk Pfh+icCBefumjbdFSLcilEQ55StD29kGq5F6a0yai2fqDN1GB6xhJtudfxlatIPIckZp Pef3Cleu/lQ1CvjdlQnqBAsF84k9B4/Z/PK97v1BwqtxbgVjmSwVyPIG0KYGgbnTnI/+ Jr35yYFFjoAAGMBJeRVPon+qq0AaI8ydug4hv1ae+RsOE89Y74O5e2yDjhXoWNA5jVel s66w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212019; x=1716816819; 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=dpJstW6TNLFsCNL/V2qqRcalum8FxHFzbN0s/WNZX2U=; b=SDxb64DgYmX++6x9tsEqgwrs8G2bvUKiev96B7iYAMGY1d1IdZsHho5eQb4afZ1pxr t+ootHhakSjXqK5oqaQc5AZexckhdxfH6kEDNumMKO2/4xHVhKofjP0MEt7WRSLALQ3j omMyNPFWmk10rpWH9QDuBfCBV0WRXRx/MBcwbAkUpTyG4JxFmcMy/HAk9uFTknuY99Lv Y93BcVLblQfhdCNUc5fiqaOcXsRJhWIomX+4FibJU7Ltl/+lpwoSSbN+foM6jn0G6k3R Q57OtZ8KimjjUzxMqnWwbzp3cGvq5dwRJ06bd8JNY0Vy6s8UTGicXc3HANlmzY6y6/rF eBTQ== X-Gm-Message-State: AOJu0YzI5VTfy/1OTYvv9B/rz6arY7UjI5y6TZvhBfbVIOdwwuW6KQex /vgh/IW2oGUC7eWBn13aP0ysbPJQykzLRrN+hCyDxm1cG0R4ZfzaX3A3ajM6hM0ph4rDRqRrtCq z X-Google-Smtp-Source: AGHT+IGzZk1ABv2RclzsRK9b4GvBOafXqVVXyp17Jm1JnRODuOaTe58GOBY+jOY/pUKViTIwKGAz3Q== X-Received: by 2002:a05:6a00:21c4:b0:6ec:d3a6:801 with SMTP id d2e1a72fcca58-6f69fbfe7e5mr7674633b3a.11.1716212019227; Mon, 20 May 2024 06:33:39 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/21] ncurses: Fix CVE-2023-50495 Date: Mon, 20 May 2024 06:33:12 -0700 Message-Id: <55cca070799a236b06f5cba6f53487fca458f25d.1716211838.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 ; Mon, 20 May 2024 13:33:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199572 From: Mingli Yu Backport a patch [1] to fix CVE-2023-50495. [1] http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=7723dd6799ab10b32047ec73b14df9f107bafe99 Signed-off-by: Mingli Yu Signed-off-by: Alexandre Belloni (cherry picked from commit bdf7b7460a4816e3d447264730a2814209667fb0) Signed-off-by: Steve Sakoman --- .../ncurses/files/CVE-2023-50495.patch | 301 ++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.4.bb | 1 + 2 files changed, 302 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/CVE-2023-50495.patch diff --git a/meta/recipes-core/ncurses/files/CVE-2023-50495.patch b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch new file mode 100644 index 0000000000..7d90ddd30f --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch @@ -0,0 +1,301 @@ +From 7daae3f2139a678fe0ae0b42fcf8d807cbff485c Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Sun, 4 Feb 2024 13:42:38 +0800 +Subject: [PATCH] parse_entry.c: check return value of _nc_save_str + +* check return value of _nc_save_str(), in special case for tic where +extended capabilities are processed but the terminal description was +not initialized (report by Ziqiao Kong). + +* regenerate llib-* files. + +CVE: CVE-2023-50495 + +Upstream-Status: Backport [http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=7723dd6799ab10b32047ec73b14df9f107bafe99] + +Signed-off-by: Mingli Yu +--- + ncurses/llib-lncurses | 15 +++++++++++++++ + ncurses/llib-lncursest | 15 +++++++++++++++ + ncurses/llib-lncursestw | 15 +++++++++++++++ + ncurses/llib-lncursesw | 15 +++++++++++++++ + ncurses/llib-ltinfo | 15 +++++++++++++++ + ncurses/llib-ltinfot | 15 +++++++++++++++ + ncurses/llib-ltinfotw | 15 +++++++++++++++ + ncurses/llib-ltinfow | 15 +++++++++++++++ + ncurses/tinfo/parse_entry.c | 23 ++++++++++++++++------- + 9 files changed, 136 insertions(+), 7 deletions(-) + +diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses +index 211cf3b7..e4190aa2 100644 +--- a/ncurses/llib-lncurses ++++ b/ncurses/llib-lncurses +@@ -3656,6 +3656,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest +index 1b09d676..e07abba6 100644 +--- a/ncurses/llib-lncursest ++++ b/ncurses/llib-lncursest +@@ -3741,6 +3741,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw +index 4576e0fc..747c6be8 100644 +--- a/ncurses/llib-lncursestw ++++ b/ncurses/llib-lncursestw +@@ -4702,6 +4702,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw +index 127350d2..862305d9 100644 +--- a/ncurses/llib-lncursesw ++++ b/ncurses/llib-lncursesw +@@ -4617,6 +4617,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo +index a5cd7cd3..31e5e9a6 100644 +--- a/ncurses/llib-ltinfo ++++ b/ncurses/llib-ltinfo +@@ -927,6 +927,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot +index bd3de812..48e5c25a 100644 +--- a/ncurses/llib-ltinfot ++++ b/ncurses/llib-ltinfot +@@ -1003,6 +1003,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw +index 4d35a1e1..64dfdfa5 100644 +--- a/ncurses/llib-ltinfotw ++++ b/ncurses/llib-ltinfotw +@@ -1025,6 +1025,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow +index db846764..7e17a35f 100644 +--- a/ncurses/llib-ltinfow ++++ b/ncurses/llib-ltinfow +@@ -949,6 +949,21 @@ char *tiparm( + ...) + { return(*(char **)0); } + ++#undef tiparm_s ++char *tiparm_s( ++ int num_expected, ++ int tparm_type, ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiscan_s ++int tiscan_s( ++ int *num_expected, ++ int *tparm_type, ++ const char *string) ++ { return(*(int *)0); } ++ + #undef _nc_tiparm + char *_nc_tiparm( + int expected, +diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c +index 14bcb67e..0a0b5637 100644 +--- a/ncurses/tinfo/parse_entry.c ++++ b/ncurses/tinfo/parse_entry.c +@@ -110,7 +110,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) + /* Well, we are given a cancel for a name that we don't recognize */ + return _nc_extend_names(entryp, name, STRING); + default: +- return 0; ++ return NULL; + } + + /* Adjust the 'offset' (insertion-point) to keep the lists of extended +@@ -142,6 +142,11 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) + for (last = (unsigned) (max - 1); last > tindex; last--) + + if (!found) { ++ char *saved; ++ ++ if ((saved = _nc_save_str(name)) == NULL) ++ return NULL; ++ + switch (token_type) { + case BOOLEAN: + tp->ext_Booleans++; +@@ -169,7 +174,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) + TYPE_REALLOC(char *, actual, tp->ext_Names); + while (--actual > offset) + tp->ext_Names[actual] = tp->ext_Names[actual - 1]; +- tp->ext_Names[offset] = _nc_save_str(name); ++ tp->ext_Names[offset] = saved; + } + + temp.nte_name = tp->ext_Names[offset]; +@@ -364,6 +369,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) + bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0); + bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0); + if (is_use || is_tc) { ++ char *saved; ++ + if (!VALID_STRING(_nc_curr_token.tk_valstring) + || _nc_curr_token.tk_valstring[0] == '\0') { + _nc_warning("missing name for use-clause"); +@@ -377,11 +384,13 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) + _nc_curr_token.tk_valstring); + continue; + } +- entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); +- entryp->uses[entryp->nuses].line = _nc_curr_line; +- entryp->nuses++; +- if (entryp->nuses > 1 && is_tc) { +- BAD_TC_USAGE ++ if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) { ++ entryp->uses[entryp->nuses].name = saved; ++ entryp->uses[entryp->nuses].line = _nc_curr_line; ++ entryp->nuses++; ++ if (entryp->nuses > 1 && is_tc) { ++ BAD_TC_USAGE ++ } + } + } else { + /* normal token lookup */ +-- +2.25.1 + diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb index 2c621525f9..31f18bbadc 100644 --- a/meta/recipes-core/ncurses/ncurses_6.4.bb +++ b/meta/recipes-core/ncurses/ncurses_6.4.bb @@ -6,6 +6,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://exit_prototype.patch \ file://0001-Fix-CVE-2023-29491.patch \ file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ + file://CVE-2023-50495.patch \ " # commit id corresponds to the revision in package version SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" From patchwork Mon May 20 13:33:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43860 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25018C25B7C for ; Mon, 20 May 2024 13:33:46 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.61047.1716212021643670219 for ; Mon, 20 May 2024 06:33:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=pGm5ktLK; 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-6f6b1ac1e90so558897b3a.1 for ; Mon, 20 May 2024 06:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212021; x=1716816821; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5SYeNXssjEFp/d+mA4K286QL9X8NtevM4CXc+3Itrz4=; b=pGm5ktLKhO8zC8uBwCs03g2kXYT5Unpac5fc6RymrtfVWQkshSMYDA96ezUdpAXXA3 9V3OcQYXCIgVZdn+kM7t0VvMwbrNmuvkBWjztIJiTiJrCAVZaheN+f+s+QWFnvxxR2y9 uTgB3LVGb14C/9n44Q9JgBdf4HC9APy3kfEW8TjRcPzFZGrNr1Q1Y0m4ZOPOnjyYcMtJ z69uMrSH0/d4+cb7JwVykN0hCbkzFczYsLq8plWnpTtjItBb9xnMejb/Hy+1eFp5jGbj Dbtw2saGSG8qKbhtCoM1/OFlZ37OmrHugVIP58pTQwxZtdkq2jFSpWjGapPqcW2KuGfV HUXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212021; x=1716816821; 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=5SYeNXssjEFp/d+mA4K286QL9X8NtevM4CXc+3Itrz4=; b=ty0kbX8xtP46/RdVOYUNxty7MKdjE6DFqTRlbFlaN+xlz9/co2JBU4/PKdaUAbG5tL 4jOI4JE41I4KCP3N2EGqMjcDrzcBXQ6MtTPbDZVNSHlYdGFqSwpHLYGkU7SmoOfgndNk YCLFsOMXfeNJgq4KyW+8j+86rEHmkmuIgDbnm0DS9r5Qz0PDglYssI9ovo3CCKnoPRGY Pvprzgn1GIPjPl1Kmw8fj/atooYXTdBnCzVCkpZ+r31nTAu7bh21sjdK78y//slD7elt iBnM9Xxx7sYm6Y7/I1MNY6SyyXpRQN8MHGxLPAh6QrgkT3KjRKkFI5Ti/uiF2BT2/nS4 mQiQ== X-Gm-Message-State: AOJu0YyF/eJx9NdQcwTPIUdQu8CLeOHcujw3n59RpM6G8g8omPJdSrfP 3X29t9OcWBugGtz9aQ1k7HvHjZqXh/wADmgkCOf7lBm+PGKNL5HY8FHtJQFg0HpTc2eh7kD/8z6 v X-Google-Smtp-Source: AGHT+IHkvUMjjNiCX2CxS5+Vwndnvf19q1KIVF0I8ib3XcPtXagVO7RHQRUFvCcbD3sHK6l2RF2XYA== X-Received: by 2002:a05:6a20:7f8a:b0:1a9:509c:eba6 with SMTP id adf61e73a8af0-1b1ca450abamr8049845637.25.1716212020780; Mon, 20 May 2024 06:33:40 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/21] openssl: patch CVE-2024-4603 Date: Mon, 20 May 2024 06:33:13 -0700 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 ; Mon, 20 May 2024 13:33:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199573 From: Peter Marko Advisory: https://github.com/advisories/GHSA-85xr-ghj6-6m46 Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../openssl/openssl/CVE-2024-4603.patch | 179 ++++++++++++++++++ .../openssl/openssl_3.2.1.bb | 1 + 2 files changed, 180 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch new file mode 100644 index 0000000000..50fb969c03 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch @@ -0,0 +1,179 @@ +From da343d0605c826ef197aceedc67e8e04f065f740 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Wed, 8 May 2024 15:23:45 +0200 +Subject: [PATCH] Check DSA parameters for excessive sizes before validating + +This avoids overly long computation of various validation +checks. + +Fixes CVE-2024-4603 + +Reviewed-by: Paul Dale +Reviewed-by: Matt Caswell +Reviewed-by: Neil Horman +Reviewed-by: Shane Lontis +(Merged from https://github.com/openssl/openssl/pull/24346) + +(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b) + + + +CVE: CVE-2024-4603 +Upstream-Status: Backport [https://github.com/openssl/openssl/commit/da343d0605c826ef197aceedc67e8e04f065f740] +Signed-off-by: Peter Marko +--- + crypto/dsa/dsa_check.c | 44 ++++++++++++-- + .../invalid/p10240_q256_too_big.pem | 57 +++++++++++++++++++ + 2 files changed, 97 insertions(+), 4 deletions(-) + +diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c +index fb0e9129a2..122449a7bf 100644 +--- a/crypto/dsa/dsa_check.c ++++ b/crypto/dsa/dsa_check.c +@@ -19,8 +19,34 @@ + #include "dsa_local.h" + #include "crypto/dsa.h" + ++static int dsa_precheck_params(const DSA *dsa, int *ret) ++{ ++ if (dsa->params.p == NULL || dsa->params.q == NULL) { ++ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS); ++ *ret = FFC_CHECK_INVALID_PQ; ++ return 0; ++ } ++ ++ if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) { ++ ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE); ++ *ret = FFC_CHECK_INVALID_PQ; ++ return 0; ++ } ++ ++ if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) { ++ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE); ++ *ret = FFC_CHECK_INVALID_PQ; ++ return 0; ++ } ++ ++ return 1; ++} ++ + int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) + { ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ + if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK) + return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params, + FFC_PARAM_TYPE_DSA, ret); +@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) + */ + int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) + { ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ + return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret) + && *ret == 0; + } +@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) + */ + int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret) + { ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ + return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret) + && *ret == 0; + } +@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret) + { + *ret = 0; + +- return (dsa->params.q != NULL +- && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret)); ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ ++ return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret); + } + + /* +@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa) + BN_CTX *ctx = NULL; + BIGNUM *pub_key = NULL; + +- if (dsa->params.p == NULL +- || dsa->params.g == NULL ++ if (!dsa_precheck_params(dsa, &ret)) ++ return 0; ++ ++ if (dsa->params.g == NULL + || dsa->priv_key == NULL + || dsa->pub_key == NULL) + return 0; +diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem +new file mode 100644 +index 0000000000..e85e2953b7 +--- /dev/null ++++ b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem +@@ -0,0 +1,57 @@ ++-----BEGIN DSA PARAMETERS----- ++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja ++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil ++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF ++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk ++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW ++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb ++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O ++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ ++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5 ++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2 ++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB ++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN ++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl ++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ ++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg ++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG ++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE ++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN ++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2 ++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8 ++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd ++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW ++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9 ++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7 ++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s ++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs ++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN ++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy ++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx ++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36 ++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2 ++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B ++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8 ++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W ++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl +++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX ++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq ++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX ++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot ++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK ++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco ++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD ++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3 ++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy ++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct ++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+ ++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd ++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG ++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E ++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk ++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF ++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d ++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa ++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D ++vKuje86bePD6kD/LH3wmkA== ++-----END DSA PARAMETERS----- +-- +2.30.2 + diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb b/meta/recipes-connectivity/openssl/openssl_3.2.1.bb index d37b68abbb..9bdf7e1ec6 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.2.1.bb @@ -14,6 +14,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ file://bti.patch \ file://CVE-2024-2511.patch \ + file://CVE-2024-4603.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Mon May 20 13:33:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43863 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F729C25B7A for ; Mon, 20 May 2024 13:33:46 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.61049.1716212023136393011 for ; Mon, 20 May 2024 06:33:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=acmaiNlV; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1ed96772f92so72914935ad.0 for ; Mon, 20 May 2024 06:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212022; x=1716816822; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XsxANYXeHYagCtJ3FEzulfLkxTUVvfPdgH7n8WJ4vG4=; b=acmaiNlVq7vd+LkoxKQeViCFuK+WIRm38eCwTFLqaFFSXWl8pwZe/Zrrk0JffNDLuj 3fVcCQ4pu92NYBntxYIamIi0RX5VarvJh2mf4FYJPuHU89CrAKyrOrKsbAzm9ZTcw+ZX ckkozOEVGc+HefAFMDwfRAYonhv+6dL9odBDGKwLSAIihpwXuFz6c8H2/dvoimhkXTyx 4I6vrQ4CGKcY6Kn2IUPEkP73Wi57IbsDLq3uM7ac7VsQzZGHGR/dndH+Zz6GdCqGeUip LdQ1ld+St36rcfrJ0MByrCSiPYtnH1OGAn1eh8E4E0+mR3/DXy3LHKODqY8ecOCvdu8G Lcew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212022; x=1716816822; 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=XsxANYXeHYagCtJ3FEzulfLkxTUVvfPdgH7n8WJ4vG4=; b=VTD76yUWrG6Z0O3YgBd2gql9loCVGfV2JnjpSl0uTLSgjzSlXpE9/eEp2Cr+5KYuuO R+RTEWEeZgmH+C8zhJURCigHH3E4olF0gGaMXpHEdd9f0fagN1Pj4bPdLFzsoy7SF85C VXTaocUgaiBpgVlSXRFhV9sYFtNmFEHdKoGBCNeaE2go7HbmiDc3oAxgUrBPKZOnQ9Xd jYhkBe6Ff/qmiIzgpucnHcr5HemKOf3xgcmf/Zg5X6TEmYGbEgJDjaGrDtm2Q3tUq8Cs NuRbA0C3N3ItQcBpMO1mIL0p5I8a9uBkBHfpEl1TvZXwEULit2N0Z6kGm2uzYczZQM7Q dmoQ== X-Gm-Message-State: AOJu0Yxgv31P73iC19dc7S1veF1X613uHA9UvjLczjV8NUwh8bqktzbz Edq6L3TM7w90C1K8YGRLAJ/eKgQeUv1eVaFByNPWjUfvB4h28ZUOoSqN3sIxDeL2PSbJUCsGi1x 0 X-Google-Smtp-Source: AGHT+IHn7JdXPMkuNf1XYdwOKdNm9TzbJrtkrL+QdpI3CU7DPJIr18gqeantn2jaAQgk1Pqqm5t3Xw== X-Received: by 2002:a05:6a20:914f:b0:1af:af89:ed71 with SMTP id adf61e73a8af0-1afde0d3affmr31154892637.19.1716212022224; Mon, 20 May 2024 06:33:42 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/21] glib-2.0: Upgrade 2.78.4 -> 2.78.5 Date: Mon, 20 May 2024 06:33:14 -0700 Message-Id: <14de0c10f6b65eac758220d95e6d31066649a214.1716211838.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 ; Mon, 20 May 2024 13:33:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199574 From: Peter Marko Handle CVE-2024-34397 Remove backported patch included in this release. News (https://gitlab.gnome.org/GNOME/glib/-/commit/d18807b5ffc6dedc2db5225b044063f65720bf56): Overview of changes in GLib 2.78.5, 2024-05-07 ============================================== * Fix CVE-2024-34397: GDBus signal subscriptions for well-known names are vulnerable to unicast spoofing (#3268, work by Simon McVittie, reported by Alicia Boya García) * Bugs fixed: - #3168 gvfs-udisks2-volume-monitor SIGSEGV in g_content_type_guess_for_tree() due to filename with bad encoding (Ondrej Holy) - #3268 CVE-2024-34397: GDBus signal subscriptions for well-known names are vulnerable to unicast spoofing (Simon McVittie) - !3825 glib-2-78: ci: Drop FreeBSD 12 CI runner as it’s EOL - !3960 gcontenttype: Make filename valid utf-8 string before processing - !4040 Backport !4038 “gdbusconnection: Don't deliver signals if the sender doesn't match” to glib-2-78 - !4043 CI: Ignore MSYS2 CI failures for this older stable-branch * Translation updates: - English (United Kingdom) (Andi Chandler) - Georgian (Ekaterine Papava) - Portuguese (Brazil) (Juliano de Souza Camargo) Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../glib-2.0/glib-2.0/fix-regex.patch | 54 ------------------- ...{glib-2.0_2.78.4.bb => glib-2.0_2.78.5.bb} | 3 +- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.78.4.bb => glib-2.0_2.78.5.bb} (95%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch deleted file mode 100644 index bdfbd55899..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Mon, 26 Feb 2024 16:55:44 +0000 -Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -PCRE2 10.43 has now introduced support for variable-length lookbehind, -so these tests now fail if GLib is built against PCRE2 10.43 or higher. - -See -https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94. - -Rather than making the tests conditional on the version of PCRE2 in use, -just remove them. They are mostly testing the PCRE2 code rather than -any code in GLib, so don’t have much value. - -This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2 -days ago. - -Signed-off-by: Philip Withnall - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6] -Signed-off-by: Alexander Kanavin ---- - glib/tests/regex.c | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/glib/tests/regex.c b/glib/tests/regex.c -index 1082526292..d7a698ec67 100644 ---- a/glib/tests/regex.c -+++ b/glib/tests/regex.c -@@ -1885,16 +1885,6 @@ test_lookbehind (void) - g_match_info_free (match); - g_regex_unref (regex); - -- regex = g_regex_new ("(? X-Patchwork-Id: 43858 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16D59C41513 for ; Mon, 20 May 2024 13:33:46 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.60336.1716212024455894047 for ; Mon, 20 May 2024 06:33:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wkuVglF5; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ed96772f92so72915525ad.0 for ; Mon, 20 May 2024 06:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212024; x=1716816824; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=plIC2qOJM3H4zmjxkSh5EDXNQlH3d2RnMv4rByGmPyc=; b=wkuVglF5DHKNM6WMC9Z2z0wYjUweSrbNOLfQQ3kTUtQCQgPLS2iokAACsVGys274kT WiPcFhXSXNTvlTG5fg/WtTl8U8uXixRdTARrWJwHVognll4mxFZIZzhXD3htma2x1fWg wkf1pGwh1/Or/2MPX3oUTyDyCRdOi2UoI1RMT1p1U1U7pHpyxPEGFUjLlNu6B3oEezRB uQjQHZa5d9UQvCM+I7ULrhUgP+xGMZJhFcuzOMxV0qydx3bj63+MUtcXYqOcuyHTa6NO 58JVhAKo8295BigaGBL7ZOddY/l6yVaw5Aqtvy0iZLamOAkRwAH86gUshKIC41jUDOfQ KVxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212024; x=1716816824; 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=plIC2qOJM3H4zmjxkSh5EDXNQlH3d2RnMv4rByGmPyc=; b=qrM5bBDJE+F32OAjDsgLfbRbYPOMtGK4dWvS5Z1s5NbK9xJZ59REXcrpKx/rjo5370 8F8f0sfTloDESMRORBjoeErs8blB6hFwksZ2ymeLPP/FJOSYKn5SHn1+xINuePmBuD2U z6SnQRazO+uyE9cM/EyFKMI23OBgYu2V+DohyU/Pfl8idVZIqd/G72lBDf0Z/22dDpYz TUyCuwLvIMrl06Ss0jFGGRF4ePNCATwXAh/472gBg434YRL22BayXSDLiquk7QoOAP7e psBAqMElT4fFcwxTR1u9oH4O8Ht87RFSWyFemfqe5uWNaDiGO57MDwRKiHmwwpdpeXx4 LNcw== X-Gm-Message-State: AOJu0YwJqrRrSDQaioPzan0+ByXLXWhtqdNbg7bz+mIIxDoqMTo95Yi0 moOuqU61eHHuIC2H9ICgFkr3KBYf1Y3grJ21SQv//e4gca+hG6tUvaivtSlWlrI98sARyBZIEry U X-Google-Smtp-Source: AGHT+IHyxdd39DOqPWwnfxhdsuoXEMevBoUApLKxwIDxk/gMUCC5gTJqPLbNEllCL6DPNAh8AHmjOQ== X-Received: by 2002:a05:6a21:6d9e:b0:1af:952f:f6fb with SMTP id adf61e73a8af0-1afde0a8e00mr31226280637.3.1716212023662; Mon, 20 May 2024 06:33:43 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/21] glib-2.0: Upgrade 2.78.5 -> 2.78.6 Date: Mon, 20 May 2024 06:33:15 -0700 Message-Id: <51da20dc574a7f2a9759a4368d7668e3421e379f.1716211838.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 ; Mon, 20 May 2024 13:33:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199575 From: Peter Marko Handle regression of CVE-2024-34397 fix. News (https://gitlab.gnome.org/GNOME/glib/-/commit/d40f72e98e4734ba826ba9a278814530720ba760): Overview of changes in GLib 2.78.6, 2024-05-08 ============================================== * Fix a regression with IBus caused by the fix for CVE-2024-34397 (#3353, work by Simon McVittie) * Bugs fixed: - #3353 Fixing CVE-2024-34397 caused regressions for ibus (Simon McVittie) - !4056 Backport !4053 “gdbusconnection: Allow name owners to have the syntax of a well-known name” to glib-2-78 Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../glib-2.0/{glib-2.0_2.78.5.bb => glib-2.0_2.78.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.78.5.bb => glib-2.0_2.78.6.bb} (96%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb similarity index 96% rename from meta/recipes-core/glib-2.0/glib-2.0_2.78.5.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb index d0aac737f7..1a4278b1bc 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.5.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb @@ -22,7 +22,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ " -SRC_URI[sha256sum] = "39b26044bd44dc30f427202add4997f554723c30017e92ff36da4197a2c916aa" +SRC_URI[sha256sum] = "244854654dd82c7ebcb2f8e246156d2a05eb9cd1ad07ed7a779659b4602c9fae" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. From patchwork Mon May 20 13:33:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43862 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FBE9C25B7E for ; Mon, 20 May 2024 13:33:46 +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.61051.1716212025839827582 for ; Mon, 20 May 2024 06:33:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=T+mM1Hy+; 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-6f693fb0ab6so508458b3a.1 for ; Mon, 20 May 2024 06:33:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212025; x=1716816825; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4jdMLHUhpR3mNuGvSs8mznyuyTZ+Bqz+deWIwKfKvpg=; b=T+mM1Hy+DPHF2fSt/xOyliAs3RCKjMnoL5Rc0yR9kxHQTq92us6QNZQpWWKKTmobiq hAzVHhNEqI+3e+NuwusjBLO8sBBBRnbNG+qJ+CEwhd0rvsV2a1/bOVpwBNKSW4WNUCZA WS44+RV0p4v/A4PlvTjSBnr6X1CzndQmbV2QpJaMXpAnsmHTZNwcBBRSr6UsF8e1JbBX j1F9PqQZmGNq7xDQXdjw40Avtr6TCcGXg+V5n0jkpWtgycdqFjcattZw+Qka94IiI6Nl J592kGN+3HkljBUdoAJbwJnHkFnpkc6r5FwNOMdwlSXuwww196mEdI33LiJTg7GaH5XW Fsiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212025; x=1716816825; 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=4jdMLHUhpR3mNuGvSs8mznyuyTZ+Bqz+deWIwKfKvpg=; b=gvd+0d/itOvCTsMwMOGnvu+RqiI4DzR2E+dAQrkWic8kMFchSdqJQgvipFXC/Let15 MQyG4Z9tDdT9szl4Q4aBlGCs2KIoSh6uW0ZI0Qw0klxG853+i2Bx41+UuwSmJYpf2EKg y0sGKRho7diEZBVVsLI5mScNYOHrDcPE2ewW72JZYNK+5hCfheY1zadPpJwdP7J68DJe IHaUwr8HFjknNr8u3stmmieaX6EEqqQVufdk5hyWa+vkbvq7pkpZHteUeoDM3G4ixH6k m7UDzshZOKGYNnjEdOQrSomOMJH+qQxn4W3Kf7fMYYp0p1tmhX5Ll2WrgPNzJGYYkFpH DUeQ== X-Gm-Message-State: AOJu0YyiZqn0sXn0jRqBNjHvqe7o08r+0HUhB99G70EtYUd2fzQFH3ri /vfF7wSslGcPSqRwTyy/HRT+7nklygk/CQPR7gLabETBxcpCuBuXpr4WwBZ3LJXWXy9zXGC4Cjr t X-Google-Smtp-Source: AGHT+IH86hXPjgn8ZkiVvRKfLla6RBbakKlKuJZpn4pwl/iwXywO+ndgc9Q3bwGMt5LZtg+eO2mn0A== X-Received: by 2002:a05:6a00:cc3:b0:6f3:ecdc:2248 with SMTP id d2e1a72fcca58-6f4e036b640mr30968882b3a.27.1716212025033; Mon, 20 May 2024 06:33:45 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/21] glibc: Update to latest on stable 2.39 branch Date: Mon, 20 May 2024 06:33:16 -0700 Message-Id: <7f3e6019a902eb3dcee3798e9ea0f94865d51c7f.1716211838.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 ; Mon, 20 May 2024 13:33:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199576 From: Peter Marko Adresses CVE-2024-2961 Remove backported patch included in hash update. Changes: 31da30f23c iconv: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) 423099a032 x86_64: Exclude SSE, AVX and FMA4 variants in libm multiarch 04df8652eb Apply the Makefile sorting fix edb9a76e30 powerpc: Fix ld.so address determination for PCREL mode (bug 31640) 7b92f46f04 x86-64: Simplify minimum ISA check ifdef conditional with if 9883f4304c x86-64: Don't use SSE resolvers for ISA level 3 or above 9d92452c70 AArch64: Check kernel version for SVE ifuncs 395a89f61e aarch64: fix check for SVE support in assembler b0e0a07018 aarch64/fpu: Sync libmvec routines from 2.39 and before with AOR 31c7d69af5 i386: Use generic memrchr in libc (bug 31316) 5d070d12b3 x86: Expand the comment on when REP STOSB is used on memset 6484a92698 x86: Do not prefer ERMS for memset on Zen3+ aa4249266e x86: Fix Zen3/Zen4 ERMS selection (BZ 30994) 5a461f2949 Add tst-gnu2-tls2mod1 to test-internal-extras aded2fc004 elf: Enable TLS descriptor tests on aarch64 a8ba52bde5 arm: Update _dl_tlsdesc_dynamic to preserve caller-saved registers (BZ 31372) 15aebdbada Ignore undefined symbols for -mtls-dialect=gnu2 354cabcb26 x86-64: Allocate state buffer space for RDI, RSI and RBX 853e915fdd x86-64: Update _dl_tlsdesc_dynamic to preserve AMX registers a364304718 x86: Update _dl_tlsdesc_dynamic to preserve caller-saved registers 7fc8242bf8 x86-64: Save APX registers in ld.so trampoline 983f34a125 LoongArch: Correct {__ieee754, _}_scalb -> {__ieee754, _}_scalbf aad45c8ac3 powerpc: Placeholder and infrastructure/build support to add Power11 related changes. ee7f4c54e1 powerpc: Add HWCAP3/HWCAP4 data to TCB for Power Architecture. 71fcdba577 linux: Use rseq area unconditionally in sched_getcpu (bug 31479) Signed-off-by: Peter Marko Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8b0124782510389bdc376fab645a0920b3fb94c8) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-version.inc | 2 +- ...e-Pass-mcpu-along-with-march-to-dete.patch | 62 ------------------- ...ss.patch => 0023-qemu-stale-process.patch} | 0 meta/recipes-core/glibc/glibc_2.39.bb | 7 ++- 4 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch rename meta/recipes-core/glibc/glibc/{0024-qemu-stale-process.patch => 0023-qemu-stale-process.patch} (100%) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 618a574566..4fc6986ffc 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.39/master" PV = "2.39+git" -SRCREV_glibc ?= "1b9c1a0047fb26a65a9b2a7b8cd977243f7d353c" +SRCREV_glibc ?= "31da30f23cddd36db29d5b6a1c7619361b271fb4" SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" diff --git a/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch b/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch deleted file mode 100644 index f6523c5498..0000000000 --- a/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 73c26018ed0ecd9c807bb363cc2c2ab4aca66a82 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy -Date: Wed, 13 Mar 2024 14:34:14 +0000 -Subject: [PATCH] aarch64: fix check for SVE support in assembler - -Due to GCC bug 110901 -mcpu can override -march setting when compiling -asm code and thus a compiler targetting a specific cpu can fail the -configure check even when binutils gas supports SVE. - -The workaround is that explicit .arch directive overrides both -mcpu -and -march, and since that's what the actual SVE memcpy uses the -configure check should use that too even if the GCC issue is fixed -independently. - -Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=73c26018ed0ecd9c807bb363cc2c2ab4aca66a82] -Signed-off-by: Khem Raj -Reviewed-by: Florian Weimer ---- - sysdeps/aarch64/configure | 5 +++-- - sysdeps/aarch64/configure.ac | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - mode change 100644 => 100755 sysdeps/aarch64/configure - -diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -old mode 100644 -new mode 100755 -index ca57edce47..9606137e8d ---- a/sysdeps/aarch64/configure -+++ b/sysdeps/aarch64/configure -@@ -325,9 +325,10 @@ then : - printf %s "(cached) " >&6 - else $as_nop - cat > conftest.s <<\EOF -- ptrue p0.b -+ .arch armv8.2-a+sve -+ ptrue p0.b - EOF --if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5' -+if { ac_try='${CC-cc} -c conftest.s 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? -diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 27874eceb4..56d12d661d 100644 ---- a/sysdeps/aarch64/configure.ac -+++ b/sysdeps/aarch64/configure.ac -@@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs]) - # Check if asm support armv8.2-a+sve - AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl - cat > conftest.s <<\EOF -- ptrue p0.b -+ .arch armv8.2-a+sve -+ ptrue p0.b - EOF --if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then -+if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then - libc_cv_aarch64_sve_asm=yes - else - libc_cv_aarch64_sve_asm=no --- -2.44.0 - diff --git a/meta/recipes-core/glibc/glibc/0024-qemu-stale-process.patch b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch similarity index 100% rename from meta/recipes-core/glibc/glibc/0024-qemu-stale-process.patch rename to meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb index 9122472689..988e43c014 100644 --- a/meta/recipes-core/glibc/glibc_2.39.bb +++ b/meta/recipes-core/glibc/glibc_2.39.bb @@ -16,6 +16,10 @@ CVE_STATUS[CVE-2019-1010025] = "disputed: \ Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, may allow \ easier access for another. 'ASLR bypass itself is not a vulnerability.'" +CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" +CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961" +CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" + DEPENDS += "gperf-native bison-native" NATIVESDKFIXES ?= "" @@ -48,8 +52,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ - file://0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch \ - file://0024-qemu-stale-process.patch \ + file://0023-qemu-stale-process.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" From patchwork Mon May 20 13:33:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43864 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3830CC25B7A for ; Mon, 20 May 2024 13:33:56 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.61053.1716212027274502582 for ; Mon, 20 May 2024 06:33:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vyRANfpe; 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-6f4603237e0so1658130b3a.0 for ; Mon, 20 May 2024 06:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212026; x=1716816826; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fPqMadNSlhUCEFvo+JZgka2v+Hib/gWDAWto1GLFa3U=; b=vyRANfpeeVlEsKOYngWyNq0Z6Lyr5oCDOvECtjWTdXbCyHloZzGuRaAj8gPW/R2EmB 37pdmPhwsSYWcdL0JDw7Weg00wtrWD+fIkUMR1h58UvGIDiRgqRAYSdXE0eyRVqq9tWU +vCf2hiLNDa6ejQyhpwznXKE9vOC2QFjRruPb785x99DnOwpLMP4aYiX2yG6IOWHIPtE J/sjLVkMZyzeAamVcMY+Vpjz9dPAjinUxBnzz4ACPy7TL1VCz1Bq6v4H4aqGLy/BAcZ9 7KloK6kQGrW2uVxsV9qCAEmIKkv+d87mujBl3hSWAfYAq6Y2kDkM/vkQJvnZL8wi3klZ MfJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212026; x=1716816826; 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=fPqMadNSlhUCEFvo+JZgka2v+Hib/gWDAWto1GLFa3U=; b=QlqD9AaPAHwxE1mWmHruXdsvlFXk9jrFW3YCmtuSTgFnMwFSwbt/jZUq4pU1Nc156L 0LB7ZuwXsm9m+hsFxIsZA4R3hQvLVePuOUY3OR1C3aHFLHM9mRl6dtPuxJCoSCl+0Dpa giNUeoj3pP/EDPyoNlxRUm6+RMjj8YYNQoajvxTO2fmib2nuOE71mECPErruexaaL7SX T6Co3s2dZwV4hrx3nV7rmpRBcLiVMoumuI5lNt6uus9IqiP6akqHepWu8XFioUlHQn51 ppWv+LRUeu7jwbYgETvcF+dB98zl2OQsv2GkT75vJKtDenWPKZdpUtWPM+uBdj0BjdtW 1WoQ== X-Gm-Message-State: AOJu0Yw0vwaECB3Pq80tRRcRcAPBdADSsFZpPJnRGSaeNxTOlfTqyOG1 lPq/sR2A2GLd1A42eVcPJ2cG4UkKSXDgz5O2pc4q8lwQX64454/xtQGIfVztBjh8Qh0uKPvOZGw F X-Google-Smtp-Source: AGHT+IETd9XYnD36/SC/6+9VAl1ycbcEclKu1+svWVgqR0g4vbJ5Ptf21cp1WgsrKLMBZS/7C+74aQ== X-Received: by 2002:a05:6a00:3b05:b0:6f4:463f:af87 with SMTP id d2e1a72fcca58-6f69fbe02bfmr7442958b3a.10.1716212026433; Mon, 20 May 2024 06:33:46 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/21] glibc: Update to latest on stable 2.39 branch Date: Mon, 20 May 2024 06:33:17 -0700 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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199577 From: Peter Marko Adresses CVEs: CVE-2024-33599, CVE-2024-33600, CVE-2024-33601, CVE-2024-33602 Changes: 273a835fe7 time: Allow later version licensing. acc56074b0 nscd: Use time_t for return type of addgetnetgrentX 836d43b989 login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) 9831f98c26 login: Check default sizes of structs utmp, utmpx, lastlog fd658f026f elf: Also compile dl-misc.os with $(rtld-early-cflags) a9a8d3eebb CVE-2024-33601, CVE-2024-33602: nscd: netgroup: Use two buffers in addgetnetgrentX (bug 31680) c99f886de5 CVE-2024-33600: nscd: Avoid null pointer crashes after notfound response (bug 31678) 5a508e0b50 CVE-2024-33600: nscd: Do not send missing not-found response in addgetnetgrentX (bug 31678) 1263d583d2 CVE-2024-33599: nscd: Stack-based buffer overflow in netgroup cache (bug 31677) 2f8f157eb0 x86: Define MINIMUM_X86_ISA_LEVEL in config.h [BZ #31676] e701c7d761 i386: ulp update for SSE2 --disable-multi-arch configurations e828914cf9 nptl: Fix tst-cancel30 on kernels without ppoll_time64 support Since glibc introduced file sysdeps/arm/bits/wordsize.h our multilib patch needed to be updated. Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-version.inc | 2 +- ...y-the-header-between-arm-and-aarch64.patch | 47 +++++++++++++++---- meta/recipes-core/glibc/glibc_2.39.bb | 2 +- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 4fc6986ffc..1e4a323d64 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.39/master" PV = "2.39+git" -SRCREV_glibc ?= "31da30f23cddd36db29d5b6a1c7619361b271fb4" +SRCREV_glibc ?= "273a835fe7c685cc54266bb8b502787bad5e9bae" SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 066c3b1ea2..9bdfa76318 100644 --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -11,16 +11,15 @@ Upstream-Status: Inappropriate [ OE-Specific ] Signed-off-by: Khem Raj --- - sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- - sysdeps/arm/bits/wordsize.h | 1 + - 2 files changed, 7 insertions(+), 2 deletions(-) - create mode 120000 sysdeps/arm/bits/wordsize.h + sysdeps/aarch64/bits/wordsize.h | 11 +++++++++-- + sysdeps/arm/bits/wordsize.h | 22 +--------------------- + 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h -index 118e59172d..b4b0692eb5 100644 +index 118e59172d..ff86359fe8 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h -@@ -17,12 +17,16 @@ +@@ -17,12 +17,19 @@ License along with the GNU C Library; if not, see . */ @@ -33,12 +32,42 @@ index 118e59172d..b4b0692eb5 100644 # define __WORDSIZE32_SIZE_ULONG 1 # define __WORDSIZE32_PTRDIFF_LONG 1 +#else -+# define __WORDSIZE 32 -+# define __WORDSIZE32_SIZE_ULONG 0 -+# define __WORDSIZE32_PTRDIFF_LONG 0 ++#define __WORDSIZE 32 ++#define __WORDSIZE_TIME64_COMPAT32 1 ++#define __WORDSIZE32_SIZE_ULONG 0 ++#define __WORDSIZE32_PTRDIFF_LONG 0 #endif ++#ifdef __aarch64__ #define __WORDSIZE_TIME64_COMPAT32 0 ++#endif +diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h +deleted file mode 100644 +index 6ecbfe7c86..0000000000 +--- a/sysdeps/arm/bits/wordsize.h ++++ /dev/null +@@ -1,21 +0,0 @@ +-/* Copyright (C) 1999-2024 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#define __WORDSIZE 32 +-#define __WORDSIZE_TIME64_COMPAT32 1 +-#define __WORDSIZE32_SIZE_ULONG 0 +-#define __WORDSIZE32_PTRDIFF_LONG 0 diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h new file mode 120000 index 0000000000..4c4a788ec2 diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb index 988e43c014..2484ae1cd9 100644 --- a/meta/recipes-core/glibc/glibc_2.39.bb +++ b/meta/recipes-core/glibc/glibc_2.39.bb @@ -17,7 +17,7 @@ Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, m easier access for another. 'ASLR bypass itself is not a vulnerability.'" CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" -CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961" +CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602" CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" DEPENDS += "gperf-native bison-native" From patchwork Mon May 20 13:33:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43869 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70471C25B7C for ; Mon, 20 May 2024 13:33:56 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web10.60340.1716212028635424867 for ; Mon, 20 May 2024 06:33:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1Fto6UzB; 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-1f2ecea41deso66243045ad.1 for ; Mon, 20 May 2024 06:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212028; x=1716816828; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8Zd7GTWQtydy+CfzzZnKIuF50ttqPQkJbBu0abGYxbY=; b=1Fto6UzBDj6kFf3OIOvm/EMZbiZIogvDIVtFNZICza18ZadwYgRTjJZ3Ue4RGHOnxB 5OafirxxotD1SuyMmTXy6xH0UgekbQT3HwDJ9GURw50bJTMXgSedYnF/0JrgOc6+GS8p bJKpSvNsAfT0/pt1Slv2e/0j/HnpHetUo4hrRodY+0wqj9vR8ZUFygiorsDHYgqSI++4 ij6+wLVqLWetX3KtV0aDamP57pA3GOwrb8TZZXccgFGbmRtT4HaMaX7GSBVXTRUoYNEX G+t7Mez50TwiJN9sojbpapZ0706WEivkPU2oKkWn0d4WTdtk9kZKmjsjJs7ffO+FpayS lkuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212028; x=1716816828; 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=8Zd7GTWQtydy+CfzzZnKIuF50ttqPQkJbBu0abGYxbY=; b=hqRfEjOCSsWXp/ir9cJMApCMKlKzY2g/krWUy+EemE/7z6Prr87qHA+J17pa5uPIPh 293NzIJNd9MM17DG9OCy+BaqJkptjNsDVDqidoeI/GYkFnN8fRcbQ41KY4gXInFpgghp 7JGGgWLU54nhOZ4AAowYnwA1/N6yE+CFpFMJdykXNaT5Lwscx5hck3mrxlu5g+z3DP0I Z+MERzc5upnBqSC159roGvi28XyNC5hJC4r64K89bsc23jdYcGv4i9h/RBAgfFUnNRM5 pbKL0kdXOR89qK3cghYRJ27I1Xp0Tf7QM6fH2GO/AJx+Kqk5n1CTDTs8JV2ijPQQo1Wx Yvkg== X-Gm-Message-State: AOJu0YyalZgZggTO3kzuKydnxqLRknqgxSONYzPjiJTUbJAZaYN8rIXO 73U8yFcwnlLTSAKUNLOal0atkKUXFPOac9uT0DnpExOi/ywfwwykT4gZ5ISr8Y1plb+UnIiSeVX Q X-Google-Smtp-Source: AGHT+IFZxRCWUPkkJZrike867Zs9rV8gyC4fOHWXJOiSB8JfKLMGcYfZCx+E9XZ/ba3gYc+q3Pxs2Q== X-Received: by 2002:a05:6a20:2d21:b0:1b0:180b:218a with SMTP id adf61e73a8af0-1b0180b22a9mr21256321637.13.1716212027772; Mon, 20 May 2024 06:33:47 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/21] glibc: correct license Date: Mon, 20 May 2024 06:33:18 -0700 Message-Id: <939140fa7201ae0e7d365648c2ff5629e4c25ff9.1716211838.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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199578 From: Peter Marko The license per [1] is LGPL-2.1-or-later and [2] converted last LGPL-2.1-only references. License-Update: corrected from LGPL-2.1-only to LGPL-2.1-or-later based on [1] and [2] [1] https://www.gnu.org/software/libc/ [2] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=273a835fe7c685cc54266bb8b502787bad5e9bae Signed-off-by: Peter Marko Signed-off-by: Richard Purdie (cherry picked from commit b7ad15a59d048ca7561a03cb0fc8e2c24680ce5c) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index b9516e77f0..91a3f5bcd5 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc @@ -2,7 +2,7 @@ SUMMARY = "GLIBC (GNU C Library)" DESCRIPTION = "The GNU C Library is used as the system C library in most systems with the Linux kernel." HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" SECTION = "libs" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ From patchwork Mon May 20 13:33:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43868 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 712D3C25B7E for ; Mon, 20 May 2024 13:33:56 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.61054.1716212029871578044 for ; Mon, 20 May 2024 06:33:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=UhGCPEeb; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1ed835f3c3cso7006715ad.3 for ; Mon, 20 May 2024 06:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212029; x=1716816829; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8+oC+wtUszmmgInZT/HqXBaycWBFhEcXuC+DnP2cPRY=; b=UhGCPEeb4vcDmpmEGV+SvK4ARGD+Ft46Gvx/S7TaD6Uul/83tBnQjstnDXWeBMPk2t o23nNfyNIfISvL0DKLbBtql8fbIc8qFDjuoHkGhD3pjCDlE8+WmkzSM3bSga/4z2QtTH 07fE9yp8Fbf56xcWBg/NsC/MX/ngYUew27atiWHfo91bAeTC9N8tFZR40vhXMK1cQaX2 g2QL+Wk3yqRutq1gd/MzST9plHOc6BGvHiGLCchxAHPrgxt//uOGuymssYb9G82hxOEm HxRZfvcSEpfYF1BKYzzGIuBZbpHgx+oyvB7UWi6sd2q7m3o2VkgaieDblwrrkD9eJgjI zSZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212029; x=1716816829; 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=8+oC+wtUszmmgInZT/HqXBaycWBFhEcXuC+DnP2cPRY=; b=UzBaOVRg2gO8tM8JdsE60xNePDZF5FEzqD4NQUgUskvedZU+H1ECfyL7/lPArq/ZJQ 9SgYiFb1zfb5m9gVoccC5MqJlI3BDoAkq3YvA2ete5J/7WVp8i5VZUEJSvNaAicAv2zR uU4QnQ8EvNgl9wLPdOSNNaNdrX9mKRXNLHK3p4tGUez5pTOwzvzPG7qeADwSDFXlnEMX qB9tv+uwmLnXaDzs9pGOXjrsb4qjJn7zJmowBZADVSC7mR4mR+61djfbzkDnKLYbwyFP JDLlscHZYVCSLT3Etg/dZIJMOAsWuixe6WTv3udh588WOBzfBr/JyL1yksWVmha8IMMy /wtQ== X-Gm-Message-State: AOJu0YxA7C5TS+btvjnzG7PXQP3QnrlsH8WX/r1bcYa6pyt98jJFlqJI hN8otsmDjXKm7LcOn+qcgxE03ONh8Zmk+dAJASoiRUSKD6SBZ6xevkMYw9c1HlzL8rgz6aLe5ll f X-Google-Smtp-Source: AGHT+IGBZmqAXGpPE8XemxcRnMxBYYODyolxG0NxaVknNf4zW5DqORCepTak/jQ3vnlvfufvAdgesg== X-Received: by 2002:a05:6a00:23d3:b0:6f3:ef3d:60f3 with SMTP id d2e1a72fcca58-6f4e0328d10mr35299149b3a.29.1716212029170; Mon, 20 May 2024 06:33:49 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/21] llvm: upgrade 18.1.2 -> 18.1.3 Date: Mon, 20 May 2024 06:33:19 -0700 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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199579 From: Wang Mingyu 0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch refreshed for 18.1.3 Changelog: ============ -DFixes tsan failures for glibc's LoongArch and certain RISC-V ports when fstat is used. -transform.structured.convert_to_loops now properly deletes its target op. -Fix a llvm.usub.with.overflow.i128 wrong code generation regression that was introduced with LLVM 18.1.0. -MemorySanitizer on Linux can now run even when maximum-entropy address-space layout randomization is configured globally -Fixed a Clang 18.x regression which increased binary size and stack usage with -ftrivial-auto-var-init. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit d2159f92ddbb6b999c1d14ac62647b4a35360377) Signed-off-by: Steve Sakoman --- ...mMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch b/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch index 48af6fc283..a5c53b6657 100644 --- a/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch +++ b/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch @@ -1,4 +1,4 @@ -From 86940d87026432683fb6741cd8a34d3b9b18e40d Mon Sep 17 00:00:00 2001 +From 3b30a9bda88374e8f03bf96e972aee5bd214b98b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 27 Nov 2020 10:11:08 +0000 Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp -index ccf0959389b..1f801e83b7d 100644 +index 73724e662f9e..1ca9c73415db 100644 --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp -@@ -359,7 +359,10 @@ public: +@@ -361,7 +361,10 @@ public: // name of a class shouldn't be significant. However, some of the backends // accidentally rely on this behaviour, so it will have to stay like this // until they are fixed. From patchwork Mon May 20 13:33:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43870 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DAE2C25B7D for ; Mon, 20 May 2024 13:33:56 +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.61055.1716212031236791556 for ; Mon, 20 May 2024 06:33:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=OdFLnML0; 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-6f44dc475f4so1097009b3a.2 for ; Mon, 20 May 2024 06:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212030; x=1716816830; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b5r7Nad3ZnIXs71coEBUFWWLznKfHZbwo5VBL0pwj70=; b=OdFLnML0+mNJiahW7p3VySocJDBy+rU7wDC9G7os5W7G67R34k8mW9nB0YyLDfIkdC qHCYcNjEkXWJ+Cr9EBHPkH2eBkL5Rmz/JhTuSvwhE0apRppvPkFAleCep3S7t/ULOmXF uIyNb4k9u1QifzH3JojMNi0l0e/p8uOUHPly+0BjjzmKqHfh5zdIYsnLqzAN0OOLLqhm E4PSg8r14GXe/RwOd+ouM/BNRVETHKNQir/Jf4Iuua5DssSKtTUabHeiyGhRXFwQkbiw U/UDvy8rgiW8cz9uFnFqFP1Ro0JF3w5/m/Eb0zKZoNN3Cbh70u9dXXTML6NuJmWbQLjC bYfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212030; x=1716816830; 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=b5r7Nad3ZnIXs71coEBUFWWLznKfHZbwo5VBL0pwj70=; b=uQf1ZsZkkcxBPgjdEXldglf6QjpFWm/ixBGJWIvCCzt09tkBJnRE9y5EAEeuKCRzXx ABtjJZWtc4FZxh15Zqll3UBwva7XA1cOWxt8n8EItBw+QxPtmDVk59O6CrdM7Li92cbd tYBfa4ITOu6Akez2RskAEAO7DQtZ59EiIdP2z5Tf5dYGLoPiSqhVWzvgc5b13gabqun3 wk8aRugVYHS9nlQzDw4yh8mrH6VV1xEs82reeAQvUVe5+te21QS83iM1uEL03yn1sWHc 1nkWGeEJoB3IT8c1RdwjH3K6/NOHvA7mRzFfWCxnLk7uXfdzFdzrEi+iU7UhZB5yDBMU IV8A== X-Gm-Message-State: AOJu0Yy246vaXDtfSSGE1mVmH32w05CrCQCJvQmx/BAEGN51cpDjqVRV ejziw6yYD/4Xu5a7YAbG6KPjE0DctAWM9RdEKmA8WrLgmjQrtup5+WtgKkSNXYceme5/k2+ZINH X X-Google-Smtp-Source: AGHT+IFGdS2U/FtwoBB/w0FZkaBmbo9lMrSbGl3uhrqznq/AJF+Z/MyoRRvZgtQFksv5M3wJJlq1Hw== X-Received: by 2002:a05:6a00:98b:b0:6f3:8990:665c with SMTP id d2e1a72fcca58-6f4e02d3210mr33621963b3a.18.1716212030471; Mon, 20 May 2024 06:33:50 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/21] webkitgtk: 2.44.0 -> 2.44.1 Date: Mon, 20 May 2024 06:33:20 -0700 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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199580 From: Kai Kang Update webkitgtk from 2.44.0 to the first bug fix release in the stable 2.44 series 2.44.1. * remove backported patch What's new in the WebKitGTK 2.44.1 release? =========================================== - Fix handling of lifetime of web view child dialogs in GTK4. - Do not schedule layer flushes when drawing area size is empty. - Fix videos with alpha when using the DMA-BUF sink. - Fix the build with USE_GBM=OFF. - Fix the build in 32bit platforms - Fix several crashes and rendering issues. Signed-off-by: Kai Kang Signed-off-by: Alexandre Belloni (cherry picked from commit c129c47cf9fa119005ea6e3946ebdee0da1db7e0) Signed-off-by: Steve Sakoman --- ...af379dc70b4b1a63b01d67179eb431f03ac4.patch | 38 ------------------- ...ebkitgtk_2.44.0.bb => webkitgtk_2.44.1.bb} | 3 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch rename meta/recipes-sato/webkit/{webkitgtk_2.44.0.bb => webkitgtk_2.44.1.bb} (98%) diff --git a/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch b/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch deleted file mode 100644 index 3067500447..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/2922af379dc70b4b1a63b01d67179eb431f03ac4.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2922af379dc70b4b1a63b01d67179eb431f03ac4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 18 Mar 2024 11:14:54 -0700 -Subject: [PATCH] REGRESSION(274077@main): failure to build on i586 (and likely - other 32bit arches): static assertion failed: Timer should stay small - https://bugs.webkit.org/show_bug.cgi?id=271108 - -Unreviewed build fix. This changes SameSizeOfTimer to ensure it matches -the size of Timer on 32-bit platforms. - -* Source/WebCore/platform/Timer.cpp: - -Canonical link: https://commits.webkit.org/276282@main - -Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/2922af379dc70b4b1a63b01d67179eb431f03ac4] - -Signed-off-by: Markus Volk ---- - Source/WebCore/platform/Timer.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/Timer.cpp b/Source/WebCore/platform/Timer.cpp -index 4f7c0f5c39ca9..0f3734cca2474 100644 ---- a/Source/WebCore/platform/Timer.cpp -+++ b/Source/WebCore/platform/Timer.cpp -@@ -263,7 +263,11 @@ struct SameSizeAsTimer { - - WeakPtr timerAlignment; - double times[2]; -- void* pointers[3]; -+ void* pointers[2]; -+#if CPU(ADDRESS32) -+ uint8_t bitfields; -+#endif -+ void* pointer; - }; - - static_assert(sizeof(Timer) == sizeof(SameSizeAsTimer), "Timer should stay small"); diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb similarity index 98% rename from meta/recipes-sato/webkit/webkitgtk_2.44.0.bb rename to meta/recipes-sato/webkit/webkitgtk_2.44.1.bb index 0819f6de0d..29e12bb8c5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.44.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb @@ -16,9 +16,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://no-musttail-arm.patch \ file://t6-not-declared.patch \ file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ - file://2922af379dc70b4b1a63b01d67179eb431f03ac4.patch \ " -SRC_URI[sha256sum] = "c66530e41ba59b1edba4ee89ef20b2188e273bed0497e95084729e3cfbe30c87" +SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen From patchwork Mon May 20 13:33:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43865 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51B66C25B7B for ; Mon, 20 May 2024 13:33:56 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.60343.1716212032784673109 for ; Mon, 20 May 2024 06:33:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YHkp5Ikd; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1f2ecea41deso66245145ad.1 for ; Mon, 20 May 2024 06:33:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212032; x=1716816832; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nD+iJ0eiDicS1+UQJE1ZILHWB43vWdhgs48rfhT18zM=; b=YHkp5IkdsJ6gzaGyPXCqUcHtipAxivvpxjfi/O8bbrd1kkPg1DNKfUzTFPMvsnD+8L 1Bn3dm3f3gABbUSdgpPFHgNL2xd9/xpT1VAbigj/AJKvCKtvJtNOoRGWkus65vkDF2oE 38GKJ9z11HdcXqm/iRHUEYg0+4W3EjXpZZ3MQudnvUpKoN1lH6wmAbzBv1DstZqIj0tK nfxPJDjJiaqdLe63PKyQIUll4FASbxoFlWeny+QfpDuCKj1nFMEFnloMSfDRr6isQ4x4 PsOkUge+DBDkb3lGwfiGh9laU7E6DnmmABlrlMDMJSKNy6x98XEhgGCt6q3PFygIYJ7o Jjmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212032; x=1716816832; 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=nD+iJ0eiDicS1+UQJE1ZILHWB43vWdhgs48rfhT18zM=; b=jKrlXT4MsrRnWd3rdvp3HiQmUBWVsGyEyPOYOJzvuOubsOZBpTFyw+VJVIdboIGxVF e6oe3ZtZtf9y6xgXaBq66P/0smx9l0YubN3CIsk0wWJAWtfmny7n0YvAjSKUJE704T/r S8t6SGZuPCMZNC4vxPvnbZsXt4sEg05H33WxHtQKxTgEJDhfZreoDZ4OGbDJZevhzS9u BPdKuZtC9nRthGC49ZDO+toRTFbKoioJBjnrKK68CElu8XaIvkmvoSJAZq3vXfkOTFMd LcHxPMAM/ogThTepaPaSMxJmlC6NCZ8T6rMqe2NfeU9ULw92G5dy/izRWIIIvOPTQvuq N6rQ== X-Gm-Message-State: AOJu0YzdJqufgQqtHbRzRfEp2G3CH30ejQ8Y5ZK96yBjp1J9pDdUd/ni mjqENOdtTPGmnRbjAN/ANk5DA/tN80SkUJyUdHIXLf0nctt9xZ1ytFsKH+FrlhraKb3FcZ3+6xg h X-Google-Smtp-Source: AGHT+IHgP1HwvuvGfqKz/3q9QZqCZYbueSKmZLfzHRFHKSFSPgdZCdtWJQrVVoxE05V5S5DAJxNWaA== X-Received: by 2002:a05:6a00:92a0:b0:6f0:c828:8e0b with SMTP id d2e1a72fcca58-6f4e0297e33mr40299279b3a.7.1716212032101; Mon, 20 May 2024 06:33:52 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/21] uboot-sign: fix loop in do_uboot_assemble_fitimage Date: Mon, 20 May 2024 06:33:21 -0700 Message-Id: <0862abfede2680ff8d67c5e9ece2017f594cb8a1.1716211838.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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199581 From: Ralph Siemsen When using multiple u-boot configurations in UBOOT_CONFIG, the helper function uboot_assemble_fitimage_helper() was not called with all combinations of type & binary, due to a copy-n-paste indexing error. Signed-off-by: Ralph Siemsen Signed-off-by: Richard Purdie (cherry picked from commit 2d338548a4b745a71eaf6c29231adc93c4165778) Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-sign.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index 7a0b8047e4..c8e097f2f2 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass @@ -367,7 +367,7 @@ do_uboot_assemble_fitimage() { done for binary in ${UBOOT_BINARIES}; do - k=$(expr $j + 1); + k=$(expr $k + 1); if [ $k -eq $i ]; then break; fi From patchwork Mon May 20 13:33:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43867 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 465FFC25B78 for ; Mon, 20 May 2024 13:33:56 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.61057.1716212034182707528 for ; Mon, 20 May 2024 06:33:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=0czjCuYI; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1eb0e08bfd2so76875615ad.1 for ; Mon, 20 May 2024 06:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212033; x=1716816833; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Un06W+P6q0q/EWD8nzbpt/TVBNssld/q56Ltc0iPjEw=; b=0czjCuYIVr80ecSjOLKcuzur+/1Uh8OWP5JYorJnOxg2IkXB/SJ/c48DATqqCV3y1p SSSrwnOHegsT21X8irt60F6O9TJOqgzo4bhB2YuZJvEWCi+hQ1519ntV62dvRuRrJPUp LAxS57zelu/vJWlwLCMqEFOn2cLBfSkR5K9ToeJ8oPf2Xa91J93GnmWG/6HeE0xhDNpl ibTAksTYez7M2f/NC1CH4ZE4MLb+IHF6punXbSq5GaMfmf9Pj3YblkM+PvqdtpAaXzMn 9/AHaIrblcSlE3V7YfcISqdDfPIHC0kKx4+wmVpJv90bqks4FHdbhNi/QtSJNVD6YDzE hKaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212033; x=1716816833; 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=Un06W+P6q0q/EWD8nzbpt/TVBNssld/q56Ltc0iPjEw=; b=cioQ2g3mbPH5D2d5rR3lWkL28+/NkfklLtG3u5s+GAhtKNuXfx8lLv8sO/Z6h8uIVJ 0NyUPsf2ZnyLcYfamShUvYQ5uhw/xkkrcdF3r80uMX5CPxUlWEJ+q3x/YDwvTTtSwG8e RK3zqKw0tdFGXqWf2tnVL5nE4+lmnc/91/EVhqX+Nyd7pM0vP9kRMR7Js/6b2efyBk6N ONma/+5hJ6Um10bQkKoCHFCfoNpWfImOKpQnVXXRTqLYUyIN8n4qUpWGc/D7+u8UDv1L 4aeihzVDUWyMSSSNnUaOh767rdUjB52tPROdD9+5GGixfv568F7w0lJ8+2BJ5R5dw2oH RjtQ== X-Gm-Message-State: AOJu0YxUKBIUutxMVp45G6FNyydfIsHsR/b6+aiqbIIOFButK7zWLZ1l Xo5foogTrY6dT6e8tTn0KhNCwFvAhP+M2zJVgZyNdHsYFbqeTjiULUU02sRO3qW4mabEuuZ58F+ G X-Google-Smtp-Source: AGHT+IH5muBqfe5lqgex1ClXPGpH3x/e/sYqCkCVUF/OPZBDIbUV7do5D22EvjCWk8owabvLzsjHiA== X-Received: by 2002:a05:6a21:1518:b0:1b0:9b7:bbe3 with SMTP id adf61e73a8af0-1b009b7c0d3mr20612135637.0.1716212033499; Mon, 20 May 2024 06:33:53 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/21] go: Drop the linkmode completely Date: Mon, 20 May 2024 06:33:22 -0700 Message-Id: <941c8535eaaca5790c9bc2b3d21d8ce402dbb431.1716211838.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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199582 From: Jose Quaresma This will make possible to restore the default dynamic linking globally which is what we had before the 1.20.X release. Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit 6ad90fc2fc49c4199a59dfb1c1d81a7ba184a522) Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- meta/classes-recipe/go.bbclass | 2 -- meta/recipes-devtools/go/go-runtime.inc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index cc3564c36a..d32509aa6d 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass @@ -48,8 +48,6 @@ GO_RPATH:class-native = "${@'-r ${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" GO_LINKMODE ?= "" -GO_LINKMODE:class-nativesdk = "--linkmode=external" -GO_LINKMODE:class-native = "--linkmode=external" GO_EXTRA_LDFLAGS ?= "" GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" # Use system loader. If uninative is used, the uninative loader will be patched automatically diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 3f1e795dd9..413cf6d33f 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -15,7 +15,7 @@ export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-pr export GOCACHE = "${B}/.cache" GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" -GO_SHLIB_LDFLAGS ?= '-ldflags="--linkmode=external -extldflags '${GO_EXTLDFLAGS}'"' +GO_SHLIB_LDFLAGS ?= '-ldflags="-extldflags '${GO_EXTLDFLAGS}'"' do_configure() { : From patchwork Mon May 20 13:33:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43866 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 389E2C41513 for ; Mon, 20 May 2024 13:33:56 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.60345.1716212035779753775 for ; Mon, 20 May 2024 06:33:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hJZZQ/t4; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ee954e0aa6so42629235ad.3 for ; Mon, 20 May 2024 06:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212035; x=1716816835; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=17SMrBBb8pHkvS9XpyI3j8pil586E99gVxjn/foBUVY=; b=hJZZQ/t4NkDams201O3ZZDyeFtsjqf6/T+M4dswcrwEdzIIYxVhqQIckD8uc+EnhWN Juw5d/sQ0RQqBraA8fotYBIJEseu804XJq7mFAGHp1M7Zi7MQ+KjQxidzVyds4/0PvRk T6BDnHZCveQBRLLwrNF5L4TgRge1/SgBxmpJEtNDd/j9WcIZkok4zGVMIskYzyncUTQm G0C6HsDOYL/jPlRk6Iq1z1zKFNMHAsOxtHJnv9BgilUuxthbh1VKU4Bqz0LrrIGs9Zp6 s0o6UJBh9cX2KmlCgcYwHKD5Qn7kg5iReEBTLMRcmpjeUY6nSRdCTELURtuTGzQIdbLs Ey0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212035; x=1716816835; 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=17SMrBBb8pHkvS9XpyI3j8pil586E99gVxjn/foBUVY=; b=Sx3K9yhXsrwwRdIVYj8YjYwoy7EtLYqPTJBEOIXUnbbH+7xJvhFqRXHTMp2BQNqHo+ FEYdrnTP9fl3H+g0q/Yvvs+YW5sKfIfY/4GP13yS4BzcpS8BZPNWr6wLJfTg2P3oAMsV PEg57NwXC7BzfAqKOXmi0D4xrd8i7FYGWNh7BsNCAigNcH0e6GVIPiiy6ZjnWyfgZkBh oGymd8wYNlv2s6RfckVbJrXIT65fxjynWlW2KzoDtCJjc5cOaiSR+uIxUkru4WQTgeyE p5eQLGbPfvmfQryeD9ITintffWMAJG94Wl1eCS/dO6pyl1Xg/smxRjvNJbEPO+MmMG4G IlJg== X-Gm-Message-State: AOJu0Yxl8AwwZTFZ9jf+2JuJVChMg17VDO3Z+SgoROQV/qNR/IIVG5tR L6nWYNIb5G14LwE1KHXrjIxBbBlLSSAp7+FZmY4FGSR0SxT/R9buLqegr1nRlIwvURrLSR0Ehk5 x X-Google-Smtp-Source: AGHT+IGVItV41oBsj5Pg94bkM6ieEbPQ29WvPPyeTVb19WitO3/JSCtrhNfveQzvGyRKuMOJm5H7uw== X-Received: by 2002:a05:6a21:3a82:b0:1b0:119c:7587 with SMTP id adf61e73a8af0-1b0119c783bmr19170701637.51.1716212035048; Mon, 20 May 2024 06:33:55 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/21] Revert "goarch: disable dynamic linking globally" Date: Mon, 20 May 2024 06:33:23 -0700 Message-Id: <137bb70ddf9dce30374cbb366196da0d8cc94205.1716211838.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 ; Mon, 20 May 2024 13:33:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199583 From: Jose Quaresma This reverts commit 827c60b79e7fcafd14e68870f6b69dcc48ac9c39. Fixed with the drop of the linkmode Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit 8f46f60a703defc3e74adad382320c129cef0b06) Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- meta/classes-recipe/goarch.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes-recipe/goarch.bbclass b/meta/classes-recipe/goarch.bbclass index 6899ec28e4..1ebe03864f 100644 --- a/meta/classes-recipe/goarch.bbclass +++ b/meta/classes-recipe/goarch.bbclass @@ -38,13 +38,13 @@ BASE_GOARM:armv5 = '5' # Go supports dynamic linking on a limited set of architectures. # See the supportsDynlink function in go/src/cmd/compile/internal/gc/main.go GO_DYNLINK = "" -GO_DYNLINK:arm = "" -GO_DYNLINK:aarch64 = "" -GO_DYNLINK:x86 = "" -GO_DYNLINK:x86-64 = "" -GO_DYNLINK:powerpc64 = "" -GO_DYNLINK:powerpc64le = "" -GO_DYNLINK:class-native = "" +GO_DYNLINK:arm ?= "1" +GO_DYNLINK:aarch64 ?= "1" +GO_DYNLINK:x86 ?= "1" +GO_DYNLINK:x86-64 ?= "1" +GO_DYNLINK:powerpc64 ?= "1" +GO_DYNLINK:powerpc64le ?= "1" +GO_DYNLINK:class-native ?= "" GO_DYNLINK:class-nativesdk = "" # define here because everybody inherits this class From patchwork Mon May 20 13:33:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43871 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74B46C41513 for ; Mon, 20 May 2024 13:34:06 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.60347.1716212037498830794 for ; Mon, 20 May 2024 06:33:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=tDuirZ7M; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1f0937479f8so71647175ad.3 for ; Mon, 20 May 2024 06:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212037; x=1716816837; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PU45kwa7GPlCKVBq6n6JkhqTIhYA/V3S3fsUD53hkj4=; b=tDuirZ7M/mt7f9X8n9wlhlHJPCpZp1yItsP4GXfKeKZcsG1NdcvhCJQqlG9z5FU+wM BfzQJRIK5PbYoKSmZIqhZ8+HscDBRW4FATXN8OQrpc8QRvhFXbnR2hTp7UFQK7d+uALP wqjoROPxMhi6Eyll1oVvfiA7hvW2cq0Ip3YQaXYm/qEpH7x7jwRfUHJSavBglilNkKbA g1MxzavPz4vI0Jr1MRQrWfR0hgCB2Bi7Pwg7+ra98Q3vZ3eaVhw8FhcAxRzPitFTP7aS nL37z7SU2VrFqJX/DIFZhPP/Kf4sKAUnXVq/FG/pJA52P62S/fE6rJ+YeVmozZ3x0mnQ Bx5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212037; x=1716816837; 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=PU45kwa7GPlCKVBq6n6JkhqTIhYA/V3S3fsUD53hkj4=; b=ODxJrKtnOM4Cjvb0SBlWTpz7faIhL341ihL9Gu2CjbrdxsRpl4M2H1IDEDqtclBqJC bWN/dVzMy9wm7GWfIC02lu8e2lyN2mMXkJk9nQ8WT6PYljRitkxLYJobQq5GfGY5tNTy 5yudjUe5ApUF5+KuxgGNsTg08044aZ6vtNm/jPGe7zW0t9/6S2DplAjYFzEJhfOJB9UD G2gCaAmFLBhKKDM0EGFRqF8vUEimwaTnrnA70uAaIFKKl4ucQXBFjo8Y1I2TGVEgVBSI D5oJiFnwuIRrOUFOa8BqvMRFhc/mM5upW19J6E+2idOUgOJcXwyIdyMh5Bsj6jtcRwc3 yi3g== X-Gm-Message-State: AOJu0Yy6xC5QEclV3QYsvWIdUu8w7X5/OBh8S5jktD7vZlDTOQAtEAwf gCZoIWGX4sXiHtHHh40IUs3UkdYYEYMzlGqXmMrUIEnCZb5AUQXjPTPrtnLToNMIYgOFkdyHD5y v X-Google-Smtp-Source: AGHT+IHNlD0jOE7C1FjNIicM3c5/38DQMjy2FVSSsJ3LF+OqSAdBye2v96f4vSYAyfRm+i4Flm3aww== X-Received: by 2002:a05:6a21:3115:b0:1b0:812:ab3e with SMTP id adf61e73a8af0-1b00812ab79mr21059674637.38.1716212036684; Mon, 20 May 2024 06:33:56 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/21] classes: image_types: apply EXTRA_IMAGECMD:squashfs* in oe_mksquashfs() Date: Mon, 20 May 2024 06:33:24 -0700 Message-Id: <39fc503036312e38ff0b9d8fb90b4c929b5ca7df.1716211838.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 ; Mon, 20 May 2024 13:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199584 From: Martin Hundebøll Since commit c991f9d6031 ("image_types: Set SOURCE_DATE_EPOCH for squashfs"), I assume, the EXTRA_IMAGECMD:squashfs* variable(s) has been ignored. This is due to the override magic, which isn't applied to functions called by IMAGE_CMD:, but only to the IMAGE_CMD: itself. Other image types (e.g. ext*) works around this by passing the EXTRA_IMAGECMD variable as an argument to the called function. To do the same for oe_mksquashfs(), the number of mandatory arguments is fixed to one (with a little logic to handle the zstd filename). This allows passing ${EXTRA_IMAGECMD} as an argument to oe_mksquashfs(), which makes the variable functional again. Signed-off-by: Martin Hundebøll Signed-off-by: Steve Sakoman --- meta/classes-recipe/image_types.bbclass | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 913cb8788c..b4a83ae284 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -112,18 +112,22 @@ IMAGE_CMD:btrfs () { } oe_mksquashfs () { - local comp=$1 - local suffix=$2 + local comp=$1; shift + local extra_imagecmd=$@ + + if [ "$comp" = "zstd" ]; then + suffix="zst" + fi # Use the bitbake reproducible timestamp instead of the hardcoded squashfs one export SOURCE_DATE_EPOCH=$(stat -c '%Y' ${IMAGE_ROOTFS}) - mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}.squashfs${comp:+-}${suffix:-$comp} ${EXTRA_IMAGECMD} -noappend ${comp:+-comp }$comp + mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}.squashfs${comp:+-}${suffix:-$comp} -noappend ${comp:+-comp }$comp $extra_imagecmd } -IMAGE_CMD:squashfs = "oe_mksquashfs" -IMAGE_CMD:squashfs-xz = "oe_mksquashfs xz" -IMAGE_CMD:squashfs-lzo = "oe_mksquashfs lzo" -IMAGE_CMD:squashfs-lz4 = "oe_mksquashfs lz4" -IMAGE_CMD:squashfs-zst = "oe_mksquashfs zstd zst" +IMAGE_CMD:squashfs = "oe_mksquashfs '' ${EXTRA_IMAGECMD}" +IMAGE_CMD:squashfs-xz = "oe_mksquashfs xz ${EXTRA_IMAGECMD}" +IMAGE_CMD:squashfs-lzo = "oe_mksquashfs lzo ${EXTRA_IMAGECMD}" +IMAGE_CMD:squashfs-lz4 = "oe_mksquashfs lz4 ${EXTRA_IMAGECMD}" +IMAGE_CMD:squashfs-zst = "oe_mksquashfs zstd ${EXTRA_IMAGECMD}" IMAGE_CMD:erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs ${IMAGE_ROOTFS}" IMAGE_CMD:erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs-lz4 ${IMAGE_ROOTFS}" From patchwork Mon May 20 13:33:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43873 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9113FC25B7A for ; Mon, 20 May 2024 13:34:06 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.60348.1716212039102432283 for ; Mon, 20 May 2024 06:33:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=mekCIq3q; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1f2ecea41deso66248335ad.1 for ; Mon, 20 May 2024 06:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212038; x=1716816838; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A4+bi9Np6KOgwEwbkTuBHdqoIlxj+6S/e6P1SVF46hU=; b=mekCIq3qA+jbunnyG+yJZeu2ZVgdjxMd8A4RFHB2URh72qEQTzM8LoCIa8V8Lim/qj 3ufIvNThtWmhRJmX1g7RtPoqGZCKsmmz9X72VPQd+n3YZW1uOBK1/l8k9suqQ0z+gH6u nwLPaOmRMHISLTknWhj2kAxnycS9/mpkxfv0VaDJYFGO3tiKcvJdyN5JqX0663YF5pi0 uUWX/zWUy7zDawLYPaAFkvXc6FUJZEaLaBI7e32aurYWanli1U0PMR0YPq9DeO1brgmE /ZuBOqNNbqsi4QuIOn7Qxsj/26aIKB2Qa6hcxOWwGVU5sJMvLKzWsm+2mNz4u7Auzbi4 0x9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212038; x=1716816838; 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=A4+bi9Np6KOgwEwbkTuBHdqoIlxj+6S/e6P1SVF46hU=; b=GpuRk1PyTjw9bDkiNNpVqB/hyrdpUAZ+zgot15A3QXxfJME/KNdJO9bgXFiT6Hs3sd MAg62HE+R8Ln3W7/3aDawfD82pWA43mUd8qgl3w6h8nrnUKNqgGf2c+r+n2jT1VBjovg jzRmqDg6DvB6QSDOfXLi92IyJsqkiopXg85nzeCJduQ/HyyjvzhjxnqiAehUp6gn1DMb I8A3HAJFtoqpjKT58t1UuIaa1QIALlsv2fltY0j+Sh6ISXCnj8lAkOEfaSRx8UZyDLcM 3fUaSkgIKNlvanJHdi2SGJ+o9W2D8gjrmEGfq5gi91QLZIq6ZHwsEx+BgHiha9iH2r1i jkgQ== X-Gm-Message-State: AOJu0Yx+1BZnCziMnXMiZa1NB0N5CeAUipE2KTPNDsXoyQOqK7R61enr 4/Cy5l2yI/wf2DDXohUpTm9pl4s2EESYiOv+qzqToJOpAt/vszTZBnNztdrwnzh2q+WRX3UYDlC e X-Google-Smtp-Source: AGHT+IFOn1/GTpv6OnAkLiIY5a5FLj/jLK9QrltwapzcrEv7dnn8JIKPKl6B7ceAdbbI+kV0DmN5pg== X-Received: by 2002:a05:6a20:7350:b0:1af:a72e:8b7e with SMTP id adf61e73a8af0-1afde1b6f32mr34067669637.50.1716212038383; Mon, 20 May 2024 06:33:58 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 14/21] libcgroup_3.1.0: fix build on non-systemd systems Date: Mon, 20 May 2024 06:33:25 -0700 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 ; Mon, 20 May 2024 13:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199585 From: Adriaan Schmidt backport upstream commit 592dcdcf243576bd2517d3da9bc18990de08e37e to fix packaging when building with --enable-systemd=no Signed-off-by: Adriaan Schmidt Signed-off-by: Steve Sakoman --- ...akefile-install-systemd.h-by-default.patch | 37 +++++++++++++++++++ .../recipes-core/libcgroup/libcgroup_3.1.0.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch diff --git a/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch new file mode 100644 index 0000000000..4b743f9b33 --- /dev/null +++ b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch @@ -0,0 +1,37 @@ +From 592dcdcf243576bd2517d3da9bc18990de08e37e Mon Sep 17 00:00:00 2001 +From: Kamalesh Babulal +Date: Mon, 27 Nov 2023 20:07:33 +0530 +Subject: [PATCH 1/1] include/Makefile: install systemd.h by default + +Install systemd.h header file by default, as we have stub and defined +versions of the systemd functions for both non-systemd and systemd +enabled configurations. This will help packagers to ship package +without systemd support (--enable-systemd=no). + +Signed-off-by: Kamalesh Babulal +Signed-off-by: Tom Hromatka + +Upstream-Status: Backport [https://github.com/libcgroup/libcgroup/commit/592dcdcf243576bd2517d3da9bc18990de08e37e] + +Signed-off-by: Adriaan Schmidt +--- + include/Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/include/Makefile.am b/include/Makefile.am +index 23cebaac..4cb05529 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -2,8 +2,4 @@ + nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h \ + libcgroup/groups.h libcgroup/tasks.h \ + libcgroup/iterators.h libcgroup/config.h \ +- libcgroup/log.h libcgroup/tools.h +- +-if WITH_SYSTEMD +-nobase_include_HEADERS += libcgroup/systemd.h +-endif ++ libcgroup/log.h libcgroup/tools.h libcgroup/systemd.h +-- +2.39.2 + diff --git a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb b/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb index 4b4f19e36f..a1d27c7e7f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb +++ b/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb @@ -13,6 +13,7 @@ DEPENDS = "bison-native flex-native" DEPENDS:append:libc-musl = " fts" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ + file://0001-include-Makefile-install-systemd.h-by-default.patch \ " UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" From patchwork Mon May 20 13:33:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43874 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95C68C25B7C for ; Mon, 20 May 2024 13:34:06 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.61061.1716212041083107691 for ; Mon, 20 May 2024 06:34:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=u7tf0w8p; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1ee954e0aa6so42631955ad.3 for ; Mon, 20 May 2024 06:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212040; x=1716816840; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MNGaTG3nk1BYo16nsp/zbtrOZXBF3+o/hhMX5XVeBKM=; b=u7tf0w8p5zIUiG0i6L4thVCZmgpTL6jFo1/knYBg7bZXtGqGe3kmQkQc7mMkKbjrRE ivwfu+mRwG9BsHVi2obKv5o6nfseE5t0MNdi9fcPNnpD5YDH039l/5ancNsQGbDaLt9v 7rfTXKlMVhhgxkiOuXcckijSRo00+nA26mU2AJP2pnFxZee9Vua0cRVjvwBig4KNMlHs No5YhHWCEoazbhc7bwGgbj1IO1biYgMGsaWMcKYD7UveV+m3P2nBJ6H78GArZx/WvWpX pnfgttf9Mnb33D8HXZOej+stsR7zdh0Dt8yH2XRfOSlne1Ft/o/YdvaEfFCuWPoCeWSH t5ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212040; x=1716816840; 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=MNGaTG3nk1BYo16nsp/zbtrOZXBF3+o/hhMX5XVeBKM=; b=EyfPvtdNr0h3hFis94t0MH24Tdb3Yiz8oKOcNTNpqWsE7ik6BAM1hC9XsB1eShNVmu YpTu+eQxXNAdTIhk7t0Z8F2pMUwa0plwu6h+bKghS+Jm9EiLi271KShsswZhSMNpze5w gYgARWM+R8xXaGO6z7wiBNINRH2kTnC2RFsC88Pk3hLyWG6lxDHeI0Mc3P/pB9ponBnU WmCqTKIDTgz8QzF3QJe+Q6Vz0BUP7H6iTlz/nijLl2X8zx2NJ8eRlouewZ6clxLrjDde DL8kazWuQe3jc/kJJg4C/cyEojrAwQdgOBv2jf0SwedxQ3aYFLi9uXH93o4sXgHjUN8Z AjFw== X-Gm-Message-State: AOJu0YykiZkP2D2zPLdQSFh0UK2Xl8gY/z0abRwECLZSHnh5pGxYg2z4 7hU9iLBKeQaC+wQi0hN6PdjFcTJkSfE/Q/D7oecQTwS+i3pNXuuwCr0YPqh9WtT/uTGjq9xyJcQ b X-Google-Smtp-Source: AGHT+IHIgbF2u9IfasVbnIndgsVevoQjFC63hJY48JXNesZ9GyQt8fdD97PZsb5mfLWfoRsKoiTbAA== X-Received: by 2002:a05:6a21:9188:b0:1af:f89d:831d with SMTP id adf61e73a8af0-1aff89d8473mr21571039637.24.1716212040255; Mon, 20 May 2024 06:34:00 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.33.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:33:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 15/21] patchtest: test_metadata: fix invalid escape sequences Date: Mon, 20 May 2024 06:33:26 -0700 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 ; Mon, 20 May 2024 13:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199586 From: Trevor Gamblin Clear up the following warnings seen during patchtest runs: |/workspace/yocto/poky/meta/lib/patchtest/tests/test_metadata.py:21: SyntaxWarning: invalid escape sequence '\+' | add_mark = pyparsing.Regex('\+ ') |/workspace/yocto/poky/meta/lib/patchtest/tests/test_metadata.py:26: SyntaxWarning: invalid escape sequence '\:' | git_regex = pyparsing.Regex('^git\:\/\/.*') Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni (cherry picked from commit 2d64317835a768898aac592b24fcbdfaf6c8357a) Signed-off-by: Steve Sakoman --- meta/lib/patchtest/tests/test_metadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index be609dbd04..f5dbcf01ed 100644 --- a/meta/lib/patchtest/tests/test_metadata.py +++ b/meta/lib/patchtest/tests/test_metadata.py @@ -18,12 +18,12 @@ class TestMetadata(base.Metadata): lictag_re = pyparsing.AtLineStart("License-Update:") lic_chksum_added = pyparsing.AtLineStart("+" + metadata_chksum) lic_chksum_removed = pyparsing.AtLineStart("-" + metadata_chksum) - add_mark = pyparsing.Regex('\+ ') + add_mark = pyparsing.Regex('\\+ ') max_length = 200 metadata_src_uri = 'SRC_URI' md5sum = 'md5sum' sha256sum = 'sha256sum' - git_regex = pyparsing.Regex('^git\:\/\/.*') + git_regex = pyparsing.Regex('^git\\:\\/\\/.*') metadata_summary = 'SUMMARY' cve_check_ignore_var = 'CVE_CHECK_IGNORE' cve_status_var = 'CVE_STATUS' From patchwork Mon May 20 13:33:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43876 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A642DC25B7B for ; Mon, 20 May 2024 13:34:06 +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.61063.1716212042913808665 for ; Mon, 20 May 2024 06:34:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=mQW8dKvj; 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-6f457853950so1507412b3a.0 for ; Mon, 20 May 2024 06:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212042; x=1716816842; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IPtaApX9FqqXi7sg2xlqMy8rIYMMhmO/RFQ8WgwhEx4=; b=mQW8dKvjWFmoDKV0LDF3Qx1VyhRuWUsR0tZSSLRMzjyGrRUkcPvB5vvFVAdWgJCdP+ txYn71/NHodp8UPN7gUzZIr592l7YMQzFpywqXF4Mng7cfTX1aeNHg3xsLde/A/XHmRj GnAHr2ycGq9nMj0DXh0SC2jm2U+k7rdvQ15SDr/o4wusbbT6I/4bkV88PHRxNyHZ64jl Id5WCiFjSrxT/Eg9S0JcK6WLG8V+KKIxcthrrLyNwS5FCcOnHhPJR9YtcFiNLbF2HImA 6jyVN2KidgknrWb2CDLxhShBKA7kwwHj1EIKbC2Ep+pXZBl9eAZuzVCKOYsTmpd6z1g/ ve7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212042; x=1716816842; 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=IPtaApX9FqqXi7sg2xlqMy8rIYMMhmO/RFQ8WgwhEx4=; b=lEgHgWXyAA9rmZ2490YWh2kDWEoS/fQG4XaYyynznqySK+R5l/mrAw6xjk8th5A07m c7PwQZL1sbciidpbqn9iRRDf6HCWosb1luQKYWQYGY7KeRH+jNWhjfKR2C1cp2UtR+av MH9jX2jkZ7dkLweQ27UhBGekIOaf2fW0cCvRPVmO7jjLap6JEHCYudqUqScKRWWXqzIh DaUCLN2wiwkDr6A5y6TtNIjQATytlJtdg/iWseEWmWnxPq0cRB9hSdNfqsndTGRbocNY aaSujYVPZe1phG1SD93NMhEbKn+dRfVlViNKurXwi+Dp/CLT2a0iZSCGf29MBcPzyym3 4gpg== X-Gm-Message-State: AOJu0YyTAR1OyXI0iMKULpyP+/cSVcfg+563R7tm40rSEn0tdm2msInj xGfhEsLeeGHr/CJoRG+uQepdX0Np5iw2hB/HFM4HUrordpz8txAk9WY2jzpjsAf7uny8SJHjDjn L X-Google-Smtp-Source: AGHT+IGxczfYisSmrLdr0CBhhDz9svIwgBE23hAVwHrrrAuH/HSaiOQ/59HfMmsuZ0BHuptHFpmIJg== X-Received: by 2002:a05:6a00:23c5:b0:6ea:c7bd:90e3 with SMTP id d2e1a72fcca58-6f69fc2fbf7mr8267304b3a.14.1716212041839; Mon, 20 May 2024 06:34:01 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.34.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:34:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 16/21] bash: Fix file-substitution error-handling bug Date: Mon, 20 May 2024 06:33:27 -0700 Message-Id: <6a81ccc68f8389ca1c9c8eed009388045beea9e4.1716211838.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 ; Mon, 20 May 2024 13:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199587 From: Zev Weiss This is part of a patch that's been upstream for a while but hasn't yet been released. The bug is causing some downstream difficulties, so a local patch to tide us over until the next release makes things a bit easier. Signed-off-by: Zev Weiss Signed-off-by: Alexandre Belloni (cherry picked from commit bf384d6618780dea2df24adac88ba4364cb65b9b) Signed-off-by: Steve Sakoman --- .../bash/bash/fix-filesubst-errexit.patch | 34 +++++++++++++++++++ meta/recipes-extended/bash/bash_5.2.21.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch diff --git a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch new file mode 100644 index 0000000000..60f1852316 --- /dev/null +++ b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch @@ -0,0 +1,34 @@ +From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Fri, 7 Apr 2023 00:28:46 -0700 +Subject: [PATCH] $( +--- + builtins/evalstring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/builtins/evalstring.c b/builtins/evalstring.c +index df3dd68e2a7e..6612081cd646 100644 +--- a/builtins/evalstring.c ++++ b/builtins/evalstring.c +@@ -753,7 +753,7 @@ open_redir_file (r, fnp) + fd = open(fn, O_RDONLY); + if (fd < 0) + { +- file_error (fn); ++ internal_error ("%s: %s", fn, strerror (errno)); + free (fn); + if (fnp) + *fnp = 0; +-- +2.40.0 + diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.21.bb index 46d921bbe6..532adf4c1a 100644 --- a/meta/recipes-extended/bash/bash_5.2.21.bb +++ b/meta/recipes-extended/bash/bash_5.2.21.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://fix-run-builtins.patch \ file://use_aclocal.patch \ file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ + file://fix-filesubst-errexit.patch \ " SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" From patchwork Mon May 20 13:33:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43875 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83F6FC25B78 for ; Mon, 20 May 2024 13:34:06 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.61066.1716212044553558316 for ; Mon, 20 May 2024 06:34:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=TB6gMh4R; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-662aeb8d157so136108a12.1 for ; Mon, 20 May 2024 06:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212044; x=1716816844; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cQsibIfkcT/QkyTSSZ+KUAZc9mzQIsZybvaAtPfP+Rc=; b=TB6gMh4RF0lY8GHjV90h2wcQKO1eLPxQgh8Mdbz+PbIdWO1sxd3dzlIymmxnG2Yvwn yrj+GR0uOey+BzsJGFl2/LVtN34sZrHsBhmwdXIocS0Wgr7pq01gL8hbdbWpxsKjVr9I rP/tHJrRbHpJR5/4mFCewyxx9Z/MSuv1Iu8q9dWhq/4NJhOc1OsBcQxwRNQGyNXZ/vei F11t6e4Tdgd96YUNAOpysJo2wGosG6bwZ88jcgo1nH0PyuY79qnM0btJ3YsiOoGzJb2o 0R5Hdwi71o4BpbvCu/zIMklMme7i/TlRQKzYmhLNzIscX7wLbR0srP8vS2T4ZcOufigH d6VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212044; x=1716816844; 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=cQsibIfkcT/QkyTSSZ+KUAZc9mzQIsZybvaAtPfP+Rc=; b=nU1TntEByCqZ1nnz4jB7C7445PREwlUfArCGiR6qH3yCjiTLxGVeAheSNunHrH0Vxg ykntV75AZlJsntCKPiLQuiNvWU68a84vGIaIZlkNp8GOc5KkqWpbRqlUIIGyQHgJ8dWt QbFZX4Ux7qJLKDh2/Fi6ppPDb7cbGh2Pv/5SZSuF9WCL5QA1anFKEWCPRLP0+B3GDwRo Ld+XVD7TqBYcNScY0xyIfoeVsoQrWUttAH39crctQdQ6tgujSqn6qMyG6B/HVvyQKchW iO/jB3iDxFi/K8aATTN7kTDrh3uKPm2ad7wI4qighonDxXHWMbJtTwPHQU/MGCozChPN B5vQ== X-Gm-Message-State: AOJu0YxXE+5qjS9VVmklVllx62e8fHiX3KJGbrhmr2S2iAaYeUotAJML P+GL3B/BRn3vmnQpzjmdEu8EfsshxbfzbL+pVZ75PtbhEUHFn0GLQltYOcu5DytfNh25m+JFJKM S X-Google-Smtp-Source: AGHT+IEZE0QWk4REZNYRndFuNyZM4S7pHtUM1lcKzGhAzOmmgrFm1CR9BOU8KbEKA+xNZZRgfZ5vDw== X-Received: by 2002:a05:6a00:2d05:b0:6ed:cd4c:cc11 with SMTP id d2e1a72fcca58-6f4e0348519mr34133968b3a.25.1716212043763; Mon, 20 May 2024 06:34:03 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:34:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 17/21] recipetool: Handle unclean response in go resolver Date: Mon, 20 May 2024 06:33:28 -0700 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 ; Mon, 20 May 2024 13:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199588 From: Sven Schwermer It appears that some go modules repond with a 404 error when trying to resolve them dynamically. The response body may still contain the go-import meta tag. An example for such behaviour is gonum.org/v1/gonum. Signed-off-by: Sven Schwermer Signed-off-by: Alexandre Belloni (cherry picked from commit 8f2e14ab6562a9a68819a960c66a258ea9dbe246) Signed-off-by: Steve Sakoman --- scripts/lib/recipetool/create_go.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/lib/recipetool/create_go.py b/scripts/lib/recipetool/create_go.py index c560831442..0fb7115e26 100644 --- a/scripts/lib/recipetool/create_go.py +++ b/scripts/lib/recipetool/create_go.py @@ -16,7 +16,7 @@ from html.parser import HTMLParser from recipetool.create import RecipeHandler, handle_license_vars from recipetool.create import guess_license, tidy_licenses, fixup_license from recipetool.create import determine_from_url -from urllib.error import URLError +from urllib.error import URLError, HTTPError import bb.utils import json @@ -251,15 +251,18 @@ class GoRecipeHandler(RecipeHandler): req = urllib.request.Request(url) try: - resp = urllib.request.urlopen(req) - + body = urllib.request.urlopen(req).read() + except HTTPError as http_err: + logger.warning( + "Unclean status when fetching page from [%s]: %s", url, str(http_err)) + body = http_err.fp.read() except URLError as url_err: logger.warning( "Failed to fetch page from [%s]: %s", url, str(url_err)) return None parser = GoImportHTMLParser() - parser.feed(resp.read().decode('utf-8')) + parser.feed(body.decode('utf-8')) parser.close() return GoImport(parser.import_prefix, parser.vcs, parser.repourl, None) From patchwork Mon May 20 13:33:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43872 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74B17C04FFE for ; Mon, 20 May 2024 13:34:06 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.60352.1716212046035654129 for ; Mon, 20 May 2024 06:34:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=mo6RBjjo; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ecd3867556so76890855ad.0 for ; Mon, 20 May 2024 06:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212045; x=1716816845; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YyM8Tc2QOmyjHx6yEFfVZstVtp1j2S4wttcJGZ44Fso=; b=mo6RBjjoj3vRowprEqXLPpP+hsKCWFZDzbwBYIaYBdd7iAcRVgioqYrrqB+4SYv9M8 +ZC7MN8b8RmL7qQiTcvrdqtd6IEio6cEoeSuknY56xkyb4GYEXmJHxk8VZQoiWm6QI/E uoWQM0VXQ2BOzLfPImxixWPt+4hmjvu2xYktYcbN/lmGZXrh2DjPkQRGs+MFUedReyD6 MKov350zfzXFvONlhaL9fniVB7wajMro2z33Wl4V50HD899Of38XIVpZaduUGsfp0oc2 wrG+uBqo1IN6FJPHEmu/skwnyHzc7gm4uAS3Q5rrONysa5VZG95sh6CkuQ1kgDGwQ3mq 9hYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212045; x=1716816845; 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=YyM8Tc2QOmyjHx6yEFfVZstVtp1j2S4wttcJGZ44Fso=; b=elTrMzP7IbZXaO4dmGRR4hjw0bLcqWs4L6g+75rZu1Pxd/WhvrLigDPwED/QEUNO8C 9HWoPUpRoOPV8w6PyxPY90ngD81kJEMNSQYblH1okOIlUgrdOqyX0yw+IkO4q5ybclwL 1O+jq529isofqdd5pFYvPE6loAmbqOMvAKkXi76phDI5sV1Iykbf4bUPq+MulOpBMB5z z1lubloxTqmHBZM6BMV0AYRupKH/ge45cAkNxPl3A1+r9bNsWTudCOiq0S5fkCLvuB/5 m1hmir2JpKfCq9//LvFvPx24zpt3np3FTWfZYfqKzS8A3kdBU97eEwntB8fw9IhD6F+i ULaA== X-Gm-Message-State: AOJu0Yy/XKUuIz8ln6cePgEbEzM+ostrgXYRL+y5lDY0XN43xrD0/412 J04Ng4GctcS4DSOMA5MDxjV3WcZlYmy5TebLvwxw5eaNRR/rT2p1z9J1tkQuWweyLnrjyocYlgw d X-Google-Smtp-Source: AGHT+IEoo3FbYXN7Np1ICk2lPQYXFEzq1c0UJp0bHhJWmKTjeKtfnzUXr50WYHUhawZ6EmlM+KNgGw== X-Received: by 2002:a05:6a21:3949:b0:1b1:d519:6cce with SMTP id adf61e73a8af0-1b1d5196dc6mr3733811637.57.1716212045364; Mon, 20 May 2024 06:34:05 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.34.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:34:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 18/21] recipetool: Handle several go-import tags in go resolver Date: Mon, 20 May 2024 06:33:29 -0700 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 ; Mon, 20 May 2024 13:34:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199589 From: Sven Schwermer When dynamically resolving go modules, the HTML page may contain several go-import meta tags. We must handle all and pick the correct one based on the module name. An example for such a behaviour is gonum.org/v1/gonum: Signed-off-by: Sven Schwermer Signed-off-by: Alexandre Belloni (cherry picked from commit 9c36a61e29359067165bddc7f2accdf2c4c8a761) Signed-off-by: Steve Sakoman --- scripts/lib/recipetool/create_go.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/scripts/lib/recipetool/create_go.py b/scripts/lib/recipetool/create_go.py index 0fb7115e26..a85a2f2786 100644 --- a/scripts/lib/recipetool/create_go.py +++ b/scripts/lib/recipetool/create_go.py @@ -225,7 +225,7 @@ class GoRecipeHandler(RecipeHandler): def __init__(self): super().__init__() - self.__srv = [] + self.__srv = {} def handle_starttag(self, tag, attrs): if tag == 'meta' and list( @@ -233,19 +233,14 @@ class GoRecipeHandler(RecipeHandler): content = list( filter(lambda a: (a[0] == 'content'), attrs)) if content: - self.__srv = content[0][1].split() + srv = content[0][1].split() + self.__srv[srv[0]] = srv - @property - def import_prefix(self): - return self.__srv[0] if len(self.__srv) else None - - @property - def vcs(self): - return self.__srv[1] if len(self.__srv) else None - - @property - def repourl(self): - return self.__srv[2] if len(self.__srv) else None + def go_import(self, modulepath): + if modulepath in self.__srv: + srv = self.__srv[modulepath] + return GoImport(srv[0], srv[1], srv[2], None) + return None url = url.geturl() + "?go-get=1" req = urllib.request.Request(url) @@ -265,7 +260,7 @@ class GoRecipeHandler(RecipeHandler): parser.feed(body.decode('utf-8')) parser.close() - return GoImport(parser.import_prefix, parser.vcs, parser.repourl, None) + return parser.go_import(modulepath) def __resolve_from_golang_proxy(self, modulepath, version): """ From patchwork Mon May 20 13:33:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43877 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D44EC04FFE for ; Mon, 20 May 2024 13:34:16 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.61068.1716212047620827421 for ; Mon, 20 May 2024 06:34:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=abfkhUd6; 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-6f490b5c23bso101692b3a.3 for ; Mon, 20 May 2024 06:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212047; x=1716816847; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V2HyNiVHbQA2VvL/+FnwoZp7nUow8kWeUUCbrjyiP0M=; b=abfkhUd61qexHq/IPMyj0CK39qoQvL3brJi3nyWDfq54udUU/4BxGhpT4r8K2KMh4S FZQdWq195nns7w5n4lJguo6L1/chpjkvKCKOakKvN7DAxcCPF6z65vwNci1Wt05tSU0G bFw5L7DdhKqVMHSGgAXMZp+QUpjcssGcCA9QwFBNLIEV72g+/0trn94pbQWapQF1/E/3 BxXjz3z1La0kQbjyDykWb46aUKUB8A4B6ZVsMluRBDHd5tSf72euODCbRKwy96KTOrKi ozK2sm+A3iGTRY0rNPqjEk2LV1XOCrYBrTILPyPXT220l+mc5tpTVhHRSCuHPVCxHQm5 PN2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212047; x=1716816847; 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=V2HyNiVHbQA2VvL/+FnwoZp7nUow8kWeUUCbrjyiP0M=; b=UoYYUp4o88waQ1IJm0lQ3Asuum32jiq0sBgoYdg5/0YPnlJx3LvoCURhVs6AiIwoqf EfjtwsNLfvBO78j6XeHfVp6xiuvyBUlUMbBKm+FNOD3tl074SgdI4QboQYUZ4vqAEpwm DRyAZgRnkDGqZ9e/BQHp0SmaBu/nLRvFV8cCxg8Y912Sb1SMeuH6cDbAvojpf56oUxey BXOTofRfkFMFm46MdZBig1BA2967poFBcQ0FDIb6gyvUQj/q5gwusXq2vEWliO/yhZ4F unPxmb3EduX+wHU1Pbzf4Pmljq8+3lCN+RnMVpaqzIuw8ijIs3eUXigppndGQZ3+1/WY 3nvQ== X-Gm-Message-State: AOJu0Yy1hAQONnSH4X5LL5nZi1bDEQsF4e4eUHz1Ol4eTUnI0RnECx3n fV0vu+wCIvLDhlp+w1OVk4CRYlxe6UbbHJDwV+Rs7ADNaSpJ5fv2lNh48h8rsgGe/dauBX6iRcV 1 X-Google-Smtp-Source: AGHT+IFRfgsVGobohDQEZ2u9IUWj5hdesdEBK/Gw0LkOWpN6B0fAKjd2r/P86qFhiELg0Y5Stj1ECA== X-Received: by 2002:a05:6a00:188d:b0:6ea:afd2:b1dc with SMTP id d2e1a72fcca58-6f4e037e8acmr27978159b3a.29.1716212046762; Mon, 20 May 2024 06:34:06 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.34.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:34:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 19/21] lib/oe/package-manager: allow including self in create_packages_dir Date: Mon, 20 May 2024 06:33:30 -0700 Message-Id: <20a6f55328733ad6f0c05b1353e8d525019aeea7.1716211838.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 ; Mon, 20 May 2024 13:34:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199590 From: Ross Burton This function is typically used to construct a limited feed for image creation, but there are other cases when you might want a limited feed and include the current recipe's packages in it. To ensure that existing behaviour is preserved, add a boolean to control this behaviour and default it to False. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit aada7fda2b118152d82b1ab295d92b8251afe4ac) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index 6774cdb794..d3b2317894 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py @@ -449,7 +449,7 @@ class PackageManager(object, metaclass=ABCMeta): return res return _append(uris, base_paths) -def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencies): +def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencies, include_self=False): """ Go through our do_package_write_X dependencies and hardlink the packages we depend upon into the repo directory. This prevents us seeing other packages that may @@ -486,14 +486,17 @@ def create_packages_dir(d, subrepo_dir, deploydir, taskname, filterbydependencie bb.fatal("Couldn't find ourself in BB_TASKDEPDATA?") pkgdeps = set() start = [start] - seen = set(start) + if include_self: + seen = set() + else: + seen = set(start) # Support direct dependencies (do_rootfs -> do_package_write_X) # or indirect dependencies within PN (do_populate_sdk_ext -> do_rootfs -> do_package_write_X) while start: next = [] for dep2 in start: for dep in taskdepdata[dep2][3]: - if taskdepdata[dep][0] != pn: + if include_self or taskdepdata[dep][0] != pn: if "do_" + taskname in dep: pkgdeps.add(dep) elif dep not in seen: From patchwork Mon May 20 13:33:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43878 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E629C41513 for ; Mon, 20 May 2024 13:34:16 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.60354.1716212048870955421 for ; Mon, 20 May 2024 06:34:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=hgf6yvS2; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1edc696df2bso7644115ad.0 for ; Mon, 20 May 2024 06:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212048; x=1716816848; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=U3vzDIos21vne9tgYsRbqhaHf+UBl+F5KAg1lrB7snI=; b=hgf6yvS233eviEffOaKZ8o5cC4TSg4PhojaHLAy9Kd1KiWT9t4pJ3YcA40AcZyP5xp IMekeKf50VdTyO3N7wmw8dr7YrASa3ESvZgESpALDkg5uwcsHcjZ00dPRxL4fdKt7Ayv ZaC625kZnH3cgL6f7WA8HmuJJcLoZwIAHMxj51ucTp92l1Kr1ZAF9l0w5FlOpjjrhYq/ yhiahxi++bd6fiNyUCH8YNKdPQmx7/ddza99Afq0o8MfiJFOxBoadURweZ0gIl+fi0r3 jonPNAirqbFzCds4rjrOvaEZdsJiDKanxiwLIH/ReqYzE5QAEg7Vhx3bhDj5/PGIcQzP wBOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212048; x=1716816848; 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=U3vzDIos21vne9tgYsRbqhaHf+UBl+F5KAg1lrB7snI=; b=VWzjAPLeG+rmN3dfNlG1ZL6wamFcW9PYvBjN3HsjrgekyerSARlJAWlT1OrvN4oaag iQ7SozBqYDUUdM5nANxuJahz/LvUOTkS2qVVwbOA/S7e/kJWeIjIHS8Kr0/qMw/9rlSf iXmM5HmclV7Ctxk07OgMolgU14k+BCc0WemjanTh3XoFblqYP/cELKkDYEE/ssOQJULc DBpbar41rXipygr07bKpJV5qmDnj1XQRL/T7WVhtEPkcY5C4Nd8RDtJqDxZQPmquiOvy cRS/Hg/dknPWymsJbtytTgxtmMVSyixyUCraDnSx5qe+lquKcCYPiSV/4+4/EcAf3NMj f6Iw== X-Gm-Message-State: AOJu0YyCSu4ydM/UOLP1hOL5yfC72zScCwPqgNCjJoEZDGErvy+RXY2e e/ZmMC/KfV5FeRaZgCYUFQy+ihMoj7NoeF+2XyLsIvnqs05a+ifJECojBkvRpZ8ehsDYqY/ntcu o X-Google-Smtp-Source: AGHT+IHSP6e6/aIPhPGuH4xNuYy+NfKU9OoXTWQ7BD53Lz9aJuRKCGGavDvkQ8yUJ08wKpRcuVPyZw== X-Received: by 2002:a05:6a21:32a7:b0:1a7:2924:7317 with SMTP id adf61e73a8af0-1afde1b266bmr35517281637.49.1716212048063; Mon, 20 May 2024 06:34:08 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.34.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:34:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 20/21] selftest/classes: add localpkgfeed class Date: Mon, 20 May 2024 06:33:31 -0700 Message-Id: <00e4eb179b6bd4fca2499d997c60889c3d7ff632.1716211838.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 ; Mon, 20 May 2024 13:34:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199591 From: Ross Burton This class can be used to construct a subset of a deployed package feed for use in tests which iterate the deploy directory, and as such a huge feed of 30K+ packages can result in very slow tests. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit c5486d6ad32457f09c104d5dd31314bd570912d3) Signed-off-by: Steve Sakoman --- meta-selftest/classes/localpkgfeed.bbclass | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 meta-selftest/classes/localpkgfeed.bbclass diff --git a/meta-selftest/classes/localpkgfeed.bbclass b/meta-selftest/classes/localpkgfeed.bbclass new file mode 100644 index 0000000000..b796375e55 --- /dev/null +++ b/meta-selftest/classes/localpkgfeed.bbclass @@ -0,0 +1,27 @@ +# Create a subset of the package feed that just contain the +# packages depended on by this recipe. + +LOCALPKGFEED_DIR = "${WORKDIR}/localpkgfeed" + +addtask localpkgfeed after do_build +do_localpkgfeed[cleandirs] = "${LOCALPKGFEED_DIR}" +do_localpkgfeed[nostamp] = "1" + +def get_packaging_class(d): + package_class = d.getVar("PACKAGE_CLASSES").split()[0] + return package_class.replace("package_", "") + +python () { + packaging = get_packaging_class(d) + d.setVarFlag("do_localpkgfeed", "rdeptask", "do_package_write_" + packaging) +} + +python do_localpkgfeed() { + import oe.package_manager + + packaging = get_packaging_class(d) + deploydir = d.getVar("DEPLOY_DIR_" + packaging.upper()) + task = "package_write_" + packaging + + oe.package_manager.create_packages_dir(d, d.getVar("LOCALPKGFEED_DIR"), deploydir, task, True, True) +} From patchwork Mon May 20 13:33:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 43881 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC93CC25B7A for ; Mon, 20 May 2024 13:34:16 +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.61069.1716212050101493600 for ; Mon, 20 May 2024 06:34:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ksvv5nUk; 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-1ed0abbf706so6953825ad.2 for ; Mon, 20 May 2024 06:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1716212049; x=1716816849; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kdGD/T1O2OVStI4Wtg0Xs3NP+tSmGxTE7zQi4BGAKRI=; b=Ksvv5nUk/Cr4VjQaYBtIqUqJ5JQYmc2evzMKUNjnj2gzweJfSKH+CI0yLLMP4XJ4Ie 0/UcUf9FqoQ98FxSjNxW8lhZ3Xg+SJhY/XUBm3jHac4asctSBV8iPM0jRTEwkOsp0opq 8Ty71TapA4ZlPXHTlxwUfKhJWVcygJNY4H6LFgF5g9khClF0RXSIr4RUHykfn0gfEIW6 E/Ig/6tmdGTFLzCStLevAOmvKyVwBBN5Z5c0aA09VpNRcO29+TysU+63jHV3i929HhoG S8rtZIcVaC7gsiT1EWZrUe99grvz49eXzX3CXnie33vnwL/V9A+mc63JgNfpak0BLEHy dyXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716212049; x=1716816849; 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=kdGD/T1O2OVStI4Wtg0Xs3NP+tSmGxTE7zQi4BGAKRI=; b=n9onncVYsnjCK3a1tWq3sYZSP+WpF6Wd4M5klq/gOgz0CEUGdB1LUIgyK32EEB24Q9 M9tJfcfDxv8y/qhiXlfhQbHh3XHBn1Faci8lzXf+vmUKru+vyzlXyzS1zivpBUiYI0rh Wl1IFFuugFPSiEgVRdLUg08NVmn8egY0IaGwEdCDA1rV2EZ4Gua7DJAksRy8es5u68Ql D/HdeyAhOvrOACe1V8yeYdXCw1hpRUWz+Q+jPB5M5MIWfVfHdJosuvK2CulT+aNssKEZ KTbQXiHYZs+s4ER846JyRA0cAGmcVtE6q5DexNyzStDHWVp9Ow7DG26FGGqbgVAv3rnU Sa1A== X-Gm-Message-State: AOJu0YxcYc+DEKvyPdBceACfhrrZnKQn5P27wsGldW/bPvij98XAEFY2 BLXhMOnmmL2hoz+V+10iEhqVh/913XkzQx4cs2QL8fbjMNDrGDwBpar3UchdfbKYvdL8+rppfPj N X-Google-Smtp-Source: AGHT+IF+8pIPjW3yLiuefS3723p/kwg5ew2E5ML6a2G29UGqcZbwOBIvDjAE5lOWhd8WUsU+WUAxYw== X-Received: by 2002:a05:6a21:789f:b0:1af:cdd4:9bf3 with SMTP id adf61e73a8af0-1afde10f1b3mr34257113637.32.1716212049349; Mon, 20 May 2024 06:34:09 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a66621sm19671465b3a.13.2024.05.20.06.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 May 2024 06:34:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 21/21] oeqa/selftest/debuginfod: use localpkgfeed to speed server startup Date: Mon, 20 May 2024 06:33:32 -0700 Message-Id: <0795169be206f1d4d140fe378e2476a44d0ce02b.1716211838.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 ; Mon, 20 May 2024 13:34:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199592 From: Ross Burton Sometimes the debuginfod selftest fails due to a timeout, because it spends too long scanning a huge deploy directory that due to what tests were ran previously can contain 30K packages. The test only needs a subset of the feed, so use the new localpkgfeed class to construct a minimal feed before running the test. [ YOCTO #14937 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 855376f518b28248ccd82ef5b2e89e6a8c970542) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/debuginfod.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/debuginfod.py b/meta/lib/oeqa/selftest/cases/debuginfod.py index 505b4be837..46c0cd87bb 100644 --- a/meta/lib/oeqa/selftest/cases/debuginfod.py +++ b/meta/lib/oeqa/selftest/cases/debuginfod.py @@ -62,7 +62,7 @@ class Debuginfod(OESelftestTestCase): raise TimeoutError("Cannot connect debuginfod, still %d scan jobs running" % latest) - def start_debuginfod(self): + def start_debuginfod(self, feed_dir): # We assume that the caller has already bitbake'd elfutils-native:do_addto_recipe_sysroot # Save some useful paths for later @@ -82,7 +82,7 @@ class Debuginfod(OESelftestTestCase): # Disable rescanning, this is a one-shot test "--rescan-time=0", "--groom-time=0", - get_bb_var("DEPLOY_DIR"), + feed_dir, ] format = get_bb_var("PACKAGE_CLASSES").split()[0] @@ -114,11 +114,12 @@ class Debuginfod(OESelftestTestCase): self.write_config(""" TMPDIR = "${TOPDIR}/tmp-debuginfod" DISTRO_FEATURES:append = " debuginfod" +INHERIT += "localpkgfeed" """) - bitbake("elfutils-native:do_addto_recipe_sysroot xz xz:do_package") + bitbake("elfutils-native:do_addto_recipe_sysroot xz xz:do_package xz:do_localpkgfeed") try: - self.start_debuginfod() + self.start_debuginfod(get_bb_var("LOCALPKGFEED_DIR", "xz")) env = os.environ.copy() env["DEBUGINFOD_URLS"] = "http://localhost:%d/" % self.port @@ -141,12 +142,13 @@ DISTRO_FEATURES:append = " debuginfod" self.write_config(""" TMPDIR = "${TOPDIR}/tmp-debuginfod" DISTRO_FEATURES:append = " debuginfod" +INHERIT += "localpkgfeed" CORE_IMAGE_EXTRA_INSTALL += "elfutils xz" """) - bitbake("core-image-minimal elfutils-native:do_addto_recipe_sysroot") + bitbake("core-image-minimal elfutils-native:do_addto_recipe_sysroot xz:do_localpkgfeed") try: - self.start_debuginfod() + self.start_debuginfod(get_bb_var("LOCALPKGFEED_DIR", "xz")) with runqemu("core-image-minimal", runqemuparams="nographic") as qemu: cmd = "DEBUGINFOD_URLS=http://%s:%d/ debuginfod-find debuginfo /usr/bin/xz" % (qemu.server_ip, self.port)