From patchwork Thu Jul 27 19:43:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28019 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 547C8EB64DD for ; Thu, 27 Jul 2023 19:44:02 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.16704.1690487034305322481 for ; Thu, 27 Jul 2023 12:43:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=xipqB09q; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-267ffa55791so838966a91.1 for ; Thu, 27 Jul 2023 12:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487033; x=1691091833; 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=O1veEEdMkQ1Lx0P+Uubjd3VlaTMv20AJY98H6b5nD2Y=; b=xipqB09qriQ/tToS+v2r5ee7BN6W82Sc1Zq1MrNwNrcAQdM3a5RXQxYoCwe0QXIL7m Ar1TdsSjYUceS7C7Lta7ZTMTuTyCYXfymz0p4g33nCWjoiM5RwsLEKxk6Abped8otshZ ZRXbf/n2Lqd5w/y4xGV5oyMmgGbBWM4uaRqraovoeNfZzXVFYIUYEhYA0wuuoUkK0e9P Rv2oPJZvVQEprtCA32g6L1AeV/me3YWdt1Z0ox8TGV8yWhKpvv7TWV0rJGc7cezCWuOJ lCywH1R/KpFQ/E4Lob4/7Y+iAG9PXHGbnbZVAY5Gr/O72UxJFvIjk8q59HiUyruoPVQU akkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487033; x=1691091833; 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=O1veEEdMkQ1Lx0P+Uubjd3VlaTMv20AJY98H6b5nD2Y=; b=XXl/VD4NAlbn7AuYD+iNTL3tNEnVSgsV8o0bI4pXzQkpMtaDTAGdTT0GRKGSOu2l26 ZUVmZUyo2IHTafTQXHkw2q32noDrSXzeV7tbazgKEZZHW9Ola3IREi987geebgGvskUM ++Mh2CKLRO5mzyqZnN4raV8RsMPjEITy3U9yuQtUw88jPV/572NmmRofwte1jm3GQOHf NCpvTecM7EEeUfRRsSHh7Z8ZQqXPgn5Nv0JIYRR3S6lplbi2NPs4NYIPFZMCdEYL5Y6l lswc7gFmDUShFCPfE4LbxlKbe/dG6wj3Yw+Sj1CRxMEBaLroog1F5ntnEUMHAX/94+w+ tjkw== X-Gm-Message-State: ABy/qLYtJNuU7NCgx7jfPrXHquIkX4YZZiqpXDXpfEPKSu6R/IS8M/XY K0J8UMgT2OlXzHmt5cnhibOgDaq+139RKqFeArc= X-Google-Smtp-Source: APBJJlH2ofHqlsE70cT9lhCxS9Tm3o/ejw1vEEhCPrVWPIc+b8GqQvNUZddC6sWAhe4IzDOYP/METw== X-Received: by 2002:a17:90a:d194:b0:268:4c01:eb56 with SMTP id fu20-20020a17090ad19400b002684c01eb56mr270666pjb.2.1690487033246; Thu, 27 Jul 2023 12:43:53 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.43.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:43:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/27] libjpeg-turbo: patch CVE-2023-2804 Date: Thu, 27 Jul 2023 09:43:19 -1000 Message-Id: <473058bf65ac98f644b1ffd4d5190ee782b824a5.1690486929.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 ; Thu, 27 Jul 2023 19:44:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184976 From: Peter Marko Relevant links: * linked fronm NVD: * https://github.com/libjpeg-turbo/libjpeg-turbo/issues/668#issuecomment-1492586118 * follow-up analysis: * https://github.com/libjpeg-turbo/libjpeg-turbo/issues/668#issuecomment-1496473989 * picked commits fix all issues mentioned in this analysis Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- .../jpeg/files/CVE-2023-2804-1.patch | 103 ++++++++++++++++++ .../jpeg/files/CVE-2023-2804-2.patch | 75 +++++++++++++ .../jpeg/libjpeg-turbo_2.1.5.1.bb | 2 + 3 files changed, 180 insertions(+) create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch diff --git a/meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch b/meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch new file mode 100644 index 0000000000..fd8a66bca7 --- /dev/null +++ b/meta/recipes-graphics/jpeg/files/CVE-2023-2804-1.patch @@ -0,0 +1,103 @@ +From 42ce199c9cfe129e5e21afd48dfe757a6acf87c4 Mon Sep 17 00:00:00 2001 +From: DRC +Date: Tue, 4 Apr 2023 19:06:20 -0500 +Subject: [PATCH] Decomp: Don't enable 2-pass color quant w/ RGB565 + +The 2-pass color quantization algorithm assumes 3-sample pixels. RGB565 +is the only 3-component colorspace that doesn't have 3-sample pixels, so +we need to treat it as a special case when determining whether to enable +2-pass color quantization. Otherwise, attempting to initialize 2-pass +color quantization with an RGB565 output buffer could cause +prescan_quantize() to read from uninitialized memory and subsequently +underflow/overflow the histogram array. + +djpeg is supposed to fail gracefully if both -rgb565 and -colors are +specified, because none of its destination managers (image writers) +support color quantization with RGB565. However, prescan_quantize() was +called before that could occur. It is possible but very unlikely that +these issues could have been reproduced in applications other than +djpeg. The issues involve the use of two features (12-bit precision and +RGB565) that are incompatible, and they also involve the use of two +rarely-used legacy features (RGB565 and color quantization) that don't +make much sense when combined. + +Fixes #668 +Fixes #671 +Fixes #680 + +CVE: CVE-2023-2804 +Upstream-Status: Backport [https://github.com/libjpeg-turbo/libjpeg-turbo/commit/42ce199c9cfe129e5e21afd48dfe757a6acf87c4] + +Signed-off-by: Peter Marko +--- + ChangeLog.md | 12 ++++++++++++ + jdmaster.c | 5 +++-- + jquant2.c | 5 +++-- + 3 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/ChangeLog.md b/ChangeLog.md +index 1c1e6538a..f1bfb3d87 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -1,3 +1,15 @@ ++2.1.6 ++===== ++ ++### Significant changes relative to 2.1.5.1: ++ ++1. Fixed an oversight in 1.4 beta1[8] that caused various segfaults and buffer ++overruns when attempting to decompress various specially-crafted malformed ++12-bit-per-component JPEG images using a 12-bit-per-component build of djpeg ++(`-DWITH_12BIT=1`) with both color quantization and RGB565 color conversion ++enabled. ++ ++ + 2.1.5.1 + ======= + +diff --git a/jdmaster.c b/jdmaster.c +index a3690bf56..a9446adfd 100644 +--- a/jdmaster.c ++++ b/jdmaster.c +@@ -5,7 +5,7 @@ + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2002-2009 by Guido Vollbeding. + * libjpeg-turbo Modifications: +- * Copyright (C) 2009-2011, 2016, 2019, 2022, D. R. Commander. ++ * Copyright (C) 2009-2011, 2016, 2019, 2022-2023, D. R. Commander. + * Copyright (C) 2013, Linaro Limited. + * Copyright (C) 2015, Google, Inc. + * For conditions of distribution and use, see the accompanying README.ijg +@@ -480,7 +480,8 @@ master_selection(j_decompress_ptr cinfo) + if (cinfo->raw_data_out) + ERREXIT(cinfo, JERR_NOTIMPL); + /* 2-pass quantizer only works in 3-component color space. */ +- if (cinfo->out_color_components != 3) { ++ if (cinfo->out_color_components != 3 || ++ cinfo->out_color_space == JCS_RGB565) { + cinfo->enable_1pass_quant = TRUE; + cinfo->enable_external_quant = FALSE; + cinfo->enable_2pass_quant = FALSE; +diff --git a/jquant2.c b/jquant2.c +index 44efb18ca..1c14ef763 100644 +--- a/jquant2.c ++++ b/jquant2.c +@@ -4,7 +4,7 @@ + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-1996, Thomas G. Lane. + * libjpeg-turbo Modifications: +- * Copyright (C) 2009, 2014-2015, 2020, D. R. Commander. ++ * Copyright (C) 2009, 2014-2015, 2020, 2023, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -1230,7 +1230,8 @@ jinit_2pass_quantizer(j_decompress_ptr cinfo) + cquantize->error_limiter = NULL; + + /* Make sure jdmaster didn't give me a case I can't handle */ +- if (cinfo->out_color_components != 3) ++ if (cinfo->out_color_components != 3 || ++ cinfo->out_color_space == JCS_RGB565) + ERREXIT(cinfo, JERR_NOTIMPL); + + /* Allocate the histogram/inverse colormap storage */ diff --git a/meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch b/meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch new file mode 100644 index 0000000000..af955a72f6 --- /dev/null +++ b/meta/recipes-graphics/jpeg/files/CVE-2023-2804-2.patch @@ -0,0 +1,75 @@ +From 2e1b8a462f7f9f9bf6cd25a8516caa8203cc4593 Mon Sep 17 00:00:00 2001 +From: DRC +Date: Thu, 6 Apr 2023 18:33:41 -0500 +Subject: [PATCH] jpeg_crop_scanline: Fix calc w/sclg + 2x4,4x2 samp + +When computing the downsampled width for a particular component, +jpeg_crop_scanline() needs to take into account the fact that the +libjpeg code uses a combination of IDCT scaling and upsampling to +implement 4x2 and 2x4 upsampling with certain decompression scaling +factors. Failing to account for that led to incomplete upsampling of +4x2- or 2x4-subsampled components, which caused the color converter to +read from uninitialized memory. With 12-bit data precision, this caused +a buffer overrun or underrun and subsequent segfault if the +uninitialized memory contained a value that was outside of the valid +sample range (because the color converter uses the value as an array +index.) + +Fixes #669 + +CVE: CVE-2023-2804 +Upstream-Status: Backport [https://github.com/libjpeg-turbo/libjpeg-turbo/commit/2e1b8a462f7f9f9bf6cd25a8516caa8203cc4593] + +Signed-off-by: Peter Marko +--- + ChangeLog.md | 8 ++++++++ + jdapistd.c | 10 ++++++---- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/ChangeLog.md b/ChangeLog.md +index f1bfb3d87..0a075c3c5 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -9,6 +9,14 @@ overruns when attempting to decompress various specially-crafted malformed + (`-DWITH_12BIT=1`) with both color quantization and RGB565 color conversion + enabled. + ++2. Fixed an issue whereby `jpeg_crop_scanline()` sometimes miscalculated the ++downsampled width for components with 4x2 or 2x4 subsampling factors if ++decompression scaling was enabled. This caused the components to be upsampled ++incompletely, which caused the color converter to read from uninitialized ++memory. With 12-bit data precision, this caused a buffer overrun or underrun ++and subsequent segfault if the sample value read from unitialized memory was ++outside of the valid sample range. ++ + + 2.1.5.1 + ======= +diff --git a/jdapistd.c b/jdapistd.c +index 02cd0cb93..96cded112 100644 +--- a/jdapistd.c ++++ b/jdapistd.c +@@ -4,7 +4,7 @@ + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1994-1996, Thomas G. Lane. + * libjpeg-turbo Modifications: +- * Copyright (C) 2010, 2015-2020, 2022, D. R. Commander. ++ * Copyright (C) 2010, 2015-2020, 2022-2023, D. R. Commander. + * Copyright (C) 2015, Google, Inc. + * For conditions of distribution and use, see the accompanying README.ijg + * file. +@@ -236,9 +236,11 @@ jpeg_crop_scanline(j_decompress_ptr cinfo, JDIMENSION *xoffset, + /* Set downsampled_width to the new output width. */ + orig_downsampled_width = compptr->downsampled_width; + compptr->downsampled_width = +- (JDIMENSION)jdiv_round_up((long)(cinfo->output_width * +- compptr->h_samp_factor), +- (long)cinfo->max_h_samp_factor); ++ (JDIMENSION)jdiv_round_up((long)cinfo->output_width * ++ (long)(compptr->h_samp_factor * ++ compptr->_DCT_scaled_size), ++ (long)(cinfo->max_h_samp_factor * ++ cinfo->_min_DCT_scaled_size)); + if (compptr->downsampled_width < 2 && orig_downsampled_width >= 2) + reinit_upsampler = TRUE; + diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb index e086830c02..86bf471eea 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb @@ -12,6 +12,8 @@ DEPENDS:append:x86:class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ + file://CVE-2023-2804-1.patch \ + file://CVE-2023-2804-2.patch \ " SRC_URI[sha256sum] = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf" From patchwork Thu Jul 27 19:43:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28016 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 46C1BC41513 for ; Thu, 27 Jul 2023 19:44:02 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web11.16745.1690487038782968056 for ; Thu, 27 Jul 2023 12:43:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=bUM2lNfs; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-55adfa61199so920982a12.2 for ; Thu, 27 Jul 2023 12:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487038; x=1691091838; 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=eCmVxG4tMMWIQ1omYf4491TSxu6bhbgauUoO9r8WRkM=; b=bUM2lNfskM1IBRKsTlkElxOveeEffddjNXsazAi715wwor6VaLeNte8l51g5Sa5OvC BbIiYUa1afpKzuiu2jN2c94cL30JFirB58biH0snz+LVuvU3rCJyqlvQX3QjgRan3F8S jeC4VUzZoWYLNCqWOY5tDp6l4nST2VTV47tSh/MroTcys3wiityzPxBOrEPJhwpM7aBp Lg1dmpNimUt18wuuQjHqZmUtJfoo7x3gQ1So4ANxBsw6jBFxvbtc8HwOBaH0VDIlpRt0 2n7BCzNY3PD5GZvgtw5110MH5vW1qPXf1WWBY8GhcvpVj4cDmQLxDYvdwPBAQNei+EK/ tWNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487038; x=1691091838; 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=eCmVxG4tMMWIQ1omYf4491TSxu6bhbgauUoO9r8WRkM=; b=AG1yJlZzKK8HBbd4fAHrRc0AEGFHMFVS4yfIJcqvcOCOX95X9PcWkFqHF+NWk8ttYY /Gib6S0LOMWuwIkHDFnvHcASZ3RLSLECifwJlG+2BCw7iOJUOrwvxROScztvxlYDBWCo XoY+YBQuWSxVSgwcHZdw4xN5yDCQEPmZ9Jxvolf1PVfWD724j2yfdBZXCABlZsSs0CYd vGpvkI6N6EclaQ+H5yPRBQ/KTsyTgjZoNBK1PEa/l5h/QMsVena1nQHdndMj8loyYDq9 A0utB62ByuKuxQgLZrp0yFJIYkANCt/CwVTj2a0ru22Krso9HgghFDDzIiOYHsvg0Ggq KVaA== X-Gm-Message-State: ABy/qLZE3PEGsVjw/hlt6c8V1g/Bo2j55MtLq3Xz0tok2UVVjK1j1Uu2 sD4l7SqOgZft3C9PHEl2HIiZoHP3usLgpl3Pkvs= X-Google-Smtp-Source: APBJJlEN5UzoD6XoCVLIIH/vJCQqamUI4NA9Huzi8x81lyDfEAnCBLGY2coSJGaqhvq4C2MWCn2ncA== X-Received: by 2002:a17:90b:1806:b0:263:f39:496d with SMTP id lw6-20020a17090b180600b002630f39496dmr268228pjb.44.1690487037850; Thu, 27 Jul 2023 12:43:57 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.43.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:43:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/27] python3: ignore CVE-2023-36632 Date: Thu, 27 Jul 2023 09:43:20 -1000 Message-Id: <3e7f736fa07a132d4fe42a59baaabe565238da21.1690486929.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 ; Thu, 27 Jul 2023 19:44:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184977 From: Peter Marko This CVE shouldn't have been filed as the "exploit" is described in the documentation as how the library behaves. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c652f094d86c4efb7ff99accba63b8169493ab18) Signed-off-by: Peter Marko Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3_3.11.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3_3.11.2.bb b/meta/recipes-devtools/python/python3_3.11.2.bb index 5bd8d32b14..f3be9768bf 100644 --- a/meta/recipes-devtools/python/python3_3.11.2.bb +++ b/meta/recipes-devtools/python/python3_3.11.2.bb @@ -56,6 +56,8 @@ CVE_CHECK_IGNORE += "CVE-2020-15523 CVE-2022-26488" # The mailcap module is insecure by design, so this can't be fixed in a meaningful way. # The module will be removed in the future and flaws documented. CVE_CHECK_IGNORE += "CVE-2015-20107" +# Not an issue, in fact expected behaviour +CVE_CHECK_IGNORE += "CVE-2023-36632" PYTHON_MAJMIN = "3.11" From patchwork Thu Jul 27 19:43:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28018 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 4BA00C00528 for ; Thu, 27 Jul 2023 19:44:02 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.16746.1690487040865268672 for ; Thu, 27 Jul 2023 12:44:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=vWr4/C2y; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-55c85b4b06bso762978a12.2 for ; Thu, 27 Jul 2023 12:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487040; x=1691091840; 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=CUvQEeTAs1RBVkXiHwWzOIyPNSkF+MHYrTUS2g1Uee0=; b=vWr4/C2yDdmCGA989j+YKO+DGx9m+hqn3BbdQRz0qGh0nOkiv+kTxnCLPoKSVuPjL6 V95tfHtsU3DPzEPSai22KiqyoMTywyAx1S2MbDA6CGEj6zOLCWlHzaXYfKDHchsmrHt8 SKbfhn/BD4/cmjhH/59KcCkbRWLP4wj+UGO0waeh2VON2n1gFcrE8h13SNr3UZJtvi+R vqlIJnZElS+3LqCncOcg0SI9jiwH1RHMDTuFpA+gTvNa1s/42FQDB+q8NAyl3vPGW+Ka tH+fcM9MhY3YoPJuR6sZt319SbJfYi4dhlzRzcobKe205jKnpSC421kbrXtX1Bubt7KA Dqfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487040; x=1691091840; 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=CUvQEeTAs1RBVkXiHwWzOIyPNSkF+MHYrTUS2g1Uee0=; b=hGErogu2ifmS1t9SsufZSRXQJaXhXR4nzUNZCr33fjm7z8JT1RhnyYKqfRUbOgvd8M elGMI79yfDXlQRAqhw/cTIFGTKU/q8Vag80K3l/uUjwqwIy5OMnylGwlGlkQ1MVgAE0H P9AQX8vSho3gcvzxXEs8yX4BfOtd8OJo72mv4TlkJsGZ2ZuTlJRHZl9BhfOldW3gL8pT Xd3vWzftw3+dH77I29wapVgwRwHJOJExBaWg+H+S3dkbvThDStO3nrHgyaXnhrxlMCLM d8SkYuszPGmsLm3a8SJ9nVzIadU9sdrwv6NWPgiQ43JfkaTEe3SVlY9Q/sU79HZgKy/L BfNw== X-Gm-Message-State: ABy/qLbhPIGcZpHHBLB7UjmEd16qj1nc1VudXC2EoxvXIlwiA/d+3rGI jDPa3bdfTGedPHNuCLmZqEIOdsJ/ezsbnIYNPmE= X-Google-Smtp-Source: APBJJlFyrK/6smQP7+0ATJMAkP4CQG3J/FFeJMjtqQBopY+kl8CJNf/i09ZN8WqyN+UPmZYdkfj7WQ== X-Received: by 2002:a17:90b:4f86:b0:268:1355:b03e with SMTP id qe6-20020a17090b4f8600b002681355b03emr260983pjb.38.1690487039939; Thu, 27 Jul 2023 12:43:59 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.43.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:43:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/27] cups: Fix CVE-2023-34241 Date: Thu, 27 Jul 2023 09:43:21 -1000 Message-Id: <0048a87ec9442f1f9480d57ccfeeaa79ec171f04.1690486929.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 ; Thu, 27 Jul 2023 19:44:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184978 From: Mingli Yu Backport patch [1] to fix CVE-2023-34241. [1] https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2 Signed-off-by: Mingli Yu Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 1 + .../cups/cups/CVE-2023-34241.patch | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-34241.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index d77758fd3f..c6a676b747 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://volatiles.99_cups \ file://cups-volatiles.conf \ file://CVE-2023-32324.patch \ + file://CVE-2023-34241.patch \ " GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" diff --git a/meta/recipes-extended/cups/cups/CVE-2023-34241.patch b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch new file mode 100644 index 0000000000..4950ca341d --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2023-34241.patch @@ -0,0 +1,70 @@ +From ffd290b4ab247f82722927ba9b21358daa16dbf1 Mon Sep 17 00:00:00 2001 +From: Rose <83477269+AtariDreams@users.noreply.github.com> +Date: Thu, 1 Jun 2023 11:33:39 -0400 +Subject: [PATCH] Log result of httpGetHostname BEFORE closing the connection + +httpClose frees the memory of con->http. This is problematic because httpGetHostname then tries to access the memory it points to. + +We have to log the hostname first. + +CVE: CVE-2023-34241 + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/9809947a959e18409dcf562a3466ef246cb90cb2] + +Signed-off-by: Mingli Yu +--- + scheduler/client.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/scheduler/client.c b/scheduler/client.c +index 91e441188..327473a4d 100644 +--- a/scheduler/client.c ++++ b/scheduler/client.c +@@ -193,13 +193,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + /* + * Can't have an unresolved IP address with double-lookups enabled... + */ +- +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, +- "Name lookup failed - connection from %s closed!", ++ "Name lookup failed - closing connection from %s!", + httpGetHostname(con->http, NULL, 0)); + ++ httpClose(con->http); + free(con); + return; + } +@@ -235,11 +233,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + * with double-lookups enabled... + */ + +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, +- "IP lookup failed - connection from %s closed!", ++ "IP lookup failed - closing connection from %s!", + httpGetHostname(con->http, NULL, 0)); ++ ++ httpClose(con->http); + free(con); + return; + } +@@ -256,11 +254,11 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ + + if (!hosts_access(&wrap_req)) + { +- httpClose(con->http); +- + cupsdLogClient(con, CUPSD_LOG_WARN, + "Connection from %s refused by /etc/hosts.allow and " + "/etc/hosts.deny rules.", httpGetHostname(con->http, NULL, 0)); ++ ++ httpClose(con->http); + free(con); + return; + } +-- +2.25.1 + From patchwork Thu Jul 27 19:43:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28023 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 29E23EB64DD for ; Thu, 27 Jul 2023 19:44:12 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.16708.1690487042661282363 for ; Thu, 27 Jul 2023 12:44:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=UwmQsJh2; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-56345ab18b0so757076a12.3 for ; Thu, 27 Jul 2023 12:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487042; x=1691091842; 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=OT7RBzCxelSWL4Fo+gOMx+jqhO7ELbbMyJxPsBO/cec=; b=UwmQsJh2RJ98MolInryAyFRRM7XhGGrB5570P/t38vjUtKWhosJkLn4jnJz4cP4LaS /JcEkUFEornoT8H1+d59GkzNIqi6XnHZQr3o+t5BM7JD+QRbmjElyErnIf4KzAsCX7y8 N2AmN1VMVzHcoaHTvOuFm1D3HO4u1YuQyYKXQp2dvI9g4+K4iOsRA2RZPs6R1n43JXbq i4qHSZiPldbQBo1NGUIzVQRTcVPkQHWLy5o/WjjZ3KweMectNmoAKM+EoDGBsTnfdtqq 25vBpi0cXDKaGE3xBVeTZXDWICjlCRt1C7lfLuIYA39fHeXt2f9E1L+t7EllfFxu3R8P EkQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487042; x=1691091842; 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=OT7RBzCxelSWL4Fo+gOMx+jqhO7ELbbMyJxPsBO/cec=; b=QiWHRtx+a4T0fEpkJABJJlm3L+wRzmDl5TvStjY7KfYzfSxXs2ANVvbOe57pWjNQHL r775q0fUadeELJxmK/au1GnmcLXgjqwuxYKcOVyAfpRBUjT+4FI3mrxyp2VxOVicY4KZ BrS50ltyEbIUg8+AaPW9AM63q9dwVl989M79YMZDJyaMT0/kx3vlshxF+NZMt28ku1kK PqpT7pt6zdgRPY18d3VGUJmvMQwTXdAkqLCbmlP2bSQl+YtQ2KDJqbq3wvc7wrjZcei9 XeKTu/WnLtJ2W4m3YoSJkFdD5NGCLOHW8mjQnaHL5/eLfLqYSUGkswihmMo02EOJrvzv 4WOw== X-Gm-Message-State: ABy/qLagqIT/OuWFpAqC/cvO+S07b855OdJ9JN4UgBmjQDQB3GAw8jQ5 fXZtBvTvF4TDwyRcDSb+EubZUah0Oszwb/1SuE4= X-Google-Smtp-Source: APBJJlGVQDGw6ALDmioDN7uhfA6Fm+svzQThOd31RGaeUxOsz4n1nIznv9iD2fmSAsd5Ln9NU+EbGg== X-Received: by 2002:a17:90b:400c:b0:268:1e77:c6f4 with SMTP id ie12-20020a17090b400c00b002681e77c6f4mr244956pjb.40.1690487041675; Thu, 27 Jul 2023 12:44:01 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/27] ruby: Fix CVE-2023-36617 Date: Thu, 27 Jul 2023 09:43:22 -1000 Message-Id: <403a24f02600e2462e8ccfbb42651e15e002bd2e.1690486929.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 ; Thu, 27 Jul 2023 19:44:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184979 From: Mingli Yu Backport two patches [1] [2] to fix CVE-2023-36617 [3]. [1] https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1 [2] https://github.com/ruby/uri/commit/9d7bcef1e6ad23c9c6e4932f297fb737888144c8 [3] https://www.ruby-lang.org/en/news/2023/06/29/redos-in-uri-CVE-2023-36617/ Signed-off-by: Mingli Yu Signed-off-by: Steve Sakoman --- .../ruby/ruby/CVE-2023-36617_1.patch | 56 +++++++++++++++++++ .../ruby/ruby/CVE-2023-36617_2.patch | 52 +++++++++++++++++ meta/recipes-devtools/ruby/ruby_3.2.2.bb | 2 + 3 files changed, 110 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch b/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch new file mode 100644 index 0000000000..17c7e30176 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_1.patch @@ -0,0 +1,56 @@ +From 2ebb50d2dc302917a6f57c1239dc9e700dfe0e34 Mon Sep 17 00:00:00 2001 +From: Nobuyoshi Nakada +Date: Thu, 27 Jul 2023 15:53:01 +0800 +Subject: [PATCH] Fix quadratic backtracking on invalid relative URI + +https://hackerone.com/reports/1958260 + +CVE: CVE-2023-36617 + +Upstream-Status: Backport [https://github.com/ruby/uri/commit/9010ee2536adda10a0555ae1ed6fe2f5808e6bf1] + +Signed-off-by: Mingli Yu +--- + lib/uri/rfc2396_parser.rb | 4 ++-- + test/uri/test_parser.rb | 12 ++++++++++++ + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb +index 76a8f99..00c66cf 100644 +--- a/lib/uri/rfc2396_parser.rb ++++ b/lib/uri/rfc2396_parser.rb +@@ -497,8 +497,8 @@ module URI + ret = {} + + # for URI::split +- ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) +- ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) ++ ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) ++ ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) + + # for URI::extract + ret[:URI_REF] = Regexp.new(pattern[:URI_REF]) +diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb +index 72fb590..721e05e 100644 +--- a/test/uri/test_parser.rb ++++ b/test/uri/test_parser.rb +@@ -79,4 +79,16 @@ class URI::TestParser < Test::Unit::TestCase + assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com")) + assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]")) + end ++ ++ def test_rfc2822_parse_relative_uri ++ pre = ->(length) { ++ " " * length + "\0" ++ } ++ parser = URI::RFC2396_Parser.new ++ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |uri| ++ assert_raise(URI::InvalidURIError) do ++ parser.split(uri) ++ end ++ end ++ end + end +-- +2.25.1 + diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch b/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch new file mode 100644 index 0000000000..7c51deaa42 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/CVE-2023-36617_2.patch @@ -0,0 +1,52 @@ +From eea5868120509c245216c4b5c2d4b5db1c593d0e Mon Sep 17 00:00:00 2001 +From: Nobuyoshi Nakada +Date: Thu, 27 Jul 2023 16:16:30 +0800 +Subject: [PATCH] Fix quadratic backtracking on invalid port number + +https://hackerone.com/reports/1958260 + +CVE: CVE-2023-36617 + +Upstream-Status: Backport [https://github.com/ruby/uri/commit/9d7bcef1e6ad23c9c6e4932f297fb737888144c8] + +Signed-off-by: Mingli Yu +--- + lib/uri/rfc3986_parser.rb | 2 +- + test/uri/test_parser.rb | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb +index dd24a40..9b1663d 100644 +--- a/lib/uri/rfc3986_parser.rb ++++ b/lib/uri/rfc3986_parser.rb +@@ -100,7 +100,7 @@ module URI + QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/, + FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/, + OPAQUE: /\A(?:[^\/].*)?\z/, +- PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/, ++ PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/, + } + end + +diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb +index 721e05e..cee0acb 100644 +--- a/test/uri/test_parser.rb ++++ b/test/uri/test_parser.rb +@@ -91,4 +91,14 @@ class URI::TestParser < Test::Unit::TestCase + end + end + end ++ ++ def test_rfc3986_port_check ++ pre = ->(length) {"\t" * length + "a"} ++ uri = URI.parse("http://my.example.com") ++ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |port| ++ assert_raise(URI::InvalidComponentError) do ++ uri.port = port ++ end ++ end ++ end + end +-- +2.25.1 + diff --git a/meta/recipes-devtools/ruby/ruby_3.2.2.bb b/meta/recipes-devtools/ruby/ruby_3.2.2.bb index 481fe7c23d..d1359e388c 100644 --- a/meta/recipes-devtools/ruby/ruby_3.2.2.bb +++ b/meta/recipes-devtools/ruby/ruby_3.2.2.bb @@ -31,6 +31,8 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://0006-Make-gemspecs-reproducible.patch \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \ + file://CVE-2023-36617_1.patch \ + file://CVE-2023-36617_2.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" From patchwork Thu Jul 27 19:43:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28024 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 37365C00528 for ; Thu, 27 Jul 2023 19:44:12 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.16710.1690487044534421727 for ; Thu, 27 Jul 2023 12:44:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Ioao09JZ; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-267fc19280bso1709654a91.1 for ; Thu, 27 Jul 2023 12:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487043; x=1691091843; 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=uNldv/DSkd5vcTm89Shc511qMPk7j9xsySzoUqVpXik=; b=Ioao09JZgbIHqFpsZ+o1KqQgVJg50V2hsN3VgL/0q3k3NxNp0luJSYpTSvyK7YwAkc xGIQRw8P3nKBk8KpB0GKI/0e+hze3XXkHI8KrThnSTM9Ma6mqeaZP7N28kpC3Sh19ilZ WrR+BOe7x1X1thditT9u72a0KGxGMnN5pdb8j+bC011uiTkP9AViJA/hAAAcmoerflvx 2+N6AOylahYswR+bgoYqmR2vaDcm3Jup/PuMeRYzVR1wGsdnUjhrLq5ShPvzQ4JqBSRH ZDQCDVh+Z74MLoFfz/kLvMJ7DynMGyCCJBnP1GEejwK7t9Ql0lspXmWCc/KJXB2gjJrN Mv5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487043; x=1691091843; 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=uNldv/DSkd5vcTm89Shc511qMPk7j9xsySzoUqVpXik=; b=ZQ+C7sVREguJBN9v+cxXgEe4SPrK4eMCGlyoSiqlTH5MGLkGkKoMlMPMHtjoAWjDBK 3Mq5J0r740nsLRzItUmS4PzEW8F5aY/CnOUHYtAiTp1iBPBcbp+CwM4n8VBK3602tGJ3 s2/eo2PwEzhPEo+YKr6o7zhKjhqbJJ0cC337/Qx/mffm2eC6RUbea3N8cs18O0TnN55V eTKcxDw81tKVWtgbn55WCnCWXfhzFevRHWYAx+fHGM4KgUYal9kkeOF6npTFC+5rIXxk xTlmSmDaSUXn1u3KroGbxxj5w89HDvCpHnG/BBki1fcIio4lgar3zfvE71Y/tQtw1owM wivA== X-Gm-Message-State: ABy/qLa6KOhICcDmNWqz2qoJ1TIQgb63PsfAX7XVO/kT/fiycN/N3pvf T/ugU4FyLYis418sha21X5OCVHCSCh2w8GgFfhI= X-Google-Smtp-Source: APBJJlGLulQ/ZhCbgRqqxHDEK67ur/+/eRWyWJ5+ZRmxVlSUuKnm2ouEGiA+CCE+3jbKtkUFMW0U1g== X-Received: by 2002:a17:90a:8c86:b0:263:f521:da3e with SMTP id b6-20020a17090a8c8600b00263f521da3emr386153pjo.2.1690487043422; Thu, 27 Jul 2023 12:44:03 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/27] linux-yocto/6.1: update to v6.1.36 Date: Thu, 27 Jul 2023 09:43:23 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184980 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: a1c449d00ff8 Linux 6.1.36 29429a1f5871 smb: move client and server files to common directory fs/smb 9d3e4bca4b92 i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle 81d4078f7a42 x86/apic: Fix kernel panic when booting with intremap=off and x2apic_phys 679354bea008 KVM: arm64: Restore GICv2-on-GICv3 functionality 6ab9468d3eea vhost_net: revert upend_idx only on retriable error 454e4f391a14 vhost_vdpa: tell vqs about the negotiated 1af1cd7be370 drm/radeon: fix race condition UAF in radeon_gem_set_domain_ioctl 022f2306d94f drm/exynos: fix race condition UAF in exynos_g2d_exec_ioctl aa88042218aa drm/exynos: vidi: fix a wrong error return 711f727f7bab null_blk: Fix: memory release when memory_backed=1 f6076a1386c9 ARM: dts: Fix erroneous ADS touchscreen polarities 1d1baefacdb4 i2c: mchp-pci1xxxx: Avoid cast to incompatible function type 8e3257599409 ALSA: hda/realtek: Add "Intel Reference board" and "NUC 13" SSID in the ALC256 cfa01235b5ed ASoC: fsl_sai: Enable BCI bit if SAI works on synchronous mode with BYP asserted 570583c6251a s390/purgatory: disable branch profiling c2888c460db2 gfs2: Don't get stuck writing page onto itself under direct I/O 878dad66b9b5 ASoC: amd: yc: Add Thinkpad Neo14 to quirks list for acp6x 1c97025d441f ASoC: nau8824: Add quirk to active-high jack-detect 5cc506e9b3e5 soundwire: qcom: add proper error paths in qcom_swrm_startup() 2839e0b64e65 soundwire: dmi-quirks: add new mapping for HP Spectre x360 ee4d36a14d3f ASoC: simple-card: Add missing of_node_put() in case of error e701fb0a5d5b ASoC: codecs: wcd938x-sdw: do not set can_multi_write flag 06b9522ca831 spi: lpspi: disable lpspi module irq in DMA mode 39a77f005f8a s390/cio: unregister device when the only path is gone 552a24eb7168 arm64: dts: qcom: sc7280-qcard: drop incorrect dai-cells from WCD938x SDW 4de58b7c14c0 arm64: dts: qcom: sc7280-idp: drop incorrect dai-cells from WCD938x SDW 2e8ebf1a44cb Input: soc_button_array - add invalid acpi_index DMI quirk handling ba0cc7a2e508 nvme: improve handling of long keep alives 06d9ec407f76 nvme: check IO start time when deciding to defer KA 8a72260619ca nvme: double KA polling frequency to avoid KATO with TBKAS on c8f988c37a6b usb: gadget: udc: fix NULL dereference in remove() 3f6391062d0b btrfs: fix an uninitialized variable warning in btrfs_log_inode a2c3e9bfc02c nfcsim.c: Fix error checking for debugfs_create_dir a05df0643120 media: cec: core: don't set last_initiator if tx in progress f37956a140d1 media: cec: core: disable adapter in cec_devnode_unregister 9d8ac2726cff smb3: missing null check in SMB2_change_notify 3e8458c5b205 arm64: Add missing Set/Way CMO encodings 8428f4c00d8c HID: wacom: Add error check to wacom_parse_and_register() aaa50510adb7 scsi: target: iscsi: Prevent login threads from racing between each other 0357259cb103 gpiolib: Fix irq_domain resource tracking for gpiochip_irqchip_add_domain() 8592ada80ea5 gpio: sifive: add missing check for platform_get_irq cb1108e17493 gpiolib: Fix GPIO chip IRQ initialization restriction 90714f7ed760 arm64: dts: rockchip: fix nEXTRST on SOQuartz e51abd4808f9 arm64: dts: rockchip: Enable GPU on SOQuartz CM4 ec3d0f12e728 revert "net: align SO_RCVMARK required privileges with SO_MARK" b2e2f9c0939f sch_netem: acquire qdisc lock in netem_change() 0434277b72a4 platform/x86/amd/pmf: Register notify handler only if SPS is enabled 2d580c73afdc selftests: forwarding: Fix race condition in mirror installation eff07bf11841 io_uring/net: use the correct msghdr union member in io_sendmsg_copy_hdr 1b7b048c228e bpf: Force kprobe multi expected_attach_type for kprobe_multi link fc3afb337814 bpf/btf: Accept function names that contain dots 22cc989f2b10 Revert "net: phy: dp83867: perform soft reset and retain established link" 3e04743dbacf netfilter: nfnetlink_osf: fix module autoload abd3afddbf9e netfilter: nf_tables: disallow updates of anonymous sets c34b22038543 netfilter: nf_tables: reject unbound chain set before commit phase 46f801ab5fb9 netfilter: nf_tables: reject unbound anonymous set before commit phase b60c0ce0ff31 netfilter: nf_tables: disallow element updates of bound anonymous sets 0d836f917520 netfilter: nft_set_pipapo: .walk does not deal with generations d60be2da67d1 netfilter: nf_tables: drop map element references from preparation phase df27be7c1530 netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain 891cd2edddc7 netfilter: nf_tables: fix chain binding transaction logic f5b6dbec26f1 be2net: Extend xmit workaround to BE3 chip 50f689918db4 net: dsa: mt7530: fix handling of LLDP frames a50f84af215e net: dsa: mt7530: fix handling of BPDUs on MT7530 switch a4e4c7190126 net: dsa: mt7530: fix trapping frames on non-MT7621 SoC MT7530 switch 7fd2e9a69e83 ipvs: align inner_mac_header for encapsulation 6d1eec1f2dd7 mmc: usdhi60rol0: fix deferred probing 7e10fff13353 mmc: sh_mmcif: fix deferred probing 565b8bd2905d mmc: sdhci-acpi: fix deferred probing 645f89ee3e3e mmc: owl: fix deferred probing 251101c32a01 mmc: omap_hsmmc: fix deferred probing 0057a905de5c mmc: omap: fix deferred probing f73b380518b2 mmc: mvsdio: fix deferred probing 4806f6b6b7a3 mmc: mtk-sd: fix deferred probing d28b7a87332f net: qca_spi: Avoid high load if QCA7000 is not available 1d4dd09f13a9 sfc: use budget for TX completions 0bbb8164ed07 net/mlx5: DR, Fix wrong action data allocation in decap action b062caf4f73b xfrm: Linearize the skb after offloading if needed. fff9a18e0128 selftests: net: fcnal-test: check if FIPS mode is enabled 0793ead2ff2c selftests: net: vrf-xfrm-tests: change authentication and encryption algos 6919634176cd selftests: net: tls: check if FIPS mode is enabled ac5671d10060 bpf: Fix a bpf_jit_dump issue for x86_64 with sysctl bpf_jit_enable. 8bb51cdc4fc2 xfrm: fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets d9a0b1a53c79 bpf: Fix verifier id tracking of scalars on spill 461fc3391c52 bpf: track immediate values written to stack by BPF_ST instruction b36ba84f09a1 KVM: arm64: PMU: Restore the host's PMUSERENR_EL0 c803e91600be xfrm: Ensure policies always checked on XFRM-I input path 94e81817f080 xfrm: interface: rename xfrm_interface.c to xfrm_interface_core.c 8ea03341f78a xfrm: Treat already-verified secpath entries as optional 43489b2cba5a ieee802154: hwsim: Fix possible memory leaks caddcdf2a999 mmc: meson-gx: fix deferred probing 1a2793a25a60 memfd: check for non-NULL file_seals in memfd_create() syscall 364fdcbb035b x86/mm: Avoid using set_pgd() outside of real PGD pages cbfee3d9d5c0 nilfs2: prevent general protection fault in nilfs_clear_dirty_page() 24f473769e7e io_uring/poll: serialize poll linked timer start with poll removal 2d80c85fa404 arm64: dts: rockchip: Fix rk356x PCIe register and range mappings 277a7c23b590 regmap: spi-avmm: Fix regmap_bus max_raw_write b385b1d28e4e regulator: pca9450: Fix LDO3OUT and LDO4OUT MASK ad5daeaa3d57 spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan() 21945b7a868f wifi: iwlwifi: pcie: Handle SO-F device for PCI id 0x7AF0 1dfca388fc7c bpf: ensure main program has an extable 03b2149d5aca mmc: sunxi: fix deferred probing 8b8756324c5b mmc: bcm2835: fix deferred probing 1db5a39a904e mmc: sdhci-spear: fix deferred probing f1b17198e45b mmc: mmci: stm32: fix max busy timeout calculation 6c2af0fd8301 mmc: meson-gx: remove redundant mmc_request_done() call from irq context 687d34c57807 mmc: sdhci-msm: Disable broken 64-bit DMA on MSM8916 3dd0041c41da mmc: litex_mmc: set PROBE_PREFER_ASYNCHRONOUS 0d7a4e6589a0 cgroup,freezer: hold cpu_hotplug_lock before freezer_mutex in freezer_css_{online,offline}() 7b162a18d332 cgroup: Do not corrupt task iteration when rebinding subsystem c2c46a70282f mptcp: consolidate fallback and non fallback state machine 1d3127542665 mptcp: fix possible list corruption on passive MPJ b747e755986a mptcp: fix possible divide by zero in recvmsg() b7bb71dfb541 mptcp: handle correctly disconnect() failures 1d9dc9bed999 io_uring/net: disable partial retries for recvmsg with cmsg 4d729cc67b05 io_uring/net: clear msg_controllen on partial sendmsg retry 4db49d59a89c PCI: hv: Add a per-bus mutex state_lock 091d03d19859 PCI: hv: Fix a race condition in hv_irq_unmask() that can cause panic 5c09925b1879 PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev da2fff20d92d Revert "PCI: hv: Fix a timing issue which causes kdump to fail occasionally" a74a9d9b756a PCI: hv: Fix a race condition bug in hv_pci_query_relations() ba803d7ac18a Drivers: hv: vmbus: Fix vmbus_wait_for_unload() to scan present CPUs 191cb913293a Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails 4f7e702b74f7 KVM: Avoid illegal stage2 mapping on invalid memory slot 390aeb5ae7c0 ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep() 8e63b1fd24a8 nilfs2: fix buffer corruption due to concurrent device reads d5d7cde2ad19 scripts: fix the gfp flags header path in gfp-translate 4a89bfb1a142 writeback: fix dereferencing NULL mapping->host on writeback_page_template 1fed1f851346 selftests: mptcp: join: fix "userspace pm add & remove address" 53e096bcaeac selftests: mptcp: join: skip fail tests if not supported f17459121c37 selftests: mptcp: join: skip userspace PM tests if not supported f40a7ded34c9 selftests: mptcp: join: skip test if iptables/tc cmds fail bce23d125434 selftests: mptcp: sockopt: skip TCP_INQ checks if not supported 157dcb20000b selftests: mptcp: diag: skip listen tests if not supported 755c8857abde selftests/mount_setattr: fix redefine struct mount_attr build error 94851666aff4 selftests: mptcp: join: skip MPC backups tests if not supported fe1f28db73f7 selftests: mptcp: join: skip fullmesh flag tests if not supported 6313c493e3c9 selftests: mptcp: join: skip backup if set flag on ID not supported efb4f6c2dd4c selftests: mptcp: join: skip implicit tests if not supported dd6c284a3430 selftests: mptcp: join: support RM_ADDR for used endpoints or not 695cce2f2cf5 selftests: mptcp: join: skip Fastclose tests if not supported 0381f30735e2 selftests: mptcp: join: support local endpoint being tracked or not 1c0d9b4b4745 selftests: mptcp: join: skip check if MIB counter not supported e35edb09e53e selftests: mptcp: join: helpers to skip tests 4d65ec947d24 selftests: mptcp: join: use 'iptables-legacy' if available 44d3366bf4b9 selftests: mptcp: lib: skip if not below kernel version c5bdd8eb8e7d selftests: mptcp: userspace pm: skip if not supported 733bf9d80d95 selftests: mptcp: userspace pm: skip if 'ip' tool is unavailable bfe225dec643 selftests: mptcp: sockopt: skip getsockopt checks if not supported 103b4e62de32 selftests: mptcp: sockopt: relax expected returned size 61c1bf0666a9 selftests: mptcp: pm nl: skip fullmesh flag checks if not supported 41f7f7f6e43e selftests: mptcp: pm nl: remove hardcoded default limits e79e5e7642ad selftests: mptcp: connect: skip disconnect tests if not supported cba0db9c1586 selftests: mptcp: connect: skip transp tests if not supported 9ead68270b29 selftests: mptcp: lib: skip if missing symbol 4bed22c6876b selftests: mptcp: join: fix ShellCheck warnings a032ccca15e1 selftests: mptcp: remove duplicated entries in usage 0c6552f83725 tick/common: Align tick period during sched_timer setup 854156d12caa ksmbd: validate session id and tree id in the compound request c86211159bc3 ksmbd: fix out-of-bound read in smb2_write 9650cf70ec9d ksmbd: validate command payload size 0fd4ac3773c3 tpm_crb: Add support for CRB devices based on Pluton a46fa5696613 tpm, tpm_tis: Claim locality in interrupt handler 2e7ad879e1b0 mm: Fix copy_from_user_nofault(). 4ed740c6482f ata: libata-scsi: Avoid deadlock on rescan after device resume c4465bff4d2f tty: serial: fsl_lpuart: reduce RX watermark to 0 on LS1028A 17732fed852a tty: serial: fsl_lpuart: make rx_watermark configurable for different platforms 9bcac453890b drm/amd/display: fix the system hang while disable PSR e538342002cb drm/amd/display: Add wrapper to call planes and stream update 8d855bc67630 drm/amd/display: Use dc_update_planes_and_stream Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 326b34c6cef90a88cf5bb9538a0d93595e7c4c9c) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 54ead24ded..19758206bc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "6f370bf9127713eccdfb3cf009c46ef4852aec28" -SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" +SRCREV_machine ?= "5227a8173cee7256e370750216dbff5eca741134" +SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.35" +LINUX_VERSION ?= "6.1.36" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index fd2e2511d5..48cc6b87fb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.35" +LINUX_VERSION ?= "6.1.36" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" +SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 127c4396b5..47d2e72c3b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "915f4d2237d1c8e23eb67eda0b8e9b24373a80b4" -SRCREV_machine:qemuarm64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemuloongarch64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemumips ?= "1aad3fa2eba5594fb4e779fc53fef6046d833c91" -SRCREV_machine:qemuppc ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemuriscv64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemuriscv32 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemux86 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemux86-64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_machine:qemumips64 ?= "53e7685d6da27e112397e71c27a0bce0fc9313a9" -SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df" -SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e" +SRCREV_machine:qemuarm ?= "5dd09d311b31db8c7b098e14a7857ef8a6e5353d" +SRCREV_machine:qemuarm64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemuloongarch64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemumips ?= "1d79865ce12928b85ab2ab1756e7aa7ae5cc4938" +SRCREV_machine:qemuppc ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemuriscv64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemuriscv32 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemux86 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemux86-64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_machine:qemumips64 ?= "7241bd2e494f07582f736ef1604e81ccd4afc7cf" +SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" +SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "e84a4e368abe42cf359fe237f0238820859d5044" +SRCREV_machine:class-devupstream ?= "a1c449d00ff8ce2c5fcea5f755df682d1f6bc2ef" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.35" +LINUX_VERSION ?= "6.1.36" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Thu Jul 27 19:43:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28022 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 3738FC04E69 for ; Thu, 27 Jul 2023 19:44:12 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.16751.1690487046205384026 for ; Thu, 27 Jul 2023 12:44:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=vNCNbpha; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2682b4ca7b7so817243a91.3 for ; Thu, 27 Jul 2023 12:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487045; x=1691091845; 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=ear8dMfSGonVw+06wqiumHv7IxCbIwWgECHphSVftJ8=; b=vNCNbphayoCKFV4iQfZXtuSz7btBi7JUeu6XSoyfDusuSEjREdG6W09eQl5Tm/FIXI V6+t0pqVNg9/cNippr4RyuZWg6OrFpMLOTKGUZ6mfaFcrcNWEFMjvda1+OAAQXHVVUPH 0LKrswlwFE7SvKo1meWjikfSN4OFGJ3w8uaGYoDrcB6eTWC0r/PWRRolSZRVfq74DXuY li1VTjnErrWfxl3rTVmvZR7FoJmiOFSGT6rZhVc0E/E9vm79IY8XZgOdOrjE6AcYZ/8/ IvqxEB6uKA/UELugkw8FR5J4dfm/RSvklIKrUyiy4qkTXUYivglkEcOkphCi8c5mZD9M jJLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487045; x=1691091845; 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=ear8dMfSGonVw+06wqiumHv7IxCbIwWgECHphSVftJ8=; b=g+lh50Wt0esdr+wze7nY2ryIc1McaVtFWmBeFp91iIzoNUpXOAuhoip6fwfpA1LxT4 qOuVRYB/Iql0GzxqE00GQJ+l2rUfJxey9Anu5bT8p9YYgZzWFqsDBYlq7UQa+pj/FLi2 urmSIOmkFF9TKy2rfBuSCb57ZtV1ZCZngFIL1g1s82hBPr928fG3+P015MXs22NbcLeE DlPUs79E1x+0WC6hsVwQomU1VmIfQ2AyrP+PlaS68lpXscvOgCgu+0qQtTrK9xUqLjhE iFAJNQCGJfORR5CFYi2W2m/z8JFwYmiou8Ns9eT5w2rnYF8BIE7tUkfsALxfOeft24iw NVug== X-Gm-Message-State: ABy/qLZz1TIJpg1uhIcn7CdkP/JcldqG8QLq5Ddv+AksRXMDJwPfkM0E GV2RHfbj3BCb7tykf66CJ76Rmze7WkGdqPU5YwQ= X-Google-Smtp-Source: APBJJlEjdUHOaIMvBU5Wo7mMC+8KjOSCKOsIp/sXoP6OApSpjln4nvuD5HgdlrJhqbzKR0G9Djf0Kg== X-Received: by 2002:a17:90a:6e48:b0:263:6a7e:c239 with SMTP id s8-20020a17090a6e4800b002636a7ec239mr231648pjm.37.1690487045232; Thu, 27 Jul 2023 12:44:05 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/27] linux-yocto/6.1: update to v6.1.37 Date: Thu, 27 Jul 2023 09:43:24 -1000 Message-Id: <4abc100a81401373edaa3c5859e4bf94e8dc3d0d.1690486929.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 ; Thu, 27 Jul 2023 19:44:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184981 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 0f4ac6b4c5f0 Linux 6.1.37 323846590c55 xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion c2d89256de75 csky: fix up lock_mm_and_find_vma() conversion 4a1db15878aa parisc: fix expand_stack() conversion 0a1da2dde461 sparc32: fix lock_mm_and_find_vma() conversion 00f04a3385f7 Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe" a536383ef030 HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651. d89750b19681 HID: wacom: Use ktime_t rather than int when dealing with timestamps 879e79c3aead HID: hidraw: fix data race on device refcount cae854249578 fbdev: fix potential OOB read in fast_imageblit() e6bbad75712a mm: always expand the stack with the mmap write lock held c4b31d1b694e execve: expand new process stack manually ahead of time 6a6b5616c3d0 mm: make find_extend_vma() fail if write lock not held 48c232819e77 powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma() 21ee33d51bf9 mm/fault: convert remaining simple cases to lock_mm_and_find_vma() 1f4197f050de arm/mm: Convert to using lock_mm_and_find_vma() ac764deea709 riscv/mm: Convert to using lock_mm_and_find_vma() 7227d70acc78 mips/mm: Convert to using lock_mm_and_find_vma() 82972ea17b47 powerpc/mm: Convert to using lock_mm_and_find_vma() b92cd80e5f0b arm64/mm: Convert to using lock_mm_and_find_vma() 755aa1bc6aaf mm: make the page fault mmap locking killable d6a5c7a1a6e5 mm: introduce new 'lock_mm_and_find_vma()' page fault helper 4e2ad53ababe maple_tree: fix potential out-of-bounds access in mas_wr_end_piv() 31cde3bdadca can: isotp: isotp_sendmsg(): fix return error fix on TX path 0af4750eaaed x86/smp: Cure kexec() vs. mwait_play_dead() breakage 6d3b2e0aef6c x86/smp: Use dedicated cache-line for mwait_play_dead() 50a1abc67702 x86/smp: Remove pointless wmb()s from native_stop_other_cpus() e47037d28b73 x86/smp: Dont access non-existing CPUID leaf edadebb349e8 x86/smp: Make stop_other_cpus() more robust 94a69d699941 x86/microcode/AMD: Load late on both threads too 84f077802e56 mm, hwpoison: when copy-on-write hits poison, take page offline 4af5960d7cd4 mm, hwpoison: try to recover from copy-on write faults 69925a346acb mptcp: ensure listener is unhashed before updating the sk status 42a018a796d1 mm/mmap: Fix error return in do_vmi_align_munmap() a149174ff8bb mm/mmap: Fix error path in do_vmi_align_munmap() Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 4d43c9ebcb0308d9178f6f44c02cac13de126c92) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 19758206bc..b01f09b1a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5227a8173cee7256e370750216dbff5eca741134" -SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" +SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71" +SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.36" +LINUX_VERSION ?= "6.1.37" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 48cc6b87fb..529f515db1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.36" +LINUX_VERSION ?= "6.1.37" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" +SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 47d2e72c3b..3245c3eab2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "5dd09d311b31db8c7b098e14a7857ef8a6e5353d" -SRCREV_machine:qemuarm64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemuloongarch64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemumips ?= "1d79865ce12928b85ab2ab1756e7aa7ae5cc4938" -SRCREV_machine:qemuppc ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemuriscv64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemuriscv32 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemux86 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemux86-64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_machine:qemumips64 ?= "7241bd2e494f07582f736ef1604e81ccd4afc7cf" -SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd" -SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b" +SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617" +SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd" +SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f" +SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" +SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "a1c449d00ff8ce2c5fcea5f755df682d1f6bc2ef" +SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.36" +LINUX_VERSION ?= "6.1.37" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Thu Jul 27 19:43:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28021 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 2ADC3C41513 for ; Thu, 27 Jul 2023 19:44:12 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.16753.1690487048928878161 for ; Thu, 27 Jul 2023 12:44:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=c0mpsf6n; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2681223aaacso860912a91.0 for ; Thu, 27 Jul 2023 12:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487048; x=1691091848; 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=HccaPT3abiJAZsz4ek6KErxdB5DRrZfzDFt/Bun85bM=; b=c0mpsf6np8QhO5ho2JLUeWurcOQMY94QO4iSdZOJV/yVMq4S5t1gknEgxT/FuMXUB3 53Msu0jAsC8laYZqU9qV4N7KJje+TnFyI9iwSjBLXsJ2ZjvQP6plIoMLt9ptyFpgys/7 AYj61faL2hPNEErNMAF7V+FGowHlFK6vEpnuP+vq4sBeXppbLHeayvrCjDUFazwad78p zmM8zmNhPE2+Zut+PJ8oPNDga76jtzEYlSMxDym++Dz9EUW6DDJDF2pE94fryqo/h3jv udoPYKgIJZ3sZB9rccqu5mBlaNaNeYgA244YOu+72TF4qupCBxnrKmeGmmD0pPPa9woA bE5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487048; x=1691091848; 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=HccaPT3abiJAZsz4ek6KErxdB5DRrZfzDFt/Bun85bM=; b=g6w/opMJ7p5H3Op9lBDcOLH3eRKM8rrmuOjgS8AuS/Xo4jju3CcGNDzIZd9u8N1k8p w5dBLPphFQ/IF/p10iWduGcIaIRGSPhXKt7jqOiFDIY+QnkKVEQQ05rl7pyLgXv5YYjp 2rHUFaYdnl7yXqnU2fK7ACFlsVCGhnllpiXq2IFSh0qkBmyvxAaNVh68LZ7gXAdJaBVP DIDtAvuNlYCyFM4Bg5i0vZQr7tV0idrZ4Fio9fiF2uL5RV0wBdyNX6LHvdh/QJnDYC4w oQNsJJjVb72ucoFack4L/PTiFLEPrJjdzeHv+McVNbxAlmfOg+RIwp+/+iwMMNE0H9s7 mQ9Q== X-Gm-Message-State: ABy/qLZIQwcbxMEhvshBXI643rhiPAgWXKzhE49Q/+YlKwsr1F1uxNoq oDb1+PdWI8TErsm4hzJZSSvBILGD9eMOTd2k598= X-Google-Smtp-Source: APBJJlEi0RSgR0A2ZecZmrW0GQteu9iHAYqNojPGxHzpsPWu5IUproRqotXsNN7ScG0KqQ+QRr86OA== X-Received: by 2002:a17:90a:bd8a:b0:25c:18ad:6b82 with SMTP id z10-20020a17090abd8a00b0025c18ad6b82mr306772pjr.21.1690487047957; Thu, 27 Jul 2023 12:44:07 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/27] linux-yocto/6.1: update to v6.1.38 Date: Thu, 27 Jul 2023 09:43:25 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184982 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 61fd484b2cf6 Linux 6.1.38 c50065a39279 drm/amd/display: Ensure vmin and vmax adjust for DCE 9d0b2afadfd7 drm/amdgpu: Validate VM ioctl flags. fe56f507a11a docs: Set minimal gtags / GNU GLOBAL version to 6.6.5 c437b26bc3ae scripts/tags.sh: Resolve gtags empty index generation 50e36c2897ba perf symbols: Symbol lookup with kcore can fail if multiple segments match stext 67e3b5230cef nubus: Partially revert proc_create_single_data() conversion 296927dbae7d execve: always mark stack as growing down during early stack setup d856e6f8a0b4 PCI/ACPI: Call _REG when transitioning D-states 788c76c33df9 PCI/ACPI: Validate acpi_pci_set_power_state() parameter a905b0b318ad drm/amd/display: Do not update DRR while BW optimizations pending dd6d6f9d47ae drm/amd/display: Remove optimization for VRR updates 6b2849b3e05d xtensa: fix lock_mm_and_find_vma in case VMA not found Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b4a4354fff41ffe61a1638b216e3a17e50b5c0e2) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index b01f09b1a7..30fcbd8e86 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71" -SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" +SRCREV_machine ?= "efb2c857761e865cd7947aab42eaa5ba77ef6ee7" +SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.37" +LINUX_VERSION ?= "6.1.38" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 529f515db1..be27537dbc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.37" +LINUX_VERSION ?= "6.1.38" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" +SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 3245c3eab2..5f61c43fed 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617" -SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd" -SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f" -SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" -SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" +SRCREV_machine:qemuarm ?= "a74344429a095a5941cd8dfac532160349344c92" +SRCREV_machine:qemuarm64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemuloongarch64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemumips ?= "78c81e178f8e2ffbb7c03cd324cf50ee0c5c4cf2" +SRCREV_machine:qemuppc ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemuriscv64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemuriscv32 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemux86 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemux86-64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_machine:qemumips64 ?= "6c6b1170464e1f64f78a45cf7e78d5c678f38f48" +SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" +SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c" +SRCREV_machine:class-devupstream ?= "61fd484b2cf6bc8022e8e5ea6f693a9991740ac2" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.37" +LINUX_VERSION ?= "6.1.38" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Thu Jul 27 19:43:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28020 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 2BEA2C001DC for ; Thu, 27 Jul 2023 19:44:12 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.16754.1690487050846485119 for ; Thu, 27 Jul 2023 12:44:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=f2K+waQA; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-26830595676so955270a91.2 for ; Thu, 27 Jul 2023 12:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487050; x=1691091850; 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=n1Qc1R5F8jgbQ2v+lMcoz3qL36EtA7rvCvFqPTtLQmo=; b=f2K+waQAlOXN4XH/eiw9NxLoGQJ2du3wz28Q4KaftnG5ARuyTBHaE8I6N99tg3TC+X opGw7LlTmFdu2CHu1PEKd2pawM1OohlYPCHs9t3UqNKhQzkk6ExmBM9PY5dJp7T7/btA T58TNl2TSfM+QcEo4q+KOokUbf8kbG93jz7hc7SMEA/YWhmmbLNuSgUWeEbYNVguua7/ Bqzwb4vgXIb6qD8ZEJf21pMffS5mM6QwtlY0ATc8iMpX8TXcXuU0v4Uj98KpscQ1W+nG ft+jT1J0B8AmMEPMFvVipW0fjuPwiBiK0vsDj4S3KG9tXYu2xxfE8X430FXlEinpVx6/ 3Gaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487050; x=1691091850; 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=n1Qc1R5F8jgbQ2v+lMcoz3qL36EtA7rvCvFqPTtLQmo=; b=QyoudbRctR3MOmzZ/cYGlbAdOTmeT5u2ueyEUY31QNT7iVB5DUGfPKcXXV1YlYsNpB J3lPXIIe04vq3qDARDPNa5HsJCAp+VBLIexHAedlJKDy3C0KsBpxC5RDmvgduWnNbpia UPJx/xEi+mBhe3zb3YYa+uNXbk3CkDb+1Aj1pW9nVMC+4ftF2EsdGP+DoVkIi4aGpM44 xi4Ss1cZsf16YvSqyF5nsm6mIJmStQE00G/rlFjBRxauMMsz2FsmyzLEV7JJviUHdnyt YipTljUkePtXEtUJVLMiwYZ3yafe61PpkcD3jF4Oq1K4Ro+QG1EtUoM6QMdtXpuJKFn6 MO1g== X-Gm-Message-State: ABy/qLbdHLd7xi2oWFmPDxH88Y9ugRfaBnpNioJNx4qy/7c+KVkmXYtW BMQ1I/BapXLIDE9wimdJbQ4ri/00g0Rqg/BDdFw= X-Google-Smtp-Source: APBJJlHpfXXBosww0Ij+20h1yXVSY5kiFHWpvITh+UH/tB44ep5EMA1cdxbw5+NpzmbtKecNAbk44g== X-Received: by 2002:a17:90a:c90a:b0:263:72fe:3ef7 with SMTP id v10-20020a17090ac90a00b0026372fe3ef7mr261698pjt.42.1690487049981; Thu, 27 Jul 2023 12:44:09 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/27] taglib: upgrade 1.13 -> 1.13.1 Date: Thu, 27 Jul 2023 09:43:26 -1000 Message-Id: <5eb1b017cfc136d23631b2008b417b82993ce4d8.1690486929.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 ; Thu, 27 Jul 2023 19:44:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184983 From: Wang Mingyu Changelog: =========== * Fixed parsing of TXXX frames without description. * Detect MP4 atoms with invalid length or type. * Do not miss ID3v2 frames when an extended header is present. * Use property "DISCSUBTITLE" for ID3v2 "TSST" frame. * Build system improvements: Use absolute path for macOS dylib install name, support --define-prefix when using pkg-config, fixed minimum required CppUnit version. * Code clean up using clang-tidy. Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 69477347a21cc810851fd231659f73c6b4661d03) Signed-off-by: Steve Sakoman --- .../recipes-support/taglib/{taglib_1.13.bb => taglib_1.13.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/taglib/{taglib_1.13.bb => taglib_1.13.1.bb} (95%) diff --git a/meta/recipes-support/taglib/taglib_1.13.bb b/meta/recipes-support/taglib/taglib_1.13.1.bb similarity index 95% rename from meta/recipes-support/taglib/taglib_1.13.bb rename to meta/recipes-support/taglib/taglib_1.13.1.bb index 6560bc3660..3f0a759f95 100644 --- a/meta/recipes-support/taglib/taglib_1.13.bb +++ b/meta/recipes-support/taglib/taglib_1.13.1.bb @@ -11,7 +11,7 @@ DEPENDS = "zlib" SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" -SRC_URI[sha256sum] = "58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0" +SRC_URI[sha256sum] = "c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b" UPSTREAM_CHECK_URI = "https://taglib.org/" From patchwork Thu Jul 27 19:43:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28025 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 259D2C41513 for ; Thu, 27 Jul 2023 19:44:22 +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.web10.16716.1690487052799408894 for ; Thu, 27 Jul 2023 12:44:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=tTSz8jmG; 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-1bbd03cb7c1so8787255ad.3 for ; Thu, 27 Jul 2023 12:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487052; x=1691091852; 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=Cl8fTeXoOvOfo6aF6zHgWT2JTnu7GV5OESC9lT6kToo=; b=tTSz8jmGS80SjQdLqTRyE2v7oUYCzvxMRmAPKYPlBUYA4/opFFKSoeh/pPVXcBk4eh bFPrQn6LAoF3hWG1je8Azi4gQpI3+sMJ2zsedp4iDDdBjqqvZ0MbmmE58krdn7xcGOmP aWa/wkIkpov/YB5urTy4jqwwpZQcubHGSkFjxZiwwd32y5tjpCbSGF5xnMwRKsQ/rLt4 0RsDhUR3G9X4zfar1fuQQyqs9DiNosRJ8pzmthMkESyZfejs+gOAfZP7QBGG+ydrJHZu Idpg5Dv0b/OxHqvfnWtma2UftE5j8O/GnCuUkL7nd/SPh0vJS9xUnEfRPwKgl70Az62h 86hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487052; x=1691091852; 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=Cl8fTeXoOvOfo6aF6zHgWT2JTnu7GV5OESC9lT6kToo=; b=UC0cZl0fmGiRQEEwN81kp+nYKTFHw4nU/S76jF+luBGQi8aw8K87Jxo8NkrvDSwwSC 0FOuBgANhrzYdH4jMz6Lh1aluhilUDIui+niG+eLRI8P+c6LBbFzjXWjhFWBCOZrr/N9 YUmYinMeLfis/RIWOKXFfOhuX4zlCqCLN7jjYpHWFIdwTpbIgPxR+ObxtBO27BbreCH1 OwSu3TNZUvA25PR6uDjQZLtsyWu0sXSRY3bhAoWIvZa+4R+acIY+8OrQEVV3qedcmbHn GTjkECd8xL7BKy/1P0NU19qRwhVoFl9s/Jn92fsx9rqLgr+YF7OZWrkLAU86QgpAwemt BPRg== X-Gm-Message-State: ABy/qLbgUmlkkoYqMlBCIioQ9vNpq06t57Ac+iopliNwrrMR9hG+t5Qp QVb1hJ+hHo79TIJTNcodvcW5BK6JvwO5B5Y5jeU= X-Google-Smtp-Source: APBJJlFdXpR5WpKrQ+dKkV2RwLEWoTdEzQ3ENuqEP92j9PIilEbi0nPga4EStw1e7fQPye9NQhEB8A== X-Received: by 2002:a17:90b:3682:b0:267:f329:947d with SMTP id mj2-20020a17090b368200b00267f329947dmr259331pjb.33.1690487051662; Thu, 27 Jul 2023 12:44:11 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/27] libwebp: upgrade 1.3.0 -> 1.3.1 Date: Thu, 27 Jul 2023 09:43:27 -1000 Message-Id: <6d6d103cfba013f54d567f96095a64034e568890.1690486929.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 ; Thu, 27 Jul 2023 19:44:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184984 From: Wang Mingyu CVE-2023-1999.patch removed since it's included in 1.3.1 Changelog: ========== This is a binary compatible release. * security fixes for lossless encoder (#603, chromium: #1420107, #1455619, CVE-2023-1999) * improve error reporting through WebPPicture error codes * fix upsampling for RGB565 and RGBA4444 in NEON builds * img2webp: add -sharp_yuv & -near_lossless * Windows builds: - fix compatibility with clang-cl (#607) - improve Arm64 performance with cl.exe - add Arm64EC support * fix webp_js with emcc >= 3.1.27 (stack size change, #614) * CMake fixes (#592, #610, #612) * further updates to the container and lossless bitstream docs (#581, #611) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 15411fb32b5a3c0ac9c06ff89db5664799f55d77) Signed-off-by: Steve Sakoman --- .../webp/files/CVE-2023-1999.patch | 55 ------------------- .../{libwebp_1.3.0.bb => libwebp_1.3.1.bb} | 6 +- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 meta/recipes-multimedia/webp/files/CVE-2023-1999.patch rename meta/recipes-multimedia/webp/{libwebp_1.3.0.bb => libwebp_1.3.1.bb} (93%) diff --git a/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch b/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch deleted file mode 100644 index d293ab93ab..0000000000 --- a/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Wed, 22 Feb 2023 22:15:47 -0800 -Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error - -This avoids a double free should the function fail prior to -VP8BitWriterInit() and a previous trial result's buffer carried over. -Previously in ApplyFiltersAndEncode() trial.bw (with a previous -iteration's buffer) would be freed, followed by best.bw pointing to the -same buffer. - -Since: -187d379d add a fallback to ALPHA_NO_COMPRESSION - -In addition, check the return value of VP8BitWriterInit() in this -function. - -Bug: webp:603 -Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 - -CVE: CVE-2023-1999 -Upstream-Status: Backport [https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129] -Signed-off-by: Nikhil R ---- - src/enc/alpha_enc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c -index f7c02690e3..7d205586fe 100644 ---- a/src/enc/alpha_enc.c -+++ b/src/enc/alpha_enc.c -@@ -13,6 +13,7 @@ - - #include - #include -+#include - - #include "src/enc/vp8i_enc.h" - #include "src/dsp/dsp.h" -@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, - } - } else { - VP8LBitWriterWipeOut(&tmp_bw); -+ memset(&result->bw, 0, sizeof(result->bw)); - return 0; - } - } -@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, - header = method | (filter << 2); - if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; - -- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); -+ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; - ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); - ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); diff --git a/meta/recipes-multimedia/webp/libwebp_1.3.0.bb b/meta/recipes-multimedia/webp/libwebp_1.3.1.bb similarity index 93% rename from meta/recipes-multimedia/webp/libwebp_1.3.0.bb rename to meta/recipes-multimedia/webp/libwebp_1.3.1.bb index 58a91d5077..0a345498c1 100644 --- a/meta/recipes-multimedia/webp/libwebp_1.3.0.bb +++ b/meta/recipes-multimedia/webp/libwebp_1.3.1.bb @@ -14,14 +14,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" -SRC_URI[sha256sum] = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c" +SRC_URI[sha256sum] = "b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66" UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" -SRC_URI += " \ - file://CVE-2023-1999.patch \ -" - EXTRA_OECONF = " \ --disable-wic \ --enable-libwebpmux \ From patchwork Thu Jul 27 19:43:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28030 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 3A2E3C04A94 for ; Thu, 27 Jul 2023 19:44:22 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.16756.1690487054429307809 for ; Thu, 27 Jul 2023 12:44:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=eH5W7m7l; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-563e21a6011so933886a12.0 for ; Thu, 27 Jul 2023 12:44:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487053; x=1691091853; 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=79TbQkkLFb98IbKNj8ZNS+lqdWz7Vx7LlfkX7u3rci0=; b=eH5W7m7l+BN9uoKC8tjt9yCTnVv8APuClbeU1fbLJxyeEDpjaCHK1DAge8vt6ZEpHw C1orsew31HOMFUVlfIZTV7kGsKbFe8HpUdBI2zMnPYE230kJVNxSpPDXVJ/CMdbo4Yae zvr3l0SRjtUpqA9INC384+OPDQjW79Bx+3PcJDteyJskcJuVde+GLO1OeeTS4UJ6DpOq rlPo0adsUIzzIJktJ/FNSQrsR5csjBOYd5Bv041vAsyc1wcRUtEbAnauIz95N+e4pA4l n/a/t5FR8b1wp/4dbWiofOPkjXCtPUad7cqXn/z8Qe0ob2Np8TFssp7IAjGa/2eXmL/Z jqhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487053; x=1691091853; 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=79TbQkkLFb98IbKNj8ZNS+lqdWz7Vx7LlfkX7u3rci0=; b=VFxF0EN22EcnhKksZ/Z9hnTDRYO/kPVAWeEecKeiHZTcyHJyB4/zqK0HWupiFJ8EnE t7IdIpgdwWvyb/BkfhxLRbnJbhV72YKmTi1WoC2WMoYNspbhuNbk6z4ietVI1ohwzXpR le+hN1v8eBoM05LbDaWrL2eLMKI/GsAnQw6qvu6icIcLSbcmgAuDHvBAjkereyB6LN/z YAnTxno6EWIc0CmvoqG9t+0Mde32Fo1GVs71TmZr7GAeYsg3B0Q1kEpGX94lldYKBsUy 1TsaCaCCBAdJ/INhhumJJAFGm+VZETpzIIXAHjPm60DOhQt+13zDhbDoFykZBBMMKL5F +ZnQ== X-Gm-Message-State: ABy/qLbsJN2iFYo/mkKrJdOHJD5eer5sZ0CENanXne6RHNhuNZQyb7/m 8aMCHyWfGekyyxhxgpqKjvLf9aXT2b7Nv3UFCIU= X-Google-Smtp-Source: APBJJlFr8wThM5Z/fWOj5h1J1E1XocMQ6k5bqQKnl2SQnn7Lk0tVVsHN/WmI8an8CY+wieH72qeuSw== X-Received: by 2002:a17:90a:985:b0:268:576d:a831 with SMTP id 5-20020a17090a098500b00268576da831mr274167pjo.45.1690487053496; Thu, 27 Jul 2023 12:44:13 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/27] scripts/oe-setup-builddir: copy conf-notes.txt to build dir Date: Thu, 27 Jul 2023 09:43:28 -1000 Message-Id: <99e814215d164274cb29ba34ab06c11172dbe9f0.1690486929.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 ; Thu, 27 Jul 2023 19:44:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184985 From: Stéphane Veyret Since commit 569d4cd325, if one is using a custom template directory containing a conf-notes.txt, this file is only displayed when creating a new environment. When entering an already existing environment, only the default poky conf-notes.txt is displayed. This patch copies the conf-notes.txt to display to the build directory, so that the good file is shown, even when templateconf.cfg is not used. Signed-off-by: Stéphane Veyret Signed-off-by: Richard Purdie (cherry picked from commit 845e8292f218d740ee653fa68bc3110aec1af3c5) Signed-off-by: Steve Sakoman --- scripts/oe-setup-builddir | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 89ae30f609..678aeac4be 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -98,9 +98,17 @@ EOM SHOWYPDOC=yes fi +if [ -z "$OECORENOTESCONF" ]; then + OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" +fi +if [ ! -r "$BUILDDIR/conf/conf-notes.txt" ]; then + [ ! -r "$OECORENOTESCONF" ] || cp "$OECORENOTESCONF" "$BUILDDIR/conf/conf-notes.txt" +fi + # Prevent disturbing a new GIT clone in same console unset OECORELOCALCONF unset OECORELAYERCONF +unset OECORENOTESCONF # Ending the first-time run message. Show the YP Documentation banner. if [ -n "$SHOWYPDOC" ]; then @@ -116,11 +124,7 @@ EOM # unset SHOWYPDOC fi -if [ -z "$OECORENOTESCONF" ]; then - OECORENOTESCONF="$OEROOT/meta/conf/templates/default/conf-notes.txt" -fi -[ ! -r "$OECORENOTESCONF" ] || cat "$OECORENOTESCONF" -unset OECORENOTESCONF +[ ! -r "$BUILDDIR/conf/conf-notes.txt" ] || cat "$BUILDDIR/conf/conf-notes.txt" if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then echo "$ORG_TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" From patchwork Thu Jul 27 19:43:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28029 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 33520C001DC for ; Thu, 27 Jul 2023 19:44:22 +0000 (UTC) Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by mx.groups.io with SMTP id smtpd.web10.16719.1690487056519428662 for ; Thu, 27 Jul 2023 12:44:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=JXZPksGC; spf=softfail (domain: sakoman.com, ip: 209.85.166.41, mailfrom: steve@sakoman.com) Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-7878e573827so52779539f.1 for ; Thu, 27 Jul 2023 12:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487055; x=1691091855; 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=Ljh7jx4q/oacC27uvIMl3IjW2lP2eINbfIVgqPYl9sg=; b=JXZPksGCXMoNlmp+tpkI+4SfdXYG+Y5AretbMNxjFg3Q78EK9btMbaVGL12PF/JSGl o6KuZ+V8WH5YdOIWjZ/l6ccugGmE12/QjONPcufs6t11IMQ+hTeISjdVnB4qmvqzW9ny EalD9SMUTezmQxMb6gfWdIBWfdojnZbLdK4oyaXfcOFYKgVGbUlXWGIgpm4G5Ikok8Vy 1Y8g0KSoXikrK4udVLmGNs2WzK95nSolhmIPHgFFJMxDefvJmZlJJFsHsjYY3kXXFJzr 7gs6vRludfuo9oBPQr/0/NwAw0Z109g2Yh+aCXOe2dZFsYq9EAex2JU2Fp/CkGJ9ZRLo bNgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487055; x=1691091855; 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=Ljh7jx4q/oacC27uvIMl3IjW2lP2eINbfIVgqPYl9sg=; b=mC/PMWv1yCb2gWLkoeLTIW7ZWItmN97nuDEYhINOyv7N6ckvgylhT15UL1yfhpHD68 M1v1xA+JFmIJdNNJ5bC9ELBiHnwjfuiLvzNFet6OrZIE14ckNhvdvi7DQ6FmmBZlP9hZ fAKd1UFryf78fElMArjNO/+r7kScZp0CrjH4wq9LAoHMAulicU1A4iEvF2BLXgcvoBk/ Msu5QyjmDG9tPJ5jVj/F56VzADiRVSGdmwVfj4OTS1s3vtIjrhDVdFn2YFDPaXK8ePX7 xrv6Gq4WOphLVCwSG/iJTi1F+UmC/QpXH368BP8ZuClPXKCCaZkXM0v6Hkn+h3MSHFUy SF2w== X-Gm-Message-State: ABy/qLZ6+LWyiRcw8TPoYDFRZXvpLiDMqDy7OT9xk9VZok1DIAbF8TLt L+HcXbrTyK+7b8xY6cxK7yIY0oPCOIw9NRd48UY= X-Google-Smtp-Source: APBJJlHrQpBAa4/rw1YViy4U9RLpOwxROdgAMtrNThBson8BAG0RdEJGl94/ROUI/QY7lqJY903MdQ== X-Received: by 2002:a05:6e02:b45:b0:345:d3bc:8882 with SMTP id f5-20020a056e020b4500b00345d3bc8882mr479185ilu.24.1690487055309; Thu, 27 Jul 2023 12:44:15 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/27] pkgconf: update SRC_URI Date: Thu, 27 Jul 2023 09:43:29 -1000 Message-Id: <7b50737b787311216670aa4b83b0a363d9a12aa3.1690486929.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 ; Thu, 27 Jul 2023 19:44:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184986 From: Ross Burton dereferenced.org is now longer controlled by the pkgconf maintainers[1], so use the the new hosting location. [1] https://github.com/pkgconf/pkgconf/commit/437c2a3218bfcb1cae7fa38a4ccd0cb29575ff07 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit c3df4594513410c7a6352e62aa928c42982eac13) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb index 4bdf03c574..ab1d1c84e8 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.9.5.bb @@ -15,7 +15,7 @@ LICENSE = "pkgconf" LIC_FILES_CHKSUM = "file://COPYING;md5=2214222ec1a820bd6cc75167a56925e0" SRC_URI = "\ - https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \ + https://distfiles.ariadne.space/pkgconf/pkgconf-${PV}.tar.xz \ file://pkg-config-wrapper \ file://pkg-config-native.in \ file://pkg-config-esdk.in \ From patchwork Thu Jul 27 19:43:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28027 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 34575C04E69 for ; Thu, 27 Jul 2023 19:44:22 +0000 (UTC) Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by mx.groups.io with SMTP id smtpd.web10.16720.1690487058211812056 for ; Thu, 27 Jul 2023 12:44:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=gizXPkQO; spf=softfail (domain: sakoman.com, ip: 209.85.166.175, mailfrom: steve@sakoman.com) Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-34637e55d8dso5090115ab.2 for ; Thu, 27 Jul 2023 12:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487057; x=1691091857; 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=GMOwN0UCZZrwC5VsZWrNllthg1QlNl072STvvbLHE9c=; b=gizXPkQOBmoDE+V06pt9eHeosFdmpc6ec6ygWKFfpez/v4MHM8TL8STeu4EZwnQ8J1 aa9vbUETOFWbefwVPSoIRBAn921Eu8hoCOkBv75vvHkYCNbFnqnh9O4WB+ceqUKleE2+ +JOZ9HJbKOba1U2sWdfnL2BOhQ6peFnmnOAV2vxbCe6EGfKnR2gYidbC/SUOAUgLg3tP OuomKu0J0hhVdUNTZ8TU5Hy7OHveNvjoNViNIt2jeNE25Yg2yJUu/dkaLM6WxF1m05x2 G4Wozlqa3ziu1z/bSL1nyyQmG8n2PU4RWkg868VIovOvxzPOFqjqy7CphIhn6RdQz6va pfbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487057; x=1691091857; 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=GMOwN0UCZZrwC5VsZWrNllthg1QlNl072STvvbLHE9c=; b=hTC/z1EodJmBxaw+Au+HwRveA4tDJBHTylp3RYW23iuAHbYMKhmD4QOTijl0kCjw5+ sH5xkyI/KvpK2xCA6aYBVV4efV/fa3N5T6DiSj/XWA4rfdvKcfFqRwEVhj9mY0yJDoRn +eK9m6buh5TnjrVC1OZFBs4vgvj0z4pLI01ORu+8d4v0J10b2I4CdrvT+Uuqz/ARBrYf BMPCAn6C+uJFtXi+uH2LGxtdo+7T/SkZZesmgVC3KE4RZiL+VakPWTdqsp3oEC98hbxL 9b0Me+Wcw9VVj8RYdi3PmCM9mgS5q/hUHoRbqi0muC/SN4c9n6QuT2DQMpuZzwLFB3vP w83Q== X-Gm-Message-State: ABy/qLasi2nnvYbNod+Y2HUhEvh7WtFG6E6ydDMwhC9FZ1HBDB+KfsAN 4zAwLEwuScdWkuQvwgFhwli5acDr80kpYr1A0SI= X-Google-Smtp-Source: APBJJlE9V4b+7MsWGpF+Ej2qtgqGQAoXVcjW/tAHfRiIDiR/mliPR4IiwkKmRGnfuFmI7METC1oaIg== X-Received: by 2002:a05:6e02:ef4:b0:348:f14f:433e with SMTP id j20-20020a056e020ef400b00348f14f433emr417449ilk.12.1690487056960; Thu, 27 Jul 2023 12:44:16 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/27] kernel-module-split add systemd modulesloaddir and modprobedir config Date: Thu, 27 Jul 2023 09:43:30 -1000 Message-Id: <174b446b7c8167934b13ec679407093924d324e3.1690486929.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 ; Thu, 27 Jul 2023 19:44:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184987 From: Jose Quaresma Because busybox doesn't support other path than /etc [1] we can't change the default path unconditionally so change it only for systemd. The modules-load.d [2] - Configure kernel modules to load at boot should install their configuration files in /usr/lib/modules-load.d. The modprobe.d [3] - Configuration directory for modprobe should install their configuration files in /lib/modprobe.d [1] https://git.busybox.net/busybox/tree/modutils/modprobe.c?id=669c40ed8ebf480c95ce36135104e474e361a7e6#n658 [2] https://man7.org/linux/man-pages/man5/modules-load.d.5.html [3] https://man7.org/linux/man-pages/man5/modprobe.d.5.html [YOCTO #12212] https://bugzilla.yoctoproject.org/show_bug.cgi?id=12212 Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit 075c309bd28bc8e19a82569a2e75da14fa5795dd) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-module-split.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass index 0e4f9a6ec3..c1208d55e0 100644 --- a/meta/classes-recipe/kernel-module-split.bbclass +++ b/meta/classes-recipe/kernel-module-split.bbclass @@ -30,8 +30,8 @@ fi PACKAGE_WRITE_DEPS += "kmod-native depmodwrapper-cross" -modulesloaddir ??= "${sysconfdir}/modules-load.d" -modprobedir ??= "${sysconfdir}/modprobe.d" +modulesloaddir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_libdir}', '${sysconfdir}', d)}/modules-load.d" +modprobedir ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${nonarch_base_libdir}', '${sysconfdir}', d)}/modprobe.d" KERNEL_SPLIT_MODULES ?= "1" PACKAGESPLITFUNCS =+ "split_kernel_module_packages" From patchwork Thu Jul 27 19:43:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28026 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 25996EB64DD for ; Thu, 27 Jul 2023 19:44:22 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.16721.1690487059517397833 for ; Thu, 27 Jul 2023 12:44:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=GiORgzY9; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b8ad8383faso11087235ad.0 for ; Thu, 27 Jul 2023 12:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487058; x=1691091858; 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=mTp4MSwT70rNfInmMxEu2YPMi8qNqs55pVaoCguj2V0=; b=GiORgzY9nRBeqzY26cjG9HW18vprXKZcPYd/ui4otGbB3wp2cdalIiT475f16YFL4y Tt1Hbna9VzjHqtYzKyLurbirbWf5IUmAFq+FO+T3rISYrE/vl1k7Gro0DDdOPT2bqazy m03agpUo4R685/djOYcvzDm2BR2RK5MSHm6H/nldSwPhoZGeMHfSuPD7YtZPHKH6bRbK NMOd5hATSeqJrItpz4QLr0/B89V/jZsx27DPvU3Mb6qijopaqn3IL76k3xXIcaP4YLz0 Jihd9hcor8qtlTFTVgLGOUlyBAnocXHAD6NyGzw5QxMoOeQRvt4L/xXln4mU4jZv8k3i L9aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487058; x=1691091858; 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=mTp4MSwT70rNfInmMxEu2YPMi8qNqs55pVaoCguj2V0=; b=lmaseXIybVR3jmbcqlD5lsYDEHxSgCNZa/AePzi7fhl5O1ESmyxuyaG8A5nxHlxYU+ hnRWie5qhpgCA9sywD/XS7+SmWI/YBLd7BNsCjH58+MYwYD8LUEARf1yJ1pttOLhhhdY XNMURqugNcoU+DsYzRwT6dSbhczIHR8A8xYKGncBAvEwfSPmoSOGujP60Wp//TcFZHTu 3cWyuQ07RerCvdkYZzUIe86eJw4UEr3PfA3j6uf5Qs3EwH2ZEW/vZRYE8y4cQRfkX6dB RZrmbARGiEMInjxLNzJVR6tW0pxJJUB8CyQavIQSwiA965qG+HrZj+8PABLfiTycpPbr AQhA== X-Gm-Message-State: ABy/qLbXE/2SC95HThXdR/z8b9DXZXThQNQt3xTEEw3izcf7XJgJscYb lEMJztB4sZ+jxJ64H5KvP8TKVjnVhJvlI+PS4Ak= X-Google-Smtp-Source: APBJJlFvwKa1Rt/69oFNWi+JJ7gkAuxFPhK43UVmkGQXEMkABu8BG+mPK2tL2uPxim6LprxGV1ojhg== X-Received: by 2002:a17:903:1252:b0:1bb:961e:dfbc with SMTP id u18-20020a170903125200b001bb961edfbcmr371803plh.20.1690487058715; Thu, 27 Jul 2023 12:44:18 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/27] uboot-extlinux-config.bbclass: fix old override syntax in comment Date: Thu, 27 Jul 2023 09:43:31 -1000 Message-Id: <0bbafc8b4d0c401a2af7c4b80e86d3e3fe01bed5.1690486929.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 ; Thu, 27 Jul 2023 19:44:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184988 From: Quentin Schulz The comment specifies how to use the variables but uses the older and now unsupported override syntax. Let's update to match the newer syntax. Cc: Quentin Schulz (From OE-Core rev: 0a381eea4d50ff1c6e7c7d0d4df62eb581454b48) Signed-off-by: Quentin Schulz Signed-off-by: Alexandre Belloni Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit bb64f3fed29b9532e6ddc9a2ba0283d373622d87) Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-extlinux-config.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/uboot-extlinux-config.bbclass b/meta/classes-recipe/uboot-extlinux-config.bbclass index 86a7d30ca0..653e583663 100644 --- a/meta/classes-recipe/uboot-extlinux-config.bbclass +++ b/meta/classes-recipe/uboot-extlinux-config.bbclass @@ -33,11 +33,11 @@ # UBOOT_EXTLINUX_DEFAULT_LABEL ??= "Linux Default" # UBOOT_EXTLINUX_TIMEOUT ??= "30" # -# UBOOT_EXTLINUX_KERNEL_IMAGE_default ??= "../zImage" -# UBOOT_EXTLINUX_MENU_DESCRIPTION_default ??= "Linux Default" +# UBOOT_EXTLINUX_KERNEL_IMAGE:default ??= "../zImage" +# UBOOT_EXTLINUX_MENU_DESCRIPTION:default ??= "Linux Default" # -# UBOOT_EXTLINUX_KERNEL_IMAGE_fallback ??= "../zImage-fallback" -# UBOOT_EXTLINUX_MENU_DESCRIPTION_fallback ??= "Linux Fallback" +# UBOOT_EXTLINUX_KERNEL_IMAGE:fallback ??= "../zImage-fallback" +# UBOOT_EXTLINUX_MENU_DESCRIPTION:fallback ??= "Linux Fallback" # # Results: # From patchwork Thu Jul 27 19:43:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28028 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 2B75BC00528 for ; Thu, 27 Jul 2023 19:44:22 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.16760.1690487061263417320 for ; Thu, 27 Jul 2023 12:44:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=dbRsVLib; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1b9c5e07c1bso10913905ad.2 for ; Thu, 27 Jul 2023 12:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487060; x=1691091860; 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=/YY0u9/gZFne/ydJtjVWTndS0V83J2YjtjJOe/GOYjc=; b=dbRsVLibep5FesUcDLUs64O4kMsLWEKLXkCvzzFA/sgC9pSg6Hn1IW3kKwcGbROtNI w7jfVzQQUyycVpucIdCP8ICvK0Eku4xcnIl0SpUiIM14TfhhhAKBqppflV1IFSaaY7G9 tdvsbla2D8igAILl+bg7Q7gj0uklgVnNCJKWipkMuwDyPw9yam4E3f1VSUdTS2i77gUh 4y1QIZsg/R4x+RqOfkgmXUTE9mU+GUTEh/plTEWnJa2Ehv13z7dMiV3+mNu56MIClJ+l aQ2J+dJkudmvqnDCp5TgxfBgd713zcGV+M+zXcDi7OKyLtD+0W5GUgmA6y08rtBhMA4D 7Y8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487060; x=1691091860; 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=/YY0u9/gZFne/ydJtjVWTndS0V83J2YjtjJOe/GOYjc=; b=WVvMxZDXHywpnOsyvLvRGVjRxWLbgB9BPtZc6x0WOWeEcijca44Y5CVS2lzXS8gVwz nWpuPgR/Ar70IpfzCZgEc/OquKkG1vHODaK6lmspL2H3rW82cjAxStngC3sU4aT6VakC 3+kAMBPXk51cty2i1JYvFKRwwcLOyIfCTiVjpok9/g3tmzjAITflxNe+FGdzSTyUYrf5 StvrdrEoXh05PXyE7EoL6+4UdzPwGretVOVonPMTkcQtoCNK5QU6WfsR0QOHMJ7nvMpX hclWBDrrSATV9NsICxliJyGUZr4OJXS+60Wzu4kVxnIagQnkaCnu8dO/s7FATAj6O8zr iNsw== X-Gm-Message-State: ABy/qLYYvzW4873PjKexDQ/RkoYF5+ovf9ucV8iAO7gl6HW9fiFtRr2M BN45y3UV9Cr1gL0oBYFEEfj9whyDRViNN/KUUT4= X-Google-Smtp-Source: APBJJlHBk3tdL7gOGVoE58ewhot/EBNXJnzsR6uhdBTyYeIpQxzpbok3S3aiaYm9s1An5uLVZk3Psw== X-Received: by 2002:a17:902:e803:b0:1b5:2fdf:5bd8 with SMTP id u3-20020a170902e80300b001b52fdf5bd8mr365257plg.8.1690487060401; Thu, 27 Jul 2023 12:44:20 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 14/27] mdadm: fix util-linux ptest dependency Date: Thu, 27 Jul 2023 09:43:32 -1000 Message-Id: <45bf9f5c18a1dec0d3c1a134285e71660dd9d890.1690486929.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 ; Thu, 27 Jul 2023 19:44:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184989 From: Ovidiu Panait Trying to run mdadm-ptest in a core-image-minimal build will result in: root@qemux86-64:~# ptest-runner mdadm START: ptest-runner BEGIN: /usr/lib/mdadm/ptest which: no lsblk in (/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin) lsblk command not found! DURATION: 0 END: /usr/lib/mdadm/ptest 2023-06-28T10:14 STOP: ptest-runner TOTAL: 1 FAIL: 0 Remove util-linux from RRECOMMENDS and only add util-linux-lsblk and util-linux-losetup to RDEPENDS. Signed-off-by: Ovidiu Panait Signed-off-by: Richard Purdie (cherry picked from commit 3004f7589974c135cc82630d980ea281b97ecd83) Signed-off-by: Steve Sakoman --- meta/recipes-extended/mdadm/mdadm_4.2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 14de9d88c2..bcc0175f67 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -101,10 +101,9 @@ do_install_ptest() { } RDEPENDS:${PN} += "bash" -RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs" +RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs util-linux-lsblk util-linux-losetup" RRECOMMENDS:${PN}-ptest += " \ coreutils \ - util-linux \ kernel-module-loop \ kernel-module-linear \ kernel-module-raid0 \ From patchwork Thu Jul 27 19:43:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28034 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 25C47C41513 for ; Thu, 27 Jul 2023 19:44:32 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.16762.1690487063089903514 for ; Thu, 27 Jul 2023 12:44:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=X3pv/wnW; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-55b1238a013so946314a12.3 for ; Thu, 27 Jul 2023 12:44:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487062; x=1691091862; 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=EwZtFLNCYw6Gig55gDK64X3FvDRRGWYgd4sAIeeb1pE=; b=X3pv/wnWSQcoflIedlu+ApgH5K3izhUhmBZ8HRaQp1hheMK/YN/FiPWo0jp9FhvqqJ xNGtIdu6XwuOA1FBEw1KsD5CFSQEBAzZf9kQEqZo0WwVr7hn7/JXpw7WhE8L3dn1//F1 AUmO4k7HX5ZC0rcYfq7w5YvOyIO87CEFddJ+nlR7y2rbsjcP8ZUKXmWhaQkhM76JqBpx q1Sv5IIfV3d7LcwJpW0EkEi+YflY7Fs36t0urha+YEoRpeoPhNUx+e6dH6oCOoxsDohj BMhT2O3JEPwZHf3IJdpo44AEW3W4DmI9iHOWBraR75t2So2MGxWVCOcnhKQ6kRSh+Yhe 0Z3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487062; x=1691091862; 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=EwZtFLNCYw6Gig55gDK64X3FvDRRGWYgd4sAIeeb1pE=; b=f4A0rVMpbr2QR4od76CijrN4S7qo3A7zRWm5hTaO9NDNK4yt/qsdZtRTra1JzJ6eXu tpMZ08D4I+ZzdyKzCyBFlENleb3J4vQ0uygKVCdReJcWqh+6BmZcVfhBgx/RFuxrzNN5 om2Jr57oqIMJgNaeS72ldHxFzNpamGZFWJalPnJEhU/1x5d+o/Je+8lHPWCwY/xzOJiH f0foEpOgepzcL5PMB9L/VtqJwrcVeDc48lzNB5RSYRqUi06vToa9H91ctLXOgv4uCR+z ZlTyI8aOBg8lFRViI97D9FO5nkhVF2+Lxyff3+BaVw2F39lP4yyJAm5GwcQomNRG5wMl cFYw== X-Gm-Message-State: ABy/qLapmOsBVzHpJuXJcZQGi/FEMu5Kgmy4X0fEU4slu9Sjm+aZg/bl 7UGxTnKHxCuxAWbZ24uxsDjGA6NKYOZtdjQTHoQ= X-Google-Smtp-Source: APBJJlGmyM0I4zlrOwM0PNenRPSzIpW8jPq/50gQs1k48pgzRIaUHpwpLjaazhSD1HzTnM48Mc5chg== X-Received: by 2002:a17:90a:b38b:b0:268:18e:9dfa with SMTP id e11-20020a17090ab38b00b00268018e9dfamr304201pjr.5.1690487062000; Thu, 27 Jul 2023 12:44:22 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 15/27] mdadm: fix 07revert-inplace ptest Date: Thu, 27 Jul 2023 09:43:33 -1000 Message-Id: <56485bbb1ccb9042a914f1ed477fc96323d39fdf.1690486929.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 ; Thu, 27 Jul 2023 19:44:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184990 From: Ovidiu Panait Testcase 07revert-inplace fails if strace is not installed: ... strace -o /tmp/str ./mdadm -A /dev/md0 --update=revert-reshape /dev/<...> tests/07revert-inplace: line 40: strace: command not found Add strace to mdadm-ptest RDEPENDS to make sure the testcase passes even with a core-image-minimal build. Signed-off-by: Ovidiu Panait Signed-off-by: Richard Purdie (cherry picked from commit 7d9386663ac52ab69812867a0823c6055aedbc18) Signed-off-by: Steve Sakoman --- meta/recipes-extended/mdadm/mdadm_4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index bcc0175f67..6152a83655 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -101,7 +101,7 @@ do_install_ptest() { } RDEPENDS:${PN} += "bash" -RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs util-linux-lsblk util-linux-losetup" +RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs util-linux-lsblk util-linux-losetup strace" RRECOMMENDS:${PN}-ptest += " \ coreutils \ kernel-module-loop \ From patchwork Thu Jul 27 19:43:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28032 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 34ECFC04A94 for ; Thu, 27 Jul 2023 19:44:32 +0000 (UTC) Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by mx.groups.io with SMTP id smtpd.web10.16724.1690487065193951376 for ; Thu, 27 Jul 2023 12:44:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=j2m/gGZ7; spf=softfail (domain: sakoman.com, ip: 209.85.166.174, mailfrom: steve@sakoman.com) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-346392da0d6so5167495ab.3 for ; Thu, 27 Jul 2023 12:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487064; x=1691091864; 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=sTSzwZxc2cHjRqjOg6vNCUsHd7btJ4pI/HIhg+09RtM=; b=j2m/gGZ799hBt4IgSMIlkaSkBETiDPNIcsm6fcuidnFjqItsyp4q8+ongQ6jeNNgf0 H86vE1fVondFkz+sMb6h1lqovgN9c8EJIgG3WTfEGXXqpFOVHXXorH+SrwaRDxlFbqWo RcwS7R+g/vuXK5pizE9G8ATzybWsey5YrjjoW9XwzWOU7d6yUykolP4Goo4Q5ajeu9H9 lFB2hMatyr93u5F1iC3CaGPznGUwndPRfMtIf/1PmPQSOm9OhKtLKVe0AiT5h1qiG1x4 fMQp0OEj1OW4IbgQWZm+CPvBKhoYnP1T2CNzb7aF2EFLG0R0CBjZlM0+2QaVa7zAod1p v8DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487064; x=1691091864; 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=sTSzwZxc2cHjRqjOg6vNCUsHd7btJ4pI/HIhg+09RtM=; b=ARN2Z6xfX8Ty1RU1IrzNBYDp5Z4CyAopzu7JLQD9lycnwzMztxQpWOVEhoJxZ/oEui iWSQS8P0/CSkM6h59h7MLzJ4objTPek2Xt4w3RCXbQxHtDlz7inzNWcUG6d/mySaC/Z2 TS906MRAxUHJkIIGjT1p2HQ2ffj5hD1OWWpx7MKRWJvEF3ZgXsv66r6u66qnZ60QDpmp UNZxqawTzFiWZYu34cEPH/lGGYvIs5H0+sjH43jfM77b4Y27M3tEjZB6mQ5HgsCd2O86 maye5Y+10mti3AKEigwUlRsmoJZ8H8cCBHrTvg/1IdMC5bXXIvGJk7pA+gYuelkni0TI /DqA== X-Gm-Message-State: ABy/qLYe2SD0pr6PFXM/+0+26AmCD6onPzeSYVYfbNB3mAiJtP2D1IbC j46CObplEJ/cGxXIHExh4VdN1OhlqLpYXJKr1og= X-Google-Smtp-Source: APBJJlEJHzf+e/o5ly2FKyJXeSKqlwjOWuU3viTK0zUJvYk2oH/8cfRySpBVVE3a73n9nd48fDS4ZA== X-Received: by 2002:a92:ce89:0:b0:348:fc48:6d00 with SMTP id r9-20020a92ce89000000b00348fc486d00mr458542ilo.12.1690487063929; Thu, 27 Jul 2023 12:44:23 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 16/27] mdadm: fix segfaults when running ptests Date: Thu, 27 Jul 2023 09:43:34 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184991 From: Ovidiu Panait Currently, some segfaults are reported when running ptest: mdadm[12333]: segfault at 0 ip 00007fe855924060 sp 00007ffc4d6caf88 error 4 in libc.so.6[7f) Code: d2 0f 84 b7 0f 00 00 48 83 fa 01 0f 84 b9 0f 00 00 49 89 d3 89 f1 89 f8 48 83 e1 3f 4f Backport the following upstream commits to fix them: 679bd9508a30 ("DDF: Cleanup validate_geometry_ddf_container()") 2b93288a5650 ("DDF: Fix NULL pointer dereference in validate_geometry_ddf()") 548e9b916f86 ("mdadm/Grow: Fix use after close bug by closing after fork") 9ae62977b51d ("monitor: Avoid segfault when calling NULL get_bad_blocks") The fixes are part of the "Bug fixes and testing improvments" patchset [1]. [1] https://www.spinics.net/lists/raid/msg70621.html Signed-off-by: Ovidiu Panait Signed-off-by: Richard Purdie (cherry picked from commit 9585009e3e505b361cd32b14e0e85e77e7822878) Signed-off-by: Steve Sakoman --- ...anup-validate_geometry_ddf_container.patch | 148 ++++++++++++++++++ ...nter-dereference-in-validate_geometr.patch | 56 +++++++ ...se-after-close-bug-by-closing-after-.patch | 91 +++++++++++ ...gfault-when-calling-NULL-get_bad_blo.patch | 42 +++++ meta/recipes-extended/mdadm/mdadm_4.2.bb | 4 + 5 files changed, 341 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch create mode 100644 meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch create mode 100644 meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch create mode 100644 meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch diff --git a/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch b/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch new file mode 100644 index 0000000000..cea435f83b --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch @@ -0,0 +1,148 @@ +From ca458f4dcc4de9403298f67543466ce4bbc8f8ae Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:07 -0600 +Subject: [PATCH 1/4] DDF: Cleanup validate_geometry_ddf_container() + +Move the function up so that the function declaration is not necessary +and remove the unused arguments to the function. + +No functional changes are intended but will help with a bug fix in the +next patch. + +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=679bd9508a30 + +Signed-off-by: Ovidiu Panait +--- + super-ddf.c | 88 ++++++++++++++++++++++++----------------------------- + 1 file changed, 39 insertions(+), 49 deletions(-) + +diff --git a/super-ddf.c b/super-ddf.c +index 3f304cd..65cf727 100644 +--- a/super-ddf.c ++++ b/super-ddf.c +@@ -503,13 +503,6 @@ struct ddf_super { + static int load_super_ddf_all(struct supertype *st, int fd, + void **sbp, char *devname); + static int get_svd_state(const struct ddf_super *, const struct vcl *); +-static int +-validate_geometry_ddf_container(struct supertype *st, +- int level, int layout, int raiddisks, +- int chunk, unsigned long long size, +- unsigned long long data_offset, +- char *dev, unsigned long long *freesize, +- int verbose); + + static int validate_geometry_ddf_bvd(struct supertype *st, + int level, int layout, int raiddisks, +@@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks, + return 1; + } + ++static int ++validate_geometry_ddf_container(struct supertype *st, ++ int level, int raiddisks, ++ unsigned long long data_offset, ++ char *dev, unsigned long long *freesize, ++ int verbose) ++{ ++ int fd; ++ unsigned long long ldsize; ++ ++ if (level != LEVEL_CONTAINER) ++ return 0; ++ if (!dev) ++ return 1; ++ ++ fd = dev_open(dev, O_RDONLY|O_EXCL); ++ if (fd < 0) { ++ if (verbose) ++ pr_err("ddf: Cannot open %s: %s\n", ++ dev, strerror(errno)); ++ return 0; ++ } ++ if (!get_dev_size(fd, dev, &ldsize)) { ++ close(fd); ++ return 0; ++ } ++ close(fd); ++ if (freesize) { ++ *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); ++ if (*freesize == 0) ++ return 0; ++ } ++ ++ return 1; ++} ++ + static int validate_geometry_ddf(struct supertype *st, + int level, int layout, int raiddisks, + int *chunk, unsigned long long size, +@@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st, + level = LEVEL_CONTAINER; + if (level == LEVEL_CONTAINER) { + /* Must be a fresh device to add to a container */ +- return validate_geometry_ddf_container(st, level, layout, +- raiddisks, *chunk, +- size, data_offset, dev, +- freesize, +- verbose); ++ return validate_geometry_ddf_container(st, level, raiddisks, ++ data_offset, dev, ++ freesize, verbose); + } + + if (!dev) { +@@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st, + return 1; + } + +-static int +-validate_geometry_ddf_container(struct supertype *st, +- int level, int layout, int raiddisks, +- int chunk, unsigned long long size, +- unsigned long long data_offset, +- char *dev, unsigned long long *freesize, +- int verbose) +-{ +- int fd; +- unsigned long long ldsize; +- +- if (level != LEVEL_CONTAINER) +- return 0; +- if (!dev) +- return 1; +- +- fd = dev_open(dev, O_RDONLY|O_EXCL); +- if (fd < 0) { +- if (verbose) +- pr_err("ddf: Cannot open %s: %s\n", +- dev, strerror(errno)); +- return 0; +- } +- if (!get_dev_size(fd, dev, &ldsize)) { +- close(fd); +- return 0; +- } +- close(fd); +- if (freesize) { +- *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); +- if (*freesize == 0) +- return 0; +- } +- +- return 1; +-} +- + static int validate_geometry_ddf_bvd(struct supertype *st, + int level, int layout, int raiddisks, + int *chunk, unsigned long long size, +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch b/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch new file mode 100644 index 0000000000..fafe88b49c --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch @@ -0,0 +1,56 @@ +From 14f110f0286d38e29ef5e51d7f72e049c2f18323 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:08 -0600 +Subject: [PATCH 2/4] DDF: Fix NULL pointer dereference in + validate_geometry_ddf() + +A relatively recent patch added a call to validate_geometry() in +Manage_add() that has level=LEVEL_CONTAINER and chunk=NULL. + +This causes some ddf tests to segfault which aborts the test suite. + +To fix this, avoid dereferencing chunk when the level is +LEVEL_CONTAINER or LEVEL_NONE. + +Fixes: 1f5d54a06df0 ("Manage: Call validate_geometry when adding drive to external container") +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=2b93288a5650 + +Signed-off-by: Ovidiu Panait +--- + super-ddf.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/super-ddf.c b/super-ddf.c +index 65cf727..3ef1293 100644 +--- a/super-ddf.c ++++ b/super-ddf.c +@@ -3369,9 +3369,6 @@ static int validate_geometry_ddf(struct supertype *st, + * If given BVDs, we make an SVD, changing all the GUIDs in the process. + */ + +- if (*chunk == UnSet) +- *chunk = DEFAULT_CHUNK; +- + if (level == LEVEL_NONE) + level = LEVEL_CONTAINER; + if (level == LEVEL_CONTAINER) { +@@ -3381,6 +3378,9 @@ static int validate_geometry_ddf(struct supertype *st, + freesize, verbose); + } + ++ if (*chunk == UnSet) ++ *chunk = DEFAULT_CHUNK; ++ + if (!dev) { + mdu_array_info_t array = { + .level = level, +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch b/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch new file mode 100644 index 0000000000..a954ab027a --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch @@ -0,0 +1,91 @@ +From bd064da1469a6a07331b076a0294a8c6c3c38526 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:09 -0600 +Subject: [PATCH 3/4] mdadm/Grow: Fix use after close bug by closing after fork + +The test 07reshape-grow fails most of the time. But it succeeds around +1 in 5 times. When it does succeed, it causes the tests to die because +mdadm has segfaulted. + +The segfault was caused by mdadm attempting to repoen a file +descriptor that was already closed. The backtrace of the segfault +was: + + #0 __strncmp_avx2 () at ../sysdeps/x86_64/multiarch/strcmp-avx2.S:101 + #1 0x000056146e31d44b in devnm2devid (devnm=0x0) at util.c:956 + #2 0x000056146e31dab4 in open_dev_flags (devnm=0x0, flags=0) + at util.c:1072 + #3 0x000056146e31db22 in open_dev (devnm=0x0) at util.c:1079 + #4 0x000056146e3202e8 in reopen_mddev (mdfd=4) at util.c:2244 + #5 0x000056146e329f36 in start_array (mdfd=4, + mddev=0x7ffc55342450 "/dev/md0", content=0x7ffc55342860, + st=0x56146fc78660, ident=0x7ffc55342f70, best=0x56146fc6f5d0, + bestcnt=10, chosen_drive=0, devices=0x56146fc706b0, okcnt=5, + sparecnt=0, rebuilding_cnt=0, journalcnt=0, c=0x7ffc55342e90, + clean=1, avail=0x56146fc78720 "\001\001\001\001\001", + start_partial_ok=0, err_ok=0, was_forced=0) + at Assemble.c:1206 + #6 0x000056146e32c36e in Assemble (st=0x56146fc78660, + mddev=0x7ffc55342450 "/dev/md0", ident=0x7ffc55342f70, + devlist=0x56146fc6e2d0, c=0x7ffc55342e90) + at Assemble.c:1914 + #7 0x000056146e312ac9 in main (argc=11, argv=0x7ffc55343238) + at mdadm.c:1510 + +The file descriptor was closed early in Grow_continue(). The noted commit +moved the close() call to close the fd above the fork which caused the +parent process to return with a closed fd. + +This meant reshape_array() and Grow_continue() would return in the parent +with the fd forked. The fd would eventually be passed to reopen_mddev() +which returned an unhandled NULL from fd2devnm() which would then be +dereferenced in devnm2devid. + +Fix this by moving the close() call below the fork. This appears to +fix the 07revert-grow test. While we're at it, switch to using +close_fd() to invalidate the file descriptor. + +Fixes: 77b72fa82813 ("mdadm/Grow: prevent md's fd from being occupied during delayed time") +Cc: Alex Wu +Cc: BingJing Chang +Cc: Danny Shih +Cc: ChangSyun Peng +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=548e9b916f86 + +Signed-off-by: Ovidiu Panait +--- + Grow.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Grow.c b/Grow.c +index 9c6fc95..a8e4e83 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -3501,7 +3501,6 @@ started: + return 0; + } + +- close(fd); + /* Now we just need to kick off the reshape and watch, while + * handling backups of the data... + * This is all done by a forked background process. +@@ -3522,6 +3521,9 @@ started: + break; + } + ++ /* Close unused file descriptor in the forked process */ ++ close_fd(&fd); ++ + /* If another array on the same devices is busy, the + * reshape will wait for them. This would mean that + * the first section that we suspend will stay suspended +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch b/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch new file mode 100644 index 0000000000..72cb40f782 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch @@ -0,0 +1,42 @@ +From 2296a4a441b4b8546e2eb32403930f1bb8f3ee4a Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:10 -0600 +Subject: [PATCH 4/4] monitor: Avoid segfault when calling NULL get_bad_blocks + +Not all struct superswitch implement a get_bad_blocks() function, +yet mdmon seems to call it without checking for NULL and thus +occasionally segfaults in the test 10ddf-geometry. + +Fix this by checking for NULL before calling it. + +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=9ae62977b51d + +Signed-off-by: Ovidiu Panait +--- + monitor.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/monitor.c b/monitor.c +index afc3e50..8e43c0d 100644 +--- a/monitor.c ++++ b/monitor.c +@@ -312,6 +312,9 @@ static int check_for_cleared_bb(struct active_array *a, struct mdinfo *mdi) + struct md_bb *bb; + int i; + ++ if (!ss->get_bad_blocks) ++ return -1; ++ + /* + * Get a list of bad blocks for an array, then read list of + * acknowledged bad blocks from kernel and compare it against metadata +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 6152a83655..f616746368 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -32,6 +32,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-tests-fix-raid0-tests-for-0.90-metadata.patch \ file://0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch \ file://0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch \ + file://0001-DDF-Cleanup-validate_geometry_ddf_container.patch \ + file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \ + file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \ + file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" From patchwork Thu Jul 27 19:43:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28036 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 39185C3DA40 for ; Thu, 27 Jul 2023 19:44:32 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.16726.1690487067207684883 for ; Thu, 27 Jul 2023 12:44:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=JWPenVa9; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-55b22f82ac8so1716918a12.1 for ; Thu, 27 Jul 2023 12:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487066; x=1691091866; 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=3l/pGH7YYW657UYqFiDnwn0OvPd6z1d9HUwHPWgraFk=; b=JWPenVa9UpC8LGOVaXGS7LyFdj3CI1axu+/AfJA+76LUJfCesxnmKquEA/RmJrN8Gn M46R1JVNszCwLaFElZMKJSdqXUOqyGT16HQvrNZGf3uzh4QRuwr8nkq1MPJo4nXpYPFO 2gsQtA7bAiW5aVYe1FKfQD32pd4lFKrZ70a/2AcbiiFiikDKYlnEsMt6qUyzjoB1gVp/ yZtnum07gpkioAuTnpeUwpgwl3B0rRZtcfAkFEvciCOzDJpoH1uv1OPt3zktTbDIYTNL mKRkJhopWNJyXbsRkq78x3BZvgJJlMGKQgpHKs9b8f1XnmSE8s8w6Wb1nmCq8RWcpM1Z cwEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487066; x=1691091866; 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=3l/pGH7YYW657UYqFiDnwn0OvPd6z1d9HUwHPWgraFk=; b=UEMC0iagbAYPuutlsTyJSXisZhjdi02FdP+SEq6Ng+3GKHxLxyt9U3zN7tQGltAvBg AgFKjLWKsm41AV20nap5dbMlPvjuttIDMU2PysEC7U5Yigpp9pwX0DpAzcvcYHf494/y j/Fp+tZPb3862Ztv/NKZeaVzKV4G9UXIPqaoTxjXBkHPTlm+gKeJ5Hm0Ta/tvwZfASpd vWOO7Z6j3gk16MsZlP23VX4hLHOXGFvGQoNLVkFPffZx9chL0/A0rp4m6NigOKDM3Uty VB+wRMFqBzUbE5e+735nOPfMwEV+H/1+QCH2fXXXlNjLj5x7z+edYp4x+Gg5hodzE5D3 IVaA== X-Gm-Message-State: ABy/qLbA12aB8pO3g5YC4HlUEMtMpXbClznXiUy1qWuYKVLgEO1Xrn+7 x2rZn3+mIFpmdbxrYQH4dxOK32CqGakfAHqaqD8= X-Google-Smtp-Source: APBJJlFJb+kVDe7OKQkekWwnZzq2pA541vvJtlKrJr5oeNLcwAZYsi0e5mSJQCyBR2jaCvX6nZVenw== X-Received: by 2002:a17:90a:fab:b0:260:a8da:536c with SMTP id 40-20020a17090a0fab00b00260a8da536cmr335954pjz.23.1690487065752; Thu, 27 Jul 2023 12:44:25 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 17/27] mdadm: skip running known broken ptests Date: Thu, 27 Jul 2023 09:43:35 -1000 Message-Id: <153357be5c74393febaccbe37b0ff514401a52cd.1690486929.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 ; Thu, 27 Jul 2023 19:44:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184992 From: Ovidiu Panait Upstream marked some testcases as "KNOWN BROKEN" and introduced the "--skip-broken" flag to ignore them when running the testsuite (commits [1] and [2]). Backport these two commits to get rid of the last remaining ptest failures. Also, add the "--skip-broken" option to the run-ptest script. [1] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=28520bf114b3 [2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=daa86d663476 Signed-off-by: Ovidiu Panait Signed-off-by: Richard Purdie (cherry picked from commit 62148b978b26b5fcd1a2fa3a0ff82ef814f4e7ec) Signed-off-by: Steve Sakoman --- ...Mark-and-ignore-broken-test-failures.patch | 128 +++++ ...dd-broken-files-for-all-broken-tests.patch | 454 ++++++++++++++++++ meta/recipes-extended/mdadm/files/run-ptest | 2 +- meta/recipes-extended/mdadm/mdadm_4.2.bb | 2 + 4 files changed, 585 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch create mode 100644 meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch diff --git a/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch b/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch new file mode 100644 index 0000000000..c55bfb125b --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch @@ -0,0 +1,128 @@ +From feab1f72fcf032a4d21d0a69eb61b23a5ddb3352 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:18 -0600 +Subject: [PATCH 5/6] mdadm/test: Mark and ignore broken test failures + +Add functionality to continue if a test marked as broken fails. + +To mark a test as broken, a file with the same name but with the suffix +'.broken' should exist. The first line in the file will be printed with +a KNOWN BROKEN message; the rest of the file can describe the how the +test is broken. + +Also adds --skip-broken and --skip-always-broken to skip all the tests +that have a .broken file or to skip all tests whose .broken file's first +line contains the keyword always. + +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=28520bf114b3 + +[OP: adjusted context for mdadm-4.2] +Signed-off-by: Ovidiu Panait +--- + test | 37 +++++++++++++++++++++++++++++++++++-- + 1 file changed, 35 insertions(+), 2 deletions(-) + +diff --git a/test b/test +index 8f189d9..ee8fba1 100755 +--- a/test ++++ b/test +@@ -10,6 +10,8 @@ devlist= + + savelogs=0 + exitonerror=1 ++ctrl_c_error=0 ++skipbroken=0 + prefix='[0-9][0-9]' + + # use loop devices by default if doesn't specify --dev +@@ -35,6 +37,7 @@ die() { + + ctrl_c() { + exitonerror=1 ++ ctrl_c_error=1 + } + + # mdadm always adds --quiet, and we want to see any unexpected messages +@@ -79,8 +82,21 @@ mdadm() { + do_test() { + _script=$1 + _basename=`basename $_script` ++ _broken=0 ++ + if [ -f "$_script" ] + then ++ if [ -f "${_script}.broken" ]; then ++ _broken=1 ++ _broken_msg=$(head -n1 "${_script}.broken" | tr -d '\n') ++ if [ "$skipbroken" == "all" ]; then ++ return ++ elif [ "$skipbroken" == "always" ] && ++ [[ "$_broken_msg" == *always* ]]; then ++ return ++ fi ++ fi ++ + rm -f $targetdir/stderr + # this might have been reset: restore the default. + echo 2000 > /proc/sys/dev/raid/speed_limit_max +@@ -97,10 +113,15 @@ do_test() { + else + save_log fail + _fail=1 ++ if [ "$_broken" == "1" ]; then ++ echo " (KNOWN BROKEN TEST: $_broken_msg)" ++ fi + fi + [ "$savelogs" == "1" ] && + mv -f $targetdir/log $logdir/$_basename.log +- [ "$_fail" == "1" -a "$exitonerror" == "1" ] && exit 1 ++ [ "$ctrl_c_error" == "1" ] && exit 1 ++ [ "$_fail" == "1" -a "$exitonerror" == "1" \ ++ -a "$_broken" == "0" ] && exit 1 + fi + } + +@@ -117,6 +138,8 @@ do_help() { + --logdir=directory Directory to save all logfiles in + --save-logs Usually use with --logdir together + --keep-going | --no-error Don't stop on error, ie. run all tests ++ --skip-broken Skip tests that are known to be broken ++ --skip-always-broken Skip tests that are known to always fail + --dev=loop|lvm|ram|disk Use loop devices (default), LVM, RAM or disk + --disks= Provide a bunch of physical devices for test + --volgroup=name LVM volume group for LVM test +@@ -211,6 +234,12 @@ parse_args() { + --keep-going | --no-error ) + exitonerror=0 + ;; ++ --skip-broken ) ++ skipbroken=all ++ ;; ++ --skip-always-broken ) ++ skipbroken=always ++ ;; + --disable-multipath ) + unset MULTIPATH + ;; +@@ -275,7 +304,11 @@ main() { + if [ $script == "$testdir/11spare-migration" ];then + continue + fi +- do_test $script ++ case $script in ++ *.broken) ;; ++ *) ++ do_test $script ++ esac + done + fi + +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch b/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch new file mode 100644 index 0000000000..115b23bac5 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch @@ -0,0 +1,454 @@ +From fd1c26ba129b069d9f73afaefdbe53683de3814a Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:19 -0600 +Subject: [PATCH 6/6] tests: Add broken files for all broken tests + +Each broken file contains the rough frequency of brokeness as well +as a brief explanation of what happens when it breaks. Estimates +of failure rates are not statistically significant and can vary +run to run. + +This is really just a view from my window. Tests were done on a +small VM with the default loop devices, not real hardware. We've +seen different kernel configurations can cause bugs to appear as well +(ie. different block schedulers). It may also be that different race +conditions will be seen on machines with different performance +characteristics. + +These annotations were done with the kernel currently in md/md-next: + + facef3b96c5b ("md: Notify sysfs sync_completed in md_reap_sync_thread()") + +Signed-off-by: Logan Gunthorpe +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=daa86d663476 + +Signed-off-by: Ovidiu Panait +--- + tests/01r5integ.broken | 7 ++++ + tests/01raid6integ.broken | 7 ++++ + tests/04r5swap.broken | 7 ++++ + tests/07autoassemble.broken | 8 ++++ + tests/07autodetect.broken | 5 +++ + tests/07changelevelintr.broken | 9 +++++ + tests/07changelevels.broken | 9 +++++ + tests/07reshape5intr.broken | 45 ++++++++++++++++++++++ + tests/07revert-grow.broken | 31 +++++++++++++++ + tests/07revert-shrink.broken | 9 +++++ + tests/07testreshape5.broken | 12 ++++++ + tests/09imsm-assemble.broken | 6 +++ + tests/09imsm-create-fail-rebuild.broken | 5 +++ + tests/09imsm-overlap.broken | 7 ++++ + tests/10ddf-assemble-missing.broken | 6 +++ + tests/10ddf-fail-create-race.broken | 7 ++++ + tests/10ddf-fail-two-spares.broken | 5 +++ + tests/10ddf-incremental-wrong-order.broken | 9 +++++ + tests/14imsm-r1_2d-grow-r1_3d.broken | 5 +++ + tests/14imsm-r1_2d-takeover-r0_2d.broken | 6 +++ + tests/18imsm-r10_4d-takeover-r0_2d.broken | 5 +++ + tests/18imsm-r1_2d-takeover-r0_1d.broken | 6 +++ + tests/19raid6auto-repair.broken | 5 +++ + tests/19raid6repair.broken | 5 +++ + 24 files changed, 226 insertions(+) + create mode 100644 tests/01r5integ.broken + create mode 100644 tests/01raid6integ.broken + create mode 100644 tests/04r5swap.broken + create mode 100644 tests/07autoassemble.broken + create mode 100644 tests/07autodetect.broken + create mode 100644 tests/07changelevelintr.broken + create mode 100644 tests/07changelevels.broken + create mode 100644 tests/07reshape5intr.broken + create mode 100644 tests/07revert-grow.broken + create mode 100644 tests/07revert-shrink.broken + create mode 100644 tests/07testreshape5.broken + create mode 100644 tests/09imsm-assemble.broken + create mode 100644 tests/09imsm-create-fail-rebuild.broken + create mode 100644 tests/09imsm-overlap.broken + create mode 100644 tests/10ddf-assemble-missing.broken + create mode 100644 tests/10ddf-fail-create-race.broken + create mode 100644 tests/10ddf-fail-two-spares.broken + create mode 100644 tests/10ddf-incremental-wrong-order.broken + create mode 100644 tests/14imsm-r1_2d-grow-r1_3d.broken + create mode 100644 tests/14imsm-r1_2d-takeover-r0_2d.broken + create mode 100644 tests/18imsm-r10_4d-takeover-r0_2d.broken + create mode 100644 tests/18imsm-r1_2d-takeover-r0_1d.broken + create mode 100644 tests/19raid6auto-repair.broken + create mode 100644 tests/19raid6repair.broken + +diff --git a/tests/01r5integ.broken b/tests/01r5integ.broken +new file mode 100644 +index 0000000..2073763 +--- /dev/null ++++ b/tests/01r5integ.broken +@@ -0,0 +1,7 @@ ++fails rarely ++ ++Fails about 1 in every 30 runs with a sha mismatch error: ++ ++ c49ab26e1b01def7874af9b8a6d6d0c29fdfafe6 /dev/md0 does not match ++ 15dc2f73262f811ada53c65e505ceec9cf025cb9 /dev/md0 with /dev/loop3 ++ missing +diff --git a/tests/01raid6integ.broken b/tests/01raid6integ.broken +new file mode 100644 +index 0000000..1df735f +--- /dev/null ++++ b/tests/01raid6integ.broken +@@ -0,0 +1,7 @@ ++fails infrequently ++ ++Fails about 1 in 5 with a sha mismatch: ++ ++ 8286c2bc045ae2cfe9f8b7ae3a898fa25db6926f /dev/md0 does not match ++ a083a0738b58caab37fd568b91b177035ded37df /dev/md0 with /dev/loop2 and ++ /dev/loop3 missing +diff --git a/tests/04r5swap.broken b/tests/04r5swap.broken +new file mode 100644 +index 0000000..e38987d +--- /dev/null ++++ b/tests/04r5swap.broken +@@ -0,0 +1,7 @@ ++always fails ++ ++Fails with errors: ++ ++ mdadm: /dev/loop0 has no superblock - assembly aborted ++ ++ ERROR: no recovery happening +diff --git a/tests/07autoassemble.broken b/tests/07autoassemble.broken +new file mode 100644 +index 0000000..8be0940 +--- /dev/null ++++ b/tests/07autoassemble.broken +@@ -0,0 +1,8 @@ ++always fails ++ ++Prints lots of messages, but the array doesn't assemble. Error ++possibly related to: ++ ++ mdadm: /dev/md/1 is busy - skipping ++ mdadm: no recogniseable superblock on /dev/md/testing:0 ++ mdadm: /dev/md/2 is busy - skipping +diff --git a/tests/07autodetect.broken b/tests/07autodetect.broken +new file mode 100644 +index 0000000..294954a +--- /dev/null ++++ b/tests/07autodetect.broken +@@ -0,0 +1,5 @@ ++always fails ++ ++Fails with error: ++ ++ ERROR: no resync happening +diff --git a/tests/07changelevelintr.broken b/tests/07changelevelintr.broken +new file mode 100644 +index 0000000..284b490 +--- /dev/null ++++ b/tests/07changelevelintr.broken +@@ -0,0 +1,9 @@ ++always fails ++ ++Fails with errors: ++ ++ mdadm: this change will reduce the size of the array. ++ use --grow --array-size first to truncate array. ++ e.g. mdadm --grow /dev/md0 --array-size 56832 ++ ++ ERROR: no reshape happening +diff --git a/tests/07changelevels.broken b/tests/07changelevels.broken +new file mode 100644 +index 0000000..9b930d9 +--- /dev/null ++++ b/tests/07changelevels.broken +@@ -0,0 +1,9 @@ ++always fails ++ ++Fails with errors: ++ ++ mdadm: /dev/loop0 is smaller than given size. 18976K < 19968K + metadata ++ mdadm: /dev/loop1 is smaller than given size. 18976K < 19968K + metadata ++ mdadm: /dev/loop2 is smaller than given size. 18976K < 19968K + metadata ++ ++ ERROR: /dev/md0 isn't a block device. +diff --git a/tests/07reshape5intr.broken b/tests/07reshape5intr.broken +new file mode 100644 +index 0000000..efe52a6 +--- /dev/null ++++ b/tests/07reshape5intr.broken +@@ -0,0 +1,45 @@ ++always fails ++ ++This patch, recently added to md-next causes the test to always fail: ++ ++7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex ++held") ++ ++The new error is simply: ++ ++ ERROR: no reshape happening ++ ++Before the patch, the error seen is below. ++ ++-- ++ ++fails infrequently ++ ++Fails roughly 1 in 4 runs with errors: ++ ++ mdadm: Merging with already-assembled /dev/md/0 ++ mdadm: cannot re-read metadata from /dev/loop6 - aborting ++ ++ ERROR: no reshape happening ++ ++Also have seen a random deadlock: ++ ++ INFO: task mdadm:109702 blocked for more than 30 seconds. ++ Not tainted 5.18.0-rc3-eid-vmlocalyes-dbg-00095-g3c2b5427979d #2040 ++ "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. ++ task:mdadm state:D stack: 0 pid:109702 ppid: 1 flags:0x00004000 ++ Call Trace: ++ ++ __schedule+0x67e/0x13b0 ++ schedule+0x82/0x110 ++ mddev_suspend+0x2e1/0x330 ++ suspend_lo_store+0xbd/0x140 ++ md_attr_store+0xcb/0x130 ++ sysfs_kf_write+0x89/0xb0 ++ kernfs_fop_write_iter+0x202/0x2c0 ++ new_sync_write+0x222/0x330 ++ vfs_write+0x3bc/0x4d0 ++ ksys_write+0xd9/0x180 ++ __x64_sys_write+0x43/0x50 ++ do_syscall_64+0x3b/0x90 ++ entry_SYSCALL_64_after_hwframe+0x44/0xae +diff --git a/tests/07revert-grow.broken b/tests/07revert-grow.broken +new file mode 100644 +index 0000000..9b6db86 +--- /dev/null ++++ b/tests/07revert-grow.broken +@@ -0,0 +1,31 @@ ++always fails ++ ++This patch, recently added to md-next causes the test to always fail: ++ ++7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex held") ++ ++The errors are: ++ ++ mdadm: No active reshape to revert on /dev/loop0 ++ ERROR: active raid5 not found ++ ++Before the patch, the error seen is below. ++ ++-- ++ ++fails rarely ++ ++Fails about 1 in every 30 runs with errors: ++ ++ mdadm: Merging with already-assembled /dev/md/0 ++ mdadm: backup file /tmp/md-backup inaccessible: No such file or directory ++ mdadm: failed to add /dev/loop1 to /dev/md/0: Invalid argument ++ mdadm: failed to add /dev/loop2 to /dev/md/0: Invalid argument ++ mdadm: failed to add /dev/loop3 to /dev/md/0: Invalid argument ++ mdadm: failed to add /dev/loop0 to /dev/md/0: Invalid argument ++ mdadm: /dev/md/0 assembled from 1 drive - need all 5 to start it ++ (use --run to insist). ++ ++ grep: /sys/block/md*/md/sync_action: No such file or directory ++ ++ ERROR: active raid5 not found +diff --git a/tests/07revert-shrink.broken b/tests/07revert-shrink.broken +new file mode 100644 +index 0000000..c33c39e +--- /dev/null ++++ b/tests/07revert-shrink.broken +@@ -0,0 +1,9 @@ ++always fails ++ ++Fails with errors: ++ ++ mdadm: this change will reduce the size of the array. ++ use --grow --array-size first to truncate array. ++ e.g. mdadm --grow /dev/md0 --array-size 53760 ++ ++ ERROR: active raid5 not found +diff --git a/tests/07testreshape5.broken b/tests/07testreshape5.broken +new file mode 100644 +index 0000000..a8ce03e +--- /dev/null ++++ b/tests/07testreshape5.broken +@@ -0,0 +1,12 @@ ++always fails ++ ++Test seems to run 'test_stripe' at $dir directory, but $dir is never ++set. If $dir is adjusted to $PWD, the test still fails with: ++ ++ mdadm: /dev/loop2 is not suitable for this array. ++ mdadm: create aborted ++ ++ return 1 ++ ++ cmp -s -n 8192 /dev/md0 /tmp/RandFile ++ ++ echo cmp failed ++ cmp failed ++ ++ exit 2 +diff --git a/tests/09imsm-assemble.broken b/tests/09imsm-assemble.broken +new file mode 100644 +index 0000000..a6d4d5c +--- /dev/null ++++ b/tests/09imsm-assemble.broken +@@ -0,0 +1,6 @@ ++fails infrequently ++ ++Fails roughly 1 in 10 runs with errors: ++ ++ mdadm: /dev/loop2 is still in use, cannot remove. ++ /dev/loop2 removal from /dev/md/container should have succeeded +diff --git a/tests/09imsm-create-fail-rebuild.broken b/tests/09imsm-create-fail-rebuild.broken +new file mode 100644 +index 0000000..40c4b29 +--- /dev/null ++++ b/tests/09imsm-create-fail-rebuild.broken +@@ -0,0 +1,5 @@ ++always fails ++ ++Fails with error: ++ ++ **Error**: Array size mismatch - expected 3072, actual 16384 +diff --git a/tests/09imsm-overlap.broken b/tests/09imsm-overlap.broken +new file mode 100644 +index 0000000..e7ccab7 +--- /dev/null ++++ b/tests/09imsm-overlap.broken +@@ -0,0 +1,7 @@ ++always fails ++ ++Fails with errors: ++ ++ **Error**: Offset mismatch - expected 15360, actual 0 ++ **Error**: Offset mismatch - expected 15360, actual 0 ++ /dev/md/vol3 failed check +diff --git a/tests/10ddf-assemble-missing.broken b/tests/10ddf-assemble-missing.broken +new file mode 100644 +index 0000000..bfd8d10 +--- /dev/null ++++ b/tests/10ddf-assemble-missing.broken +@@ -0,0 +1,6 @@ ++always fails ++ ++Fails with errors: ++ ++ ERROR: /dev/md/vol0 has unexpected state on /dev/loop10 ++ ERROR: unexpected number of online disks on /dev/loop10 +diff --git a/tests/10ddf-fail-create-race.broken b/tests/10ddf-fail-create-race.broken +new file mode 100644 +index 0000000..6c0df02 +--- /dev/null ++++ b/tests/10ddf-fail-create-race.broken +@@ -0,0 +1,7 @@ ++usually fails ++ ++Fails about 9 out of 10 times with many errors: ++ ++ mdadm: cannot open MISSING: No such file or directory ++ ERROR: non-degraded array found ++ ERROR: disk 0 not marked as failed in meta data +diff --git a/tests/10ddf-fail-two-spares.broken b/tests/10ddf-fail-two-spares.broken +new file mode 100644 +index 0000000..eeea56d +--- /dev/null ++++ b/tests/10ddf-fail-two-spares.broken +@@ -0,0 +1,5 @@ ++fails infrequently ++ ++Fails roughly 1 in 3 with error: ++ ++ ERROR: /dev/md/vol1 should be optimal in meta data +diff --git a/tests/10ddf-incremental-wrong-order.broken b/tests/10ddf-incremental-wrong-order.broken +new file mode 100644 +index 0000000..a5af3ba +--- /dev/null ++++ b/tests/10ddf-incremental-wrong-order.broken +@@ -0,0 +1,9 @@ ++always fails ++ ++Fails with errors: ++ ERROR: sha1sum of /dev/md/vol0 has changed ++ ERROR: /dev/md/vol0 has unexpected state on /dev/loop10 ++ ERROR: unexpected number of online disks on /dev/loop10 ++ ERROR: /dev/md/vol0 has unexpected state on /dev/loop8 ++ ERROR: unexpected number of online disks on /dev/loop8 ++ ERROR: sha1sum of /dev/md/vol0 has changed +diff --git a/tests/14imsm-r1_2d-grow-r1_3d.broken b/tests/14imsm-r1_2d-grow-r1_3d.broken +new file mode 100644 +index 0000000..4ef1d40 +--- /dev/null ++++ b/tests/14imsm-r1_2d-grow-r1_3d.broken +@@ -0,0 +1,5 @@ ++always fails ++ ++Fails with error: ++ ++ mdadm/tests/func.sh: line 325: dvsize/chunk: division by 0 (error token is "chunk") +diff --git a/tests/14imsm-r1_2d-takeover-r0_2d.broken b/tests/14imsm-r1_2d-takeover-r0_2d.broken +new file mode 100644 +index 0000000..89cd4e5 +--- /dev/null ++++ b/tests/14imsm-r1_2d-takeover-r0_2d.broken +@@ -0,0 +1,6 @@ ++always fails ++ ++Fails with error: ++ ++ tests/func.sh: line 325: dvsize/chunk: division by 0 (error token ++ is "chunk") +diff --git a/tests/18imsm-r10_4d-takeover-r0_2d.broken b/tests/18imsm-r10_4d-takeover-r0_2d.broken +new file mode 100644 +index 0000000..a27399f +--- /dev/null ++++ b/tests/18imsm-r10_4d-takeover-r0_2d.broken +@@ -0,0 +1,5 @@ ++fails rarely ++ ++Fails about 1 run in 100 with message: ++ ++ ERROR: size is wrong for /dev/md/vol0: 2 * 5120 (chunk=128) = 20480, not 0 +diff --git a/tests/18imsm-r1_2d-takeover-r0_1d.broken b/tests/18imsm-r1_2d-takeover-r0_1d.broken +new file mode 100644 +index 0000000..aa1982e +--- /dev/null ++++ b/tests/18imsm-r1_2d-takeover-r0_1d.broken +@@ -0,0 +1,6 @@ ++always fails ++ ++Fails with error: ++ ++ tests/func.sh: line 325: dvsize/chunk: division by 0 (error token ++ is "chunk") +diff --git a/tests/19raid6auto-repair.broken b/tests/19raid6auto-repair.broken +new file mode 100644 +index 0000000..e91a142 +--- /dev/null ++++ b/tests/19raid6auto-repair.broken +@@ -0,0 +1,5 @@ ++always fails ++ ++Fails with: ++ ++ "should detect errors" +diff --git a/tests/19raid6repair.broken b/tests/19raid6repair.broken +new file mode 100644 +index 0000000..e91a142 +--- /dev/null ++++ b/tests/19raid6repair.broken +@@ -0,0 +1,5 @@ ++always fails ++ ++Fails with: ++ ++ "should detect errors" +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest index fae8071d43..2380c322a9 100644 --- a/meta/recipes-extended/mdadm/files/run-ptest +++ b/meta/recipes-extended/mdadm/files/run-ptest @@ -2,6 +2,6 @@ mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail -dir=. ./test --keep-going --disable-integrity +dir=. ./test --keep-going --disable-integrity --skip-broken rm -rf /mdadm-testing-dir/* diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index f616746368..50d9548747 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -36,6 +36,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \ file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \ file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \ + file://0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch \ + file://0006-tests-Add-broken-files-for-all-broken-tests.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" From patchwork Thu Jul 27 19:43:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28035 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 3574DC04E69 for ; Thu, 27 Jul 2023 19:44:32 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.16729.1690487068414672289 for ; Thu, 27 Jul 2023 12:44:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=BkQa+2Eq; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-55adfa61199so921318a12.2 for ; Thu, 27 Jul 2023 12:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487067; x=1691091867; 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=haPJcas4S/Y4sEpJZoFTx4b/a9igKvBgfuTEM2BGUzI=; b=BkQa+2EqorrK1CQNGKTA/x+ZFUaimQv+fgPyDTo1NCA/9c9B9TEa0UuBqY6V/gvSRC 0rrXiBX2CjV2FjX7A3Jb3A2Z7alx6W+N/c/3I3JuMyXTLWEexOooCiS+pL8z/ilE1W3/ MYTw3JhcKfwOYJaoWu5wbHs/Tx9jgNL9mMWcMipBhpasLzMQLJWQC72+QCo4fEfqbtpk Kso8zijifgcj6OI+L+1voCrXbCj/lpMntv6OV6AM2XaOlaXBpYg32t+bKnGa3v8Az7cQ uyOruz+UDeCEE0CYZj4G6FklkI1l7GP3pY8Z166KJVIg8Jt1Yi2Bqr11IxrhJVz2p6u0 G+2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487067; x=1691091867; 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=haPJcas4S/Y4sEpJZoFTx4b/a9igKvBgfuTEM2BGUzI=; b=FXVxICTpzaEFXQZYzD7R2uvxkHahol2WJkhsLnGZ+qIrtruk9cjA/cOZpLWSPhkCs8 +AbC4rqnVJkvC1k9hfbQA1fKc6mNJeVAAWpPEJPYosp/f24eYYlL47+ua0nMrj+wDknZ xy+8uQBTXFcKUrD0dcG1gzaOR4yUDzOQZq4mm0Ub+Ari077AvAmiaTRNlLZ/uuqCyOwx WOGWwxGl57v7zMAyXanciTpW6Ie//PXyJGwjXeJLf3MH9NsKXRYjRkENUKJ/ygmfsW92 cZAcO7nyPtmtOh+pDwsxT/PUMzDprOtuSzt1ZkmCpS2TvZrqVSHuAiGVyCg7GsSi9XLt B0DQ== X-Gm-Message-State: ABy/qLY/QJ4kTYqnRkHmORQrMo1Tk9tedTrCEadVNVOJ+Po5NPtNSkHm /g2FL6500DJW+FKIV/1HFNJFclAyiDPN8wEVLGI= X-Google-Smtp-Source: APBJJlH+L/+MDw+rWtJzdZ+EIu+BUXpNV0QANy/q5BINyDnmbEu+yZ6cbtStVCthah6MjTbKEL6lIA== X-Received: by 2002:a17:90b:190f:b0:268:8a3:6010 with SMTP id mp15-20020a17090b190f00b0026808a36010mr233474pjb.49.1690487067479; Thu, 27 Jul 2023 12:44:27 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 18/27] mdadm: re-add mdadm-ptest to PTESTS_SLOW Date: Thu, 27 Jul 2023 09:43:36 -1000 Message-Id: <174ef92965acd605e5aa5ed26afb3f8d556e98b2.1690486929.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 ; Thu, 27 Jul 2023 19:44:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184993 From: Ovidiu Panait The ptest problems reported in e21021dc00ec ("mdadm: drop from PTESTS_SLOW") should now be fixed, so mdadm can be added back to PTESTS_SLOW (a qemux86-64 test run takes about ~12 minutes to execute with kvm). root@qemux86-64:~# ptest-runner mdadm START: ptest-runner 2023-06-30T08:25 BEGIN: /usr/lib/mdadm/ptest PASS: /usr/lib/mdadm/ptest/tests/00linear PASS: /usr/lib/mdadm/ptest/tests/00multipath ... PASS: /usr/lib/mdadm/ptest/tests/19repair-does-not-destroy PASS: /usr/lib/mdadm/ptest/tests/20raid5journal PASS: /usr/lib/mdadm/ptest/tests/21raid5cache DURATION: 723 END: /usr/lib/mdadm/ptest 2023-06-30T09:16 STOP: ptest-runner TOTAL: 1 FAIL: 0 For the testcases to run correctly, there must be enough rootfs space to create 13 loop devices. Similar to strace and lttng-tools, add a new IMAGE_ROOTFS_EXTRA_SPACE entry for mdadm-ptest. Signed-off-by: Ovidiu Panait Signed-off-by: Richard Purdie (cherry picked from commit dfefff63c547adb1add0c8e3a308b2d0bd6cfc8c) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/ptest-packagelists.inc | 3 +-- meta/recipes-core/images/core-image-ptest.bb | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 003348906a..674801d8b8 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -96,6 +96,7 @@ PTESTS_SLOW = "\ libgcrypt \ libmodule-build-perl \ lttng-tools \ + mdadm \ openssh \ openssl \ parted \ @@ -119,7 +120,6 @@ PTESTS_PROBLEMS:append:x86 = " valgrind" # rt-tests \ # Needs to be checked whether it runs at all # bash \ # Test outcomes are non-deterministic by design # ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py -# mdadm \ # Tests rely on non-deterministic sleep() amounts # libinput \ # Tests need an unloaded system to be reliable # libpam \ # Needs pam DISTRO_FEATURE # numactl \ # qemu not (yet) configured for numa; all tests are skipped @@ -132,7 +132,6 @@ PTESTS_PROBLEMS = "\ rt-tests \ bash \ ifupdown \ - mdadm \ libinput \ libpam \ libseccomp \ diff --git a/meta/recipes-core/images/core-image-ptest.bb b/meta/recipes-core/images/core-image-ptest.bb index 90c26641ba..ddc56c8f9f 100644 --- a/meta/recipes-core/images/core-image-ptest.bb +++ b/meta/recipes-core/images/core-image-ptest.bb @@ -19,6 +19,7 @@ BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS').split()] # strace-ptest in particular needs more than 500MB IMAGE_OVERHEAD_FACTOR = "1.0" IMAGE_ROOTFS_EXTRA_SPACE = "324288" +IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-mdadm = "1524288" IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-strace = "1024288" IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288" From patchwork Thu Jul 27 19:43:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28033 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 254BBC00528 for ; Thu, 27 Jul 2023 19:44:32 +0000 (UTC) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by mx.groups.io with SMTP id smtpd.web11.16766.1690487070319108340 for ; Thu, 27 Jul 2023 12:44:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Uh6+5bD+; spf=softfail (domain: sakoman.com, ip: 209.85.167.169, mailfrom: steve@sakoman.com) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3a5abb5e2aeso1107559b6e.0 for ; Thu, 27 Jul 2023 12:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487069; x=1691091869; 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=elSirK48+rEGCGzNdFlYj8W5V1jzoy1eV+g/1kwDSF0=; b=Uh6+5bD+LHd9yBc2BEtNBT/WYoaB0mcnOc7fuJbpOuKt6oXNIkhhts7A6ZeBbWTV6f dtNj7pnxVl6SKbekUlm8RdHPwUW20GfCCowLhgR9F1jTLRMWWmr4NPzvgcbvJKG8RVY2 F2K39c2WRRVrTBWeze4T3qZnz+5kO1KJGZUyqEBPlAprqA+f8gl1BazWNDRGefDmIKPO fJUuX5GTb+0HJrB1td0lf8WVK1SF+/Fpkc/8QEF1cZprS3rlzzouGuOnDLF4DzKOTzsa 4jzota1OjOYM3Ke4KMPrdvk/ctf7RKr8PQhda9aG7/aDTMYogWWsFanR3beWsDeZ67mm jKkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487069; x=1691091869; 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=elSirK48+rEGCGzNdFlYj8W5V1jzoy1eV+g/1kwDSF0=; b=KuuFvjZCkcJNdzXO8m//j/tvkP6UW2k9Yfwg71qNQqorK9YJdJ+eP3SujNrDStoP4X tJMAXLjn68WflMPpAe3DgbABkapUs7aIT3EEXkOVdH97yfR7aStTKTVLJ45TUSrFJkaR w3DwmTCBfgJgFQ3DDc4JctiOtV/vohlCLYaBo24doQ14INgZRdzOcEdy4AcQ/LZXGZmt AAfnVAoGEa2j/oa5RbyWLl97vJZCM6jyxUaZDRkiEJQTIpOq+vTeVUMYOtVsl2+eH1xJ v1GSjtCJHpckMnBTAsiUL7GOyOYhHbmrpQn/0oKSopZ/X/LDyVizDXOjznmOSEnxQGnv 4loA== X-Gm-Message-State: ABy/qLZ+t2ag5L4aOrVev96ChJ4gitErut4p5L/cc/jVYZmr/XsH5NJS TbMC/MEAzwENUjI0/BRR3MroP35FnUFcVZEw2Do= X-Google-Smtp-Source: APBJJlFZ98wuOP8dwpEvkFr4g422h9SxCQYLWPxPpRmFs+XlMtfBcRIZeXkP2z/NGf6tJEBRtPTLDQ== X-Received: by 2002:a05:6808:124e:b0:397:ec35:f5a6 with SMTP id o14-20020a056808124e00b00397ec35f5a6mr153673oiv.57.1690487069291; Thu, 27 Jul 2023 12:44:29 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 19/27] python3: fix missing comma in get_module_deps3.py Date: Thu, 27 Jul 2023 09:43:37 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184994 From: Ross Burton Wes Tarro noticed a missing comma in a preplace() call, add it. That said, calling replace() with one argument results in a TypeError, so this is obviously dead code. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 9b2e2c8d809e7ca34451ec9702b029a00dfb410b) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3/get_module_deps3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3/get_module_deps3.py b/meta/recipes-devtools/python/python3/get_module_deps3.py index 0ca687d2eb..8e432b49af 100644 --- a/meta/recipes-devtools/python/python3/get_module_deps3.py +++ b/meta/recipes-devtools/python/python3/get_module_deps3.py @@ -32,7 +32,7 @@ def fix_path(dep_path): dep_path = dep_path[dep_path.find(pivot)+len(pivot):] if '/usr/bin' in dep_path: - dep_path = dep_path.replace('/usr/bin''${bindir}') + dep_path = dep_path.replace('/usr/bin','${bindir}') # Handle multilib, is there a better way? if '/usr/lib32' in dep_path: From patchwork Thu Jul 27 19:43:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28031 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 24947EB64DD for ; Thu, 27 Jul 2023 19:44:32 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.16732.1690487071895815197 for ; Thu, 27 Jul 2023 12:44:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=kQgvEp8M; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-267fcd6985cso934580a91.2 for ; Thu, 27 Jul 2023 12:44:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487071; x=1691091871; 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=vhV1uO58QQdhg3sCh9tELHTMB9wwNF+OJ5Rz6JrRpbQ=; b=kQgvEp8M8go1v4i2KZ5llNekWf/kiU+6bJuSuoXS5nlzPFBB+oJPNYJWhdQQ9kwtad jMr6/4arbPIlnodiR+qPzif40D0C89BMJXmTyyglUdHOkhGgR5+E0ZzmazRdPFQlcQUK cmlCb1oBLNtoedr+tI126CV8omMpWT+JCNye8rHYGGU3ZV1TLXD4zj0b5/7E6ANOmTdf KKq9xIHXhoR3VmDnHnVKSkIb61K+qbz2wzl0XMdOcHDnYhCSKL7UVSdhVJdRXyiDZkW+ /h452B/iKDnDu5TfLTVWica0ub3nBe4ydkMWxucGiW1Ix2e6XgIbtmTVqKrRVi6TfL/R 54uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487071; x=1691091871; 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=vhV1uO58QQdhg3sCh9tELHTMB9wwNF+OJ5Rz6JrRpbQ=; b=SIYFd28ckjiBMzOoxJQTWsdHR68GC8JMuNDSbHDC+hm8NHcwR5A4brJxugdmPndEyc fdgdgMid/4ZOC6tNhs9wE9SKIE7F1w/6DW81CvikKUeimeVmjkOei3X92IiLUepb7Xph vgR9LJPi5wphlsrM4vFKLEV8z37F73j/buVq2o37Rk0AcPfadQWT9h+q7pUNfutVK/sr YtrQhPOpRkd/kq7Ilg2ddqFyfiiVhagru6qMLHyUUxJfwj5ymzpI1vGKdl2Y/UW7atzE Ft/iZinm9Bn1EZuvOhvpCPBQAGAVU9xVTcW2PP0zly8o/zEOgXjaLhm+hHvnnE+lCCxS b1lA== X-Gm-Message-State: ABy/qLaUbPvLvzCdUVYF0ZE1WIeQTaLLdzbSgnS6ni9u3EVnDS+yyH8f mrDFWFwUXeasAQbFbswXMcsCKeN/FAqeeaq9ubU= X-Google-Smtp-Source: APBJJlG+XZdL7abfMqyX/oVMxm2x5QXQiTkCas4bWkM9e1LLxhkaQ05XsWacbJ7Puy8bWOJeJIBESA== X-Received: by 2002:a17:90a:6b4e:b0:24e:4b1c:74d2 with SMTP id x14-20020a17090a6b4e00b0024e4b1c74d2mr263725pjl.32.1690487070949; Thu, 27 Jul 2023 12:44:30 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 20/27] meson.bbclass: Point to llvm-config from native sysroot Date: Thu, 27 Jul 2023 09:43:38 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184995 From: Khem Raj Default search in meson would grok /usr/bin for llvm-config and if found will use it, which might add wrong paths into cflags/ldflags, since we depend on llvm-native when building gallium support ( thats when llvm-config is effective), its better to point llvm-config into native sysroot so it can add correct paths into compiler/linker cmdline Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit cc73360b9728812ed6123e30559b77d8e89cc21c) Signed-off-by: Steve Sakoman --- meta/classes-recipe/meson.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 48688bed75..7f5e9b1943 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -111,6 +111,7 @@ nm = ${@meson_array('BUILD_NM', d)} strip = ${@meson_array('BUILD_STRIP', d)} readelf = ${@meson_array('BUILD_READELF', d)} objcopy = ${@meson_array('BUILD_OBJCOPY', d)} +llvm-config = '${STAGING_BINDIR_NATIVE}/llvm-config' pkgconfig = 'pkg-config-native' ${@rust_tool(d, "BUILD_SYS")} From patchwork Thu Jul 27 19:43:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28039 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 26366C41513 for ; Thu, 27 Jul 2023 19:44:42 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web11.16769.1690487073744520215 for ; Thu, 27 Jul 2023 12:44:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=xztJ1Qj6; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-26813478800so851652a91.1 for ; Thu, 27 Jul 2023 12:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487073; x=1691091873; 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=7Jpd/OkzfqiNOCitgJzcAfxCj7LunRw7xyN6ZreMCdE=; b=xztJ1Qj6nUZwSGEmVqJZ9F7SGh5Scom2FHXRfNAwfFjk/VG1pfd3CIdmlzmtmo5mVb 6ly8gsm9Tswn41E772M4eJky3tGO9w7qs5VrfWKYGN8Oy3DUzrfVSoVdfN9pAojTo+1z FNdIUTK7l0uLPE6e3FkNuDpv3MdXLBoVDR2cwBoW0hKLLsrvIdpr8Zgr4n04bSUdA6vk 9HrhNL2r/k50wkIGIOvZq82xUVZnrBIrqBgo8TuZEYbHWUMEoSfM+WbQrGNVogLUebIJ kDFoUd/keJXAaXqAB2ctTqw+cfZA5hdcUnO4c98K2GlGXG8bIHW9eHdMYdSJlCpVS4R/ J8RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487073; x=1691091873; 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=7Jpd/OkzfqiNOCitgJzcAfxCj7LunRw7xyN6ZreMCdE=; b=G74eWJpNW31WsMCfu9534oVciehLXTcWJAGGf9WQ+Dt1rYErDsDvsAdbn5eAO0XpS1 qv/GgwKl5+bZ8iV3+w7NYltaNZbFKDLvGPNqZWlNofR2hcAVJSqd0hxZ7pmacxX6J2g8 2j97t9I/CgjkSs4szv2CElSqK1GS6iMUTdXUNxZuadbUU+NRitldArrH7XcztyQi3EYt 1biUAgXc2hcLhNUz3RZlkMEmrg0cQ7I7ibDssN3CFjdP9a2glK1WbIC8iHooh2O1MhFx N4eZBmdgXwyNzTuKn7e8JjASlclzIG8d+ua/E4oIYRco36aknv+JzYYqYLd2CalNSwly 588g== X-Gm-Message-State: ABy/qLarph9LbDzs/fFK6SD2JiuarRMf7C7e86JLb4EjtjW+g+hOh1IC 95Yema6WXX0SYLtxxQp0TpGj4Cp5XZgYrri2lj0= X-Google-Smtp-Source: APBJJlH1JzT2yQEFo676IDM7CosbnKXo7TiC7Fb0xOQvEHZNFzDycEKaVYtlx/N7q4uhTRsjF3rjAw== X-Received: by 2002:a17:90a:dc0c:b0:268:2f2:cc88 with SMTP id i12-20020a17090adc0c00b0026802f2cc88mr289732pjv.12.1690487072881; Thu, 27 Jul 2023 12:44:32 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 21/27] systemd-systemctl: fix errors in instance name expansion Date: Thu, 27 Jul 2023 09:43:39 -1000 Message-Id: <70107f1bc33b45da794b7a24b7325eb476516fdf.1690486929.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 ; Thu, 27 Jul 2023 19:44:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184996 From: Yuta Hayama If the instance name indicated by %i begins with a number, the meaning of the replacement string "\\1{}".format(instance) is ambiguous. To indicate group number 1 regardless of the instance name, use "\g<1>". Signed-off-by: Yuta Hayama Signed-off-by: Richard Purdie (cherry picked from commit d18b939fb08b37380ce95934da38e6522392621c) Signed-off-by: Steve Sakoman --- meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 514f747fe6..7fe751b397 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -202,7 +202,7 @@ class SystemdUnit(): try: for dependent in config.get('Install', prop): # expand any %i to instance (ignoring escape sequence %%) - dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent) + dependent = re.sub("([^%](%%)*)%i", "\\g<1>{}".format(instance), dependent) wants = systemdir / "{}.{}".format(dependent, dirstem) / service add_link(wants, target) From patchwork Thu Jul 27 19:43:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28038 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 33585C04E69 for ; Thu, 27 Jul 2023 19:44:42 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.16772.1690487075711210174 for ; Thu, 27 Jul 2023 12:44:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=SovTd3Hq; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-56345ab18b0so757317a12.3 for ; Thu, 27 Jul 2023 12:44:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487075; x=1691091875; 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=R5LyPvYb6yQ5cLKRfudL5mf/VTcUSP9Ijj7EbiAjT9A=; b=SovTd3HqiP3b57ikr71V5jib50GaJ0h8OVjTIitam7HSxt8YkvrdZ5YMCBFzgoId9+ k8xd3HVnp1F4+yvJHHtuIf/S1Sk5O9mA++EVO5UuyhTw8+O3QiYD6q6h2TFirWpwlikN FaXDojEhOCVoYKDHVPrqGLFMs4cpWuqqFFaRob3e7c3br77tdYMAz6fytYl7zYhd61xs YO6XbpnakeqZkAM11cDw43uQZfjJFTaohogqZO3wYknD1nX5bWpFzrJRUjdzaDSg5t+9 yZPfWVdsJ7dPFnsT8JO6jxvT0v9SdC6OhBXINM4KSHiyEECupKSmrdrVO7NwTqM5p4tq WR7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487075; x=1691091875; 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=R5LyPvYb6yQ5cLKRfudL5mf/VTcUSP9Ijj7EbiAjT9A=; b=dNRtGK4Ne6NbEI31+bM8WBEfMC8N/M4KhpZgV6g6LVzGxcWcT9t3+EcmywFnUea+3+ 3bhqZL+HMUQXHUW9BXaYpMhbDA+mDJQRr1HImYvI4BP1w3oCM5qx5ub2t3j+6LxWBysn C5cFPW2KBEW9t1FCyXeLbMg1Y5aaCZuCpnB2XyjiXmQdwuPiyGRhA2njxKbdGlVZlznf G6juWbQbHIlYHoWUEcERWar+M/dx+6FWfXLLBUFjxf77qw/u5PMCIZNHhZdQe5gPZSdk J2pTv1VJdV+cmtT4PaB5g1Bq+Hh2A4+5g/oaMHmAt8WG1DW4OwwmWDAO8/f+ZHcO/CHw KGuQ== X-Gm-Message-State: ABy/qLYfJ7t81sxNQdifdpQd9EtpBnKonlV2rViwcYmlG6mAFf9eYkim gH+IPdKtKGTRMjtGzRiaUxTfrnZGT3lKc6NMqg0= X-Google-Smtp-Source: APBJJlFDWf/Ouc8s5G6V5n0GWV9ZDmnwnBgeogd8SJKX2v9/xZMo59M7n8Z2jiMbupzw4lKJoDp8ig== X-Received: by 2002:a17:90b:1d86:b0:267:eeee:ab17 with SMTP id pf6-20020a17090b1d8600b00267eeeeab17mr251323pjb.45.1690487074735; Thu, 27 Jul 2023 12:44:34 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 22/27] oeqa/runtime/cases/rpm: fix wait_for_no_process_for_user failure case Date: Thu, 27 Jul 2023 09:43:40 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184997 From: Ross Burton str.format() doesn't use % notation, update the formatting to work. assertTrue() is a member of self not a global, and assertTrue(True) will always pass. Change this to just self.fail() as this is the failure case. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 017f3a0b1265c1a3b69c20bdb56bbf446111977e) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/rpm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/rpm.py b/meta/lib/oeqa/runtime/cases/rpm.py index fa86eb0537..a4ba4e6769 100644 --- a/meta/lib/oeqa/runtime/cases/rpm.py +++ b/meta/lib/oeqa/runtime/cases/rpm.py @@ -59,8 +59,8 @@ class RpmBasicTest(OERuntimeTestCase): return time.sleep(1) user_pss = [ps for ps in output.split("\n") if u + ' ' in ps] - msg = "There're %s 's process(es) still running: %s".format(u, "\n".join(user_pss)) - assertTrue(True, msg=msg) + msg = "User %s has processes still running: %s" % (u, "\n".join(user_pss)) + self.fail(msg=msg) def unset_up_test_user(u): # ensure no test1 process in running From patchwork Thu Jul 27 19:43:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28040 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 33066C00528 for ; Thu, 27 Jul 2023 19:44:42 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.16774.1690487077438646025 for ; Thu, 27 Jul 2023 12:44:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=akMstrpm; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-56334abe325so777142a12.3 for ; Thu, 27 Jul 2023 12:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487076; x=1691091876; 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=5YxB7wSVKCgcNivfb+a1Ag5ako/BO8AuQRcvnqE+Sqs=; b=akMstrpmil6wKPZac+22HZG/EJyqIJXnCYNlDUatN4COYTkP9LuleFyhiqzHz28trQ 7lUx2R7CGo/8hzj6cx6XmJ7ku/9NeokwzXyqodt8QQJcl3VfTllbFYkgf2lbnup6YzEl 0Wj8dHqF6sPdvwNwCy6kTm6z6A6RiZqzKAccp8PAzykyUeWq2rCWJOJgvM+/mDQNqLY2 iu65EWxZdc7q1UGHzfWgg12ptnh+fIGIB7rNfcnZKJAhH40jqO2WAI+I1CmEQh/9cT4/ daDZDt+5WnoSTK1nAV1IrvrEkg0mn5sUtySrMfPrt9TkOkJL2Wg5lgUyJE3DeTC8Yzri yr/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487076; x=1691091876; 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=5YxB7wSVKCgcNivfb+a1Ag5ako/BO8AuQRcvnqE+Sqs=; b=JvHPqj1KcUQG9X0J71fSd/5IFNC/N+F06bxSA5+ie0FaG3ZzqBiK1o3GUDCyYGXv/Z jaLCZmlOEISSh2KbdawPpliHusq/GM0r/c4C4XE8GiocLLRB8f0iKFo1QUef4cCyHO8Z DhpcNN5xTMclGxnZK3sNUrbNG6SsIGBaLFg2RYC2Uw5nZPNWBjHT1Qzy2FV6uooc6Y9b KtGKlH3ZW2/vpU32tr/Um7icwd9C6bIREwo3LxLyzm2Ag82wzv1pmSLlN1p/EMHB33kU HqVWiFGfR65eDTkPA/n7R0shO8aetaXan6YENcoL5xl7SKy12Lva6oP9RHpKM8mziqN9 FuQw== X-Gm-Message-State: ABy/qLayXLX2Vt8txy/mxSAtZf01EVFuSaDRtUMcI9vZSUucVl54WuuH e3oglkCxvzSXWyae1Z4NiQFEIcEWNIR8d9zGwQE= X-Google-Smtp-Source: APBJJlFEH3Yga2HleJw3WZRpeF0nqxdC/GFNmXhhFnT/P+X/Pf2p+Jp+DHhj1MbSbfKLon3peBurdQ== X-Received: by 2002:a17:90b:688:b0:268:105b:ca1c with SMTP id m8-20020a17090b068800b00268105bca1cmr252748pjz.32.1690487076428; Thu, 27 Jul 2023 12:44:36 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 23/27] rootfs_rpm: don't depend on opkg-native for update-alternatives Date: Thu, 27 Jul 2023 09:43:41 -1000 Message-Id: <49be8045a6595cb98413519d2e65e94345f026c1.1690486929.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 ; Thu, 27 Jul 2023 19:44:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184998 From: Ross Burton opkg-native hasn't provided update-alternatives since 2014[1] so this is the wrong dependency, and image.bbclass depends on the virtual provider virtual/update-alternatives-native already. [1] oe-core 1e2c38ce13f8e4b25d8656d237343380cbc970aa Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 51004376be9a6b9a4c38585d14d2516d90138319) Signed-off-by: Steve Sakoman --- meta/classes-recipe/rootfs_rpm.bbclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/classes-recipe/rootfs_rpm.bbclass b/meta/classes-recipe/rootfs_rpm.bbclass index 6eccd5a959..55f1cc92ca 100644 --- a/meta/classes-recipe/rootfs_rpm.bbclass +++ b/meta/classes-recipe/rootfs_rpm.bbclass @@ -20,11 +20,9 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("PACKAGE_INSTALL", "dnf" # Dnf is python based, so be sure python3-native is available to us. EXTRANATIVEPATH += "python3-native" -# opkg is needed for update-alternatives RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \ dnf-native:do_populate_sysroot \ - createrepo-c-native:do_populate_sysroot \ - opkg-native:do_populate_sysroot" + createrepo-c-native:do_populate_sysroot" do_rootfs[depends] += "${RPMROOTFSDEPENDS}" do_populate_sdk[depends] += "${RPMROOTFSDEPENDS}" From patchwork Thu Jul 27 19:43:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28037 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 26397C001DC for ; Thu, 27 Jul 2023 19:44:42 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.16734.1690487079058049323 for ; Thu, 27 Jul 2023 12:44:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=KWNyqQmA; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-26830595676so955557a91.2 for ; Thu, 27 Jul 2023 12:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487078; x=1691091878; 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=fDh57VxGPmSqGCt/RKNB7L/R49gwc9EvYauLzV/c8MU=; b=KWNyqQmAW0PYQAxDdCZchpQHP+v1ZD9SkHTO2swyM3V82KkzeZVwluT5jicjGnT6R1 c6dCaTLezepQ57Jfp2r9Sjo/zWN/0ZgrOfD69Fr+TziHYYy/it4OhX7N8y9ugoLgd8WT uahWtrhaQLJTyszwFQcuUALyZolYdioWdi18vORwxFy7t/PEICyArJzSlEdfhDH2rbkb ru1m9cpyKm7tvni9lPCImaqLHy7ltLBQq66YftuJ6nfDEJ6F5M7HsyWASH203GhmpOEn 0+JYnkwqfwXz8W+hTUJSTxkLStdGq2/WXFqOqhCGUvmgHwImECN8gPb3CuNhpzz8vPd2 l7Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487078; x=1691091878; 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=fDh57VxGPmSqGCt/RKNB7L/R49gwc9EvYauLzV/c8MU=; b=lrVqHpXhP56sVTnr4O5T6jDaijb/YXMQLXYeVGbHEO+EXvv1ffQ7YyHCrl69a27Fds rHL97njKyEnhPs9n0MUPOiIuZy3BggDYp0Ub5zOh2Gy9y1xwIYqxHCCSpt047jDiElPQ 2+HoWC38Du/jlO99aMFfR15jTJwhT62PF79fSFT7VhhGMeUS9Cn+GbxkX8K1aefNIGGl huzZ4VNrEKSlprEKVjhw9xpJDrJ+AacT2xTpy1dLYs1AHJgga3CW2Ja0aoyHzG5dbgS4 bDyDbHFrnhXDD1Fz+JfLK5TZM+NHRJ2p1B8FrhnzP+LzSkKdzY94K2LLcVruJonNevlf 6MNw== X-Gm-Message-State: ABy/qLZbLbD+rWCpTfQ3kSbfsbWsBOng6LaI3AAaLa2SA1UeTT84ffGH E05BrMslqSHiazD++sEMTxlIafpiTqosXJ41Kss= X-Google-Smtp-Source: APBJJlGpBP9YF7k5cT1TgiLZeSUS0PVTTwJEKh0UtwheD4Y/2itReZ9p7BRBW/TPIdQ8lHq6Cqy+yQ== X-Received: by 2002:a17:90a:bc94:b0:267:f66a:f25f with SMTP id x20-20020a17090abc9400b00267f66af25fmr284141pjr.11.1690487078186; Thu, 27 Jul 2023 12:44:38 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 24/27] oeqa/selftest/devtool: add unit test for "devtool add -b" Date: Thu, 27 Jul 2023 09:43:42 -1000 Message-Id: <2dca7cba28a08d63e0ca88bb9897e01661e177ef.1690486929.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 ; Thu, 27 Jul 2023 19:44:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184999 From: Yoann Congal Fix [Yocto #15085] Co-authored-by: Fawzi KHABER Signed-off-by: Yoann Congal Signed-off-by: Richard Purdie (cherry picked from commit d5eedf8ca689ccb433c2f5d0b324378f966dd627) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/devtool.py | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index f51de8efe0..7ea56d3133 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -366,6 +366,38 @@ class DevtoolAddTests(DevtoolBase): bindir = bindir[1:] self.assertTrue(os.path.isfile(os.path.join(installdir, bindir, 'pv')), 'pv binary not found in D') + def test_devtool_add_binary(self): + # Create a binary package containing a known test file + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + pn = 'tst-bin' + pv = '1.0' + test_file_dir = "var/lib/%s/" % pn + test_file_name = "test_file" + test_file_content = "TEST CONTENT" + test_file_package_root = os.path.join(tempdir, pn) + test_file_dir_full = os.path.join(test_file_package_root, test_file_dir) + bb.utils.mkdirhier(test_file_dir_full) + with open(os.path.join(test_file_dir_full, test_file_name), "w") as f: + f.write(test_file_content) + bin_package_path = os.path.join(tempdir, "%s.tar.gz" % pn) + runCmd("tar czf %s -C %s ." % (bin_package_path, test_file_package_root)) + + # Test devtool add -b on the binary package + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c cleansstate %s' % pn) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add -b %s %s' % (pn, bin_package_path)) + self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') + + # Build the resulting recipe + result = runCmd('devtool build %s' % pn) + installdir = get_bb_var('D', pn) + self.assertTrue(installdir, 'Could not query installdir variable') + + # Check that a known file from the binary package has indeed been installed + self.assertTrue(os.path.isfile(os.path.join(installdir, test_file_dir, test_file_name)), '%s not found in D' % test_file_name) + def test_devtool_add_git_local(self): # We need dbus built so that DEPENDS recognition works bitbake('dbus') From patchwork Thu Jul 27 19:43:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28041 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 262B1EB64DD for ; Thu, 27 Jul 2023 19:44:42 +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.web10.16735.1690487080672662830 for ; Thu, 27 Jul 2023 12:44:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=HkYYJJuj; 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-55ae2075990so797571a12.0 for ; Thu, 27 Jul 2023 12:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487080; x=1691091880; 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=hm79ROy3gCI/ExNTnNUt72YMz2v28M0cPXPRheIK5VU=; b=HkYYJJujl3xx5cbcYAoM6mNpT2lB3+7D7Hfn0F9cAHceh/liBr4VwSArOCcRl42je2 WUSGH6VAu6s2y0G3V3pYw6TbGZRAnkxiCm+lIsLVtQXio/a8ChOhAf83iYLiXZpTaF3I M+tCeGs6CQzTtm0zXVKloqMeQO8dmdEhyApnn9gnId0fJRXKwks+dz6vaGeG5g6hdlmz N0tGGCyT/kMvZgx/SXwQm59AnSKSCtH+p3tE9k8dYqJW3DcNX0tehIkorWqFyhv+xfo8 S2giaSStRvNmoO9euH5i4I8PznmbPylJAjsVI1s3WMNx+kg8cjA8xHM/oSEWNbCwQ38e wfYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487080; x=1691091880; 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=hm79ROy3gCI/ExNTnNUt72YMz2v28M0cPXPRheIK5VU=; b=Gn5cNeoQnHH6n2gDaEtnyFz+Zek9BNQ2BjjD2VynrD3y8w97y+ljAAkiRE095+drhY UMQlCZHWn9lJD1xy4oQOPcR8roKfF4l01D1TZtepNe1SrpV+Bog/Vq6UhydaMbOmQlGx 9H11utg9VCBEJvaNFASBdOL6EzlSyc5MfqWrbKu/Vvm2CMQSTaE82lvPcye030SnwpjM 1lJCXSpOFtucWx9HOejYSZe+/UuASXBxsiZFdj45SYIXoxY+NSW7w+3o+8lol6JAZeff lQhFOJrt+fGHgl4D7P7bXFSrXfGy2QaBQwjUbXOVzrjzIWSDlc2aZSk2UUS91n/X496s AP7w== X-Gm-Message-State: ABy/qLbwjAbyIk6dG0Y8e0F1Z7Q/xGnEJytji1ebXJq7LAox/RmfK5FX jmRY+5Jzgdbb+cM/zHUX1QgJJ/vciCb3c5nLeQQ= X-Google-Smtp-Source: APBJJlEpj39rdYbCgwABGEjRW8s2M+L1opn09fKuH9LL4eoGFAklexGDNvXieJi978Xib10HBnNR8A== X-Received: by 2002:a17:90a:558e:b0:268:5c3c:8681 with SMTP id c14-20020a17090a558e00b002685c3c8681mr242844pji.4.1690487079775; Thu, 27 Jul 2023 12:44:39 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 25/27] openssl: add PERLEXTERNAL path to test its existence Date: Thu, 27 Jul 2023 09:43:43 -1000 Message-Id: <2dda294698ea6bb797531cb4796af263fbf2f6be.1690486929.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 ; Thu, 27 Jul 2023 19:44:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185000 From: Jose Quaresma When upstream change is better to fail or removing the PERL5LIB if they are not need anymore. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 337ac1159644678508990927923ef8af30f34cd7) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb index f5f3f32a97..b849f9ca79 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb @@ -137,7 +137,9 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib" + test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" + HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target perl ${B}/configdata.pm --dump } From patchwork Thu Jul 27 19:43:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28043 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 26CCAC41513 for ; Thu, 27 Jul 2023 19:44:52 +0000 (UTC) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by mx.groups.io with SMTP id smtpd.web11.16780.1690487082495469416 for ; Thu, 27 Jul 2023 12:44:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ouipXmXz; spf=softfail (domain: sakoman.com, ip: 209.85.167.169, mailfrom: steve@sakoman.com) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-38c35975545so1125561b6e.1 for ; Thu, 27 Jul 2023 12:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487081; x=1691091881; 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=d6i5UEOTXYKEf6bahwCIBjQ3LNTHMawt+yvrs8J8gLY=; b=ouipXmXzIhorrfYvK3Tue7iSKlVo8OCHdaOtGYzYSSRBMzb2iEv67NoYa9Y1hrfZol DCrQVsSy6VO6G+7ixV//rlA0OeqkF8howIFdQNW7LOOW9PZJP1eDJRQtk1zqn9fs6Y36 Z9bwgmITdlm8Xu+QuxWC2Ci0SPsdgLqK33iaA2CtSo75U+8FjR/Cml1uk/itbrkvXbHC 7SOtOe0KYi6np7GddXC/FLamp6P0aIwKYmFjJAJEm77HjKP2r067Kdz6U9OkF4D5P2Dc ancFvmQjmNRUPc0JV7Hivzg3uJALv3USfap1agOeKD+SaucGxEgfSRIikeNqr2CURK/d vmZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487081; x=1691091881; 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=d6i5UEOTXYKEf6bahwCIBjQ3LNTHMawt+yvrs8J8gLY=; b=MWl97tffWm4PDCSswBvSjbSy7tpTNrWWiLnlVnVEcPHk8CY32sDz6SVciszm1nFPlm LEbuctpwDdLfbJQlxpncR8ha0zunbhp+1EAn5EEHiiE9E12SLimczMRs7Pr6pLepXDeS k7O1zS0oyA8ReDywtoMyG+hwNWnGJtdc4NFH4cgowBM5o223D9dlr8zzM9JLVW2pQNkv wZvXcFeqtnibG9lTepoXRY6FcxdI8vZrU+tc7ZfyJXmAiVK/p/bHYRdo1T+96VFOvppu gE4rKeDf6ssECaU2vqPkUApE4qjQDNpvRLviJ+G9aJSlIN5mJdWvVEIrpLO2kpkl3NFt 4R/g== X-Gm-Message-State: ABy/qLZFdPVqRz5+BnFPNuqqu/rMtqXpBJ9ZlClje7MSY/AODWqlImMo LnYTwEKsd1PWR7qiqu7/CfCOWe4s+zEwdROkk6s= X-Google-Smtp-Source: APBJJlEodRJOgAKzeFT4wPw41DMxU7G5cLXwBbGBQcrxj66M4en2thUi8kOfsvuwcX+EJsDSb3PPsA== X-Received: by 2002:a05:6808:408d:b0:3a4:4b42:612b with SMTP id db13-20020a056808408d00b003a44b42612bmr179526oib.42.1690487081378; Thu, 27 Jul 2023 12:44:41 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 26/27] openssl: use a glob on the PERLEXTERNAL to track updates on the path Date: Thu, 27 Jul 2023 09:43:44 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185001 From: Jose Quaresma The Text-Template was updated from 1.46 to 1.56 | ERROR: openssl-native-3.1.1-r0 do_configure: PERLEXTERNAL '/build/tmp/work/x86_64-linux/openssl-native/3.1.1-r0/openssl-3.1.1/external/perl/Text-Template-1.46/lib' not found! Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit b9a7739b01e31d0cc8358d99255e3e1b02a0a1a8) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssl/openssl_3.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb index b849f9ca79..432ab4032b 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb @@ -137,7 +137,7 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib" + PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target From patchwork Thu Jul 27 19:43:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 28042 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 26CA3EB64DD for ; Thu, 27 Jul 2023 19:44:52 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.16781.1690487084019132597 for ; Thu, 27 Jul 2023 12:44:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=BB0jYZp1; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-267ffa55791so839309a91.1 for ; Thu, 27 Jul 2023 12:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1690487083; x=1691091883; 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=6LfUfBIvrNwoIjyEKx0nBAgb6tnoNhyaDuRomDYh7TE=; b=BB0jYZp1GNNf9FPbamZP0P2pMNF9/gsa4GokRfyzVg3UUroMorAkBi/jZni0pzNMi3 Bs7pwCRlkeeEUwor9VazxlcgoiYGil6IpVhFV6ZOgL+pphRVhgdOfqqHLvrh8DEd+Shx QN4oo3QCrWaTMgOXxdXCBXhq+ANgp6uSmxli2gjZBTg4m3TtU2XvQg+mgj70ZrgqFlLQ 2H6uQF+rB3Qn8xintTBvbDAjn8a3x0CjBU7K9NKyBmAOcc/qQSqJoFBhHzrULn31yqTh kOdTHuki8wprnTZrbNYOjYN5vbcx9WBV/jeiMrFKa/Y4v/jKQjhCwPQyJ/J+ZaLtWTRi TgcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690487083; x=1691091883; 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=6LfUfBIvrNwoIjyEKx0nBAgb6tnoNhyaDuRomDYh7TE=; b=H3FiE4uEeFbaeDlKs5r0zhXiANNlxwP2Pgyl/jJ2wDH7IHNJUEfZIwTEeEsVn899Ur mYC7u+RjIbC4+cI7893HeVXQqJUCk2qzlCsWS+vnrRQLiAJJ9uvKe5tNEnUYd9lkACc7 uJ8woiZh0eb7GaKMc41r/1ulKt4dt6v0xNGAEf50qgm4BgIM85kNYJodb+9lHc6PGH9A dHq3TxkHhXAWuX75eXPKd97PHwIbPMVnCCZebeVyQEll4CPFB5Uba6wEvmlRRk14LrUh X5UbONPlAE+L2sXrEGUOojJJ0X1YOHBXBDkxJVfjUZxK7glMWdwSqDgpLEFSvhnRqnqk Y/WQ== X-Gm-Message-State: ABy/qLYX9dQyUzEDZIVdnJTfLFZUc1Nc4us4QLpBDQcIhIxhqpnqYBw/ SNgSPcJRRYLUe+opJ+kbXRkXTumYqfxK7F0lhmI= X-Google-Smtp-Source: APBJJlFLCn1cXQwGN4DT22L5v9mcdhTaQoEMpKXIpTGb6LaCN2ouzQBnuD1YwqYfNXFKwu6FASqiFg== X-Received: by 2002:a17:90a:d194:b0:268:4c01:eb56 with SMTP id fu20-20020a17090ad19400b002684c01eb56mr272002pjb.2.1690487083076; Thu, 27 Jul 2023 12:44:43 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a01dd00b0025bcdada95asm1620532pjd.38.2023.07.27.12.44.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 12:44:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 27/27] util-linux: add alternative links for ipcs,ipcrm Date: Thu, 27 Jul 2023 09:43:45 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 27 Jul 2023 19:44:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/185002 From: Benjamin Bouvier When enabling ipcs and ipcrm configuration into busybox, both tools are built and then deployed during do_rootfs. These operation lead to below issue (similar behavior happens for ipcs): do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). update-alternatives: Error: not linking .../build/tmp/work/board-poky-linux/board-image/1.0-r0/rootfs/usr/bin/ipcrm to /bin/busybox since .../build/tmp/work/board-poky-linux/board-image/1.0-r0/rootfs/usr/bin/ipcrm exists and is not a link Binaries enter in conflict with same named util-linux utilities during do_rootfs step. Adding ALTERNATIVE_LINK_NAME for both tools fix the issue. Signed-off-by: Benjamin Bouvier Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e4d60408b869c9cc2ccff794d4e271d993ec8a97) Signed-off-by: Steve Sakoman --- meta/recipes-core/util-linux/util-linux_2.38.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux_2.38.1.bb b/meta/recipes-core/util-linux/util-linux_2.38.1.bb index 9ea7a04e8a..c81405533c 100644 --- a/meta/recipes-core/util-linux/util-linux_2.38.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.38.1.bb @@ -234,6 +234,8 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" +ALTERNATIVE_LINK_NAME[ipcrm] = "${bindir}/ipcrm" +ALTERNATIVE_LINK_NAME[ipcs] = "${bindir}/ipcs" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" ALTERNATIVE:${PN}-last = "last lastb" ALTERNATIVE_LINK_NAME[last] = "${bindir}/last"