From patchwork Wed Aug 21 12:50:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48038 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2984C5472C for ; Wed, 21 Aug 2024 12:50:43 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.18866.1724244637303776790 for ; Wed, 21 Aug 2024 05:50:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=tE6pLmkm; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-70d28023accso4878375b3a.0 for ; Wed, 21 Aug 2024 05:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244636; x=1724849436; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sWfqdwuqT3PXvfYs1OWWaLZMfp8HRdH9BmrvbBP0Cqs=; b=tE6pLmkmApTieXgCewQIlwhTaMsOtEiOIoQbtWK80+/3BGFhcfBBnkZqFToKn/ENAQ YV/OtsiNRoxuiimefBBpa5+6P9od1arTLz+v0cJ8M+/W5zKlodMoLswlQ8pBkGnaVpK1 CQP3fmiecmBEmZjwqmd3LIAHR8oiZP0XhmXOoItS373hTZfFtQMn+7ggllVD53grPuSa 1n8SIxg5Q68BIToYRum3tRwbA1V8LPLCXPu4P8CYo8oYoqBK4mAI0sgyIS5lWKxPaLoh bG3lJ+XhLZ9GZf1/kdcZzsm62aVTW9s/Hooc6iAjWY1M/rS9RJgrB22LncmpNhzS5J1H U49g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244636; x=1724849436; 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=sWfqdwuqT3PXvfYs1OWWaLZMfp8HRdH9BmrvbBP0Cqs=; b=KmfH8t8FXUUAbeZS3x4YOOue0FDTQREtYoaeWNryQrW/yZB9pGEWU1XwvRo2Gxw8jV rnkWY/JJ1bYO3nSTCecnn/gAAt3/KHz0uB3j8bHkR2c3CJ3VI4nAedN/JMmLTIC0/kYS u3xRCe8m0uoxvccIxxislbS9jHRyEFIB6wyWUrjp2vhORucq+7EEUctClIIJcogQ1/T1 1tCPwoP5ZOvRj0cRAOj58eahd9okHXpNMQeArSJ+5/tCYemH949k6eRFaJkeDeQUO0Dw UsgAsWHNqtmSgfB9Zk7DxeC2Mfjwk4nxTeoA6tNe+6YFXLs4ce2uKkrwD1Fsx7Nywoq4 s7Kg== X-Gm-Message-State: AOJu0Yxu0ytj2lKEQcNnDHztfo99q5ahMkyrrUju0cMDOnvB7EVZd+el M5G9rQGb3SJu7qI9MROQua8qQJCBzb9zdZ2PvyxrGAU77kDrmq1FwameXej8A/QtAlSRKDeV5Bt eSis= X-Google-Smtp-Source: AGHT+IEvbjO3c58YL29UwEeGVViygDjNozFUe6daymooDOnmNzQhuhfBGqhPf22cqWQ+hdY4tztPZw== X-Received: by 2002:a05:6a00:9a9:b0:70d:265a:eec6 with SMTP id d2e1a72fcca58-714234c08a3mr2889314b3a.13.1724244636349; Wed, 21 Aug 2024 05:50:36 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 01/18] ruby: Backport fix for CVE-2024-27282 Date: Wed, 21 Aug 2024 05:50:12 -0700 Message-Id: <1103182ac9ae5139a5c3d7381007f61c1f7d91a6.1724244509.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 ; Wed, 21 Aug 2024 12:50:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203589 From: Ashish Sharma Upstream-Status: Backport [https://github.com/ruby/ruby/commit/989a2355808a63fc45367785c82ffd46d18c900a] Signed-off-by: Ashish Sharma Signed-off-by: Steve Sakoman --- .../ruby/ruby/CVE-2024-27282.patch | 28 +++++++++++++++++++ meta/recipes-devtools/ruby/ruby_3.2.2.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch b/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch new file mode 100644 index 0000000000..dde7979278 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch @@ -0,0 +1,28 @@ +From 989a2355808a63fc45367785c82ffd46d18c900a Mon Sep 17 00:00:00 2001 +From: Hiroshi SHIBATA +Date: Fri, 12 Apr 2024 15:01:47 +1000 +Subject: [PATCH] Fix Use-After-Free issue for Regexp + +Co-authored-by: Isaac Peka <7493006+isaac-peka@users.noreply.github.com> + +Upstream-Status: Backport [https://github.com/ruby/ruby/commit/989a2355808a63fc45367785c82ffd46d18c900a] +CVE: CVE-2024-27282 +Signed-off-by: Ashish Sharma + + regexec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/regexec.c b/regexec.c +index 73694ab14a0b0a..140691ad42489f 100644 +--- a/regexec.c ++++ b/regexec.c +@@ -3449,8 +3449,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, + CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC); + GET_MEMNUM_INC(mem, p); + STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */ +- STACK_PUSH_MEM_END(mem, s); + mem_start_stk[mem] = GET_STACK_INDEX(stkp); ++ STACK_PUSH_MEM_END(mem, s); + MOP_OUT; + JUMP; + diff --git a/meta/recipes-devtools/ruby/ruby_3.2.2.bb b/meta/recipes-devtools/ruby/ruby_3.2.2.bb index 5c2b07e5e4..f1aff315b7 100644 --- a/meta/recipes-devtools/ruby/ruby_3.2.2.bb +++ b/meta/recipes-devtools/ruby/ruby_3.2.2.bb @@ -34,6 +34,7 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://CVE-2023-36617_1.patch \ file://CVE-2023-36617_2.patch \ file://CVE-2024-27281.patch \ + file://CVE-2024-27282.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" From patchwork Wed Aug 21 12:50:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48039 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2518C5321D for ; Wed, 21 Aug 2024 12:50:43 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.18782.1724244638502807810 for ; Wed, 21 Aug 2024 05:50:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=IRRE36Kd; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-713dc00ce9dso3552196b3a.0 for ; Wed, 21 Aug 2024 05:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244638; x=1724849438; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lBAMQJDmmTVkH6IjHf2EILSEoRh20JRqoBE3VTOnhDQ=; b=IRRE36KdFL4qZrewKWLUFHSma00zyY/gOPq9g3PIadzIjPMP5/rBMdpVHMoZ8RudPn WtTjeSsGgOD60vUW2UHF+fTrU2b9Gy+6phejMj5NyN4Y/+jCzkPxyhhl4QZFf1yl4jaS Wmpr6o2UkqpRoajTdqO8+9lQ2eCL22eiDUtZjodZHs2hQQzBe7f5BkIKj6gNpohv/0J4 lM4jrvLdnBMCsOppgOZM96yM9v6b4MwNJ+IRqDkJ0ePii26V7rDIXcxXD3nMo6I5RWzC E54kJ3TufgLkATjWV8xueUsNJPxrtReSXd5P8dPTuYTCZHuYhRDP/J0w148PdhnmZYGI 1T1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244638; x=1724849438; 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=lBAMQJDmmTVkH6IjHf2EILSEoRh20JRqoBE3VTOnhDQ=; b=NBmeBbc3EHHMWX1Yj/XK8NTBJfq2xEBZGn5FamUQo0Dgg44T3hdW6fovgKyN3oIE/A h+SAkfQczYyiYMOfcvoH/NXUK9dUqB10s5psExWkBviwZ8hwHyn4eGvwgIo5IrS066Si erx+JtH6bmMfAS2q87BeSHg79OaS7Qd1ticy84iSJzWFg9inexDkNdKpUvOAmeZbD+RI J4u+h5AdTKxLs+EM5Vk1CakiizCrbp4xSmdLaBkr3iuRB87/Ry5EKbIHKGDWunXuxa6H QlcTaInS8RwxZ9GAOeeCAaM1s6lbYYt3p9tMvvlakR6QSToCJ9cw/nvN6fHsGEMX4miV 0cew== X-Gm-Message-State: AOJu0YzxFDyL7ok/nPw5uMULEm+yayLNbM1vbAa7tF07IRHHsJ4dsUaL TG682PFfuX/ovoyo+fJLVuhjpyTNMcK2iOwNaeM4gY6T39+cECwRm5+ptCX95rC8UNQJs1JZf5R OABE= X-Google-Smtp-Source: AGHT+IGykLIvO2TVBKLcCsS4CWzyU205o4+gi6SPgHc8ls4/KCayUr4bM/RkUSfDWqdKg+ra4JACPQ== X-Received: by 2002:a05:6a00:194b:b0:714:1f6d:11e5 with SMTP id d2e1a72fcca58-7142378e057mr2979452b3a.12.1724244637769; Wed, 21 Aug 2024 05:50:37 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 02/18] Tiff: Security fix for CVE-2024-7006 Date: Wed, 21 Aug 2024 05:50:13 -0700 Message-Id: <7fd3c7e9742a4efa0fbebc1d0ed1da8f6d960175.1724244509.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 ; Wed, 21 Aug 2024 12:50:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203590 From: Siddharth Doshi Upstream-Status: Backport from [https://gitlab.com/libtiff/libtiff/-/commit/818fb8ce881cf839fbc710f6690aadb992aa0f9e] CVE's Fixed: CVE-2024-7006 libtiff: NULL pointer dereference in tif_dirinfo.c Signed-off-by: Siddharth Doshi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 5313b4b233a486e8a1483757ad9c9aed3a213aae) Signed-off-by: Steve Sakoman --- .../libtiff/tiff/CVE-2024-7006.patch | 65 +++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.6.0.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch new file mode 100644 index 0000000000..785244bdea --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch @@ -0,0 +1,65 @@ +From 8ee0e7d2bdcc1a5a5a3241904b243964ab947b7b Mon Sep 17 00:00:00 2001 +From: Su_Laus +Date: Fri, 1 Dec 2023 20:12:25 +0100 +Subject: [PATCH] Check return value of _TIFFCreateAnonField(). + +Fixes #624 + +Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/818fb8ce881cf839fbc710f6690aadb992aa0f9e] +CVE: CVE-2024-7006 +Signed-off-by: Siddharth Doshi +--- + libtiff/tif_dirinfo.c | 2 +- + libtiff/tif_dirread.c | 16 ++++++---------- + 2 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c +index 0e705e8..4cfdaad 100644 +--- a/libtiff/tif_dirinfo.c ++++ b/libtiff/tif_dirinfo.c +@@ -887,7 +887,7 @@ const TIFFField *_TIFFFindOrRegisterField(TIFF *tif, uint32_t tag, + if (fld == NULL) + { + fld = _TIFFCreateAnonField(tif, tag, dt); +- if (!_TIFFMergeFields(tif, fld, 1)) ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + return NULL; + } + +diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c +index 58a4276..738df9f 100644 +--- a/libtiff/tif_dirread.c ++++ b/libtiff/tif_dirread.c +@@ -4275,11 +4275,9 @@ int TIFFReadDirectory(TIFF *tif) + dp->tdir_tag, dp->tdir_tag); + /* the following knowingly leaks the + anonymous field structure */ +- if (!_TIFFMergeFields( +- tif, +- _TIFFCreateAnonField(tif, dp->tdir_tag, +- (TIFFDataType)dp->tdir_type), +- 1)) ++ const TIFFField *fld = _TIFFCreateAnonField( ++ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type); ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + { + TIFFWarningExtR( + tif, module, +@@ -5153,11 +5151,9 @@ int TIFFReadCustomDirectory(TIFF *tif, toff_t diroff, + "Unknown field with tag %" PRIu16 " (0x%" PRIx16 + ") encountered", + dp->tdir_tag, dp->tdir_tag); +- if (!_TIFFMergeFields( +- tif, +- _TIFFCreateAnonField(tif, dp->tdir_tag, +- (TIFFDataType)dp->tdir_type), +- 1)) ++ const TIFFField *fld = _TIFFCreateAnonField( ++ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type); ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + { + TIFFWarningExtR(tif, module, + "Registering anonymous field with tag %" PRIu16 +-- +2.44.1 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.6.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.6.0.bb index d42ea6a6e5..89681be634 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.6.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.6.0.bb @@ -16,6 +16,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2023-52355-0001.patch \ file://CVE-2023-52355-0002.patch \ file://CVE-2023-52356.patch \ + file://CVE-2024-7006.patch \ " SRC_URI[sha256sum] = "88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a" From patchwork Wed Aug 21 12:50:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48041 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D33AC5472D for ; Wed, 21 Aug 2024 12:50:44 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.18867.1724244639861526217 for ; Wed, 21 Aug 2024 05:50:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cbiEcqb2; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-70d28023accso4878407b3a.0 for ; Wed, 21 Aug 2024 05:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244639; x=1724849439; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7+J/0R3R6T9fASOvvDH3qcDBGyC/ApTsqMY7x0zjjiM=; b=cbiEcqb2lf9igw/uuDH+HnLDcDEZBd7O7PMRyzuMkqKpa56dM+wO7MwgNuQsffpYh3 IXAhLOUbnZuXOXdDF3/tbrxHCPC60DOrxEdwkUpVrvxUUuDT1K7b6POu3gTnXqooCQpw xKfQ4HY1j+KXNQNC4C7xy/GIhThVlo1L24UKAA5PavgnUD+njI7oweJhSV3SeBXh2gwm YDjJ78olgiJW/ZXL5N7poI+rx+CYvLDCkb7FWGGbpeXBBIZcspeYTapaC6VIBHHKmK12 dLV/Sf/KqSH8dkPnHi5ck3ERvunXUvSZ0LtqHRlhe5CbYU5MyCVNfit7hTUFOStBsBEv EdnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244639; x=1724849439; 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=7+J/0R3R6T9fASOvvDH3qcDBGyC/ApTsqMY7x0zjjiM=; b=p+xRHMaD8CAlAJs3Y4ozHBcpvap1OtTTW7jDEHMzFPDuedgmZz5n7xBv4tkNjDJKdb oeQBFyvXQHYkDK7OCmPH4V/wsAGCl4nX6iNGc6i3YhdgbaD4b6MiYSFPFTwFYNfvlQ7l zXoFJf5Ghukah6QGs5ZGZiKfNnEm3GV/s6Hd4gXJDtr0oKq0Suwaze5d+VcPyj2lUQen 7a8ylwim/sLh/DBTYMvYoMky7S+EyTYfW60BQn1p+8pjND47Y4QZ5vZZhmkPCPxtN695 DKzdfc9uefrxGLbhmZX2ctI5zwg1jaqMKdWX9jwcnIFCrCWuIaqB3hTPaMWwauWeNH/n LrNw== X-Gm-Message-State: AOJu0Yw+Ox3zn7UXKH25XH5Z4k7xhy83PRO4U+K0s4xMMIZSOZ1swWgD 6ywEfgqn82W2IvpD3c+hfCy5+qr6JRNm+zNndIEhJ7mjW5vbflM4bNwgOOo2KCiYVB3nHDaD8FO L4RM= X-Google-Smtp-Source: AGHT+IFA7bitJgTwRRJR/OlvTGcO6oSjb1MoQBh5JWi7UkVVCKioowUbMqnWIiVqvEyG0SpmcPRcGw== X-Received: by 2002:a05:6a21:e91:b0:1c3:ff89:1fc6 with SMTP id adf61e73a8af0-1cad81a7805mr2213549637.53.1724244639074; Wed, 21 Aug 2024 05:50:39 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 03/18] go: upgrade 1.22.5 -> 1.22.6 Date: Wed, 21 Aug 2024 05:50:14 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Aug 2024 12:50:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203591 From: Jose Quaresma Upgrade to latest 1.22.x release [1]: $ git --no-pager log --oneline go1.22.5..go1.22.6 cb4eee693c (tag: go1.22.6, origin/release-branch.go1.22) [release-branch.go1.22] go1.22.6 8c8adffd53 [release-branch.go1.22] cmd/compile: add 0-sized-value simplification to copyelim 70a1aae67f [release-branch.go1.22] cmd/trace/v2: make the -pprof actually useful 2c88c1d599 [release-branch.go1.22] cmd/trace/v2: handle the -pprof flag 4c50f9162c [release-branch.go1.22] cmd/internal/cov: close counter data files eagerly 9e148a4150 [release-branch.go1.22] internal/bytealg: extend memchr result correctly on wasm 4b27560db9 [release-branch.go1.22] go/types: fix assertion failure when range over int is not permitted 4e548f2c8e [release-branch.go1.22] cmd/link: don't let dsymutil delete our temp directory 45f9ded1df [release-branch.go1.22] cmd/compile: don't elide zero extension on top of signed values 49906f9575 [release-branch.go1.22] cmd/go: fix build config before creating actions for 'go list -cover' ea96074191 [release-branch.go1.22] os/exec: only use cachedLookExtensions if Cmd.Path is unmodified [1] https://github.com/golang/go/compare/go1.22.5...go1.22.6 Signed-off-by: Jose Quaresma Signed-off-by: Richard Purdie (cherry picked from commit edaedfce685f13decad7608aefa36dece02665b0) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.22.5.inc => go-1.22.6.inc} | 2 +- ...o-binary-native_1.22.5.bb => go-binary-native_1.22.6.bb} | 6 +++--- ...cross-canadian_1.22.5.bb => go-cross-canadian_1.22.6.bb} | 0 .../go/{go-cross_1.22.5.bb => go-cross_1.22.6.bb} | 0 .../go/{go-crosssdk_1.22.5.bb => go-crosssdk_1.22.6.bb} | 0 .../go/{go-runtime_1.22.5.bb => go-runtime_1.22.6.bb} | 0 meta/recipes-devtools/go/{go_1.22.5.bb => go_1.22.6.bb} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/go/{go-1.22.5.inc => go-1.22.6.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.22.5.bb => go-binary-native_1.22.6.bb} (78%) rename meta/recipes-devtools/go/{go-cross-canadian_1.22.5.bb => go-cross-canadian_1.22.6.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.22.5.bb => go-cross_1.22.6.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.22.5.bb => go-crosssdk_1.22.6.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.22.5.bb => go-runtime_1.22.6.bb} (100%) rename meta/recipes-devtools/go/{go_1.22.5.bb => go_1.22.6.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.22.5.inc b/meta/recipes-devtools/go/go-1.22.6.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.22.5.inc rename to meta/recipes-devtools/go/go-1.22.6.inc index 7f7d8377ca..834debaf9b 100644 --- a/meta/recipes-devtools/go/go-1.22.5.inc +++ b/meta/recipes-devtools/go/go-1.22.6.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6" +SRC_URI[main.sha256sum] = "9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51" diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.5.bb b/meta/recipes-devtools/go/go-binary-native_1.22.6.bb similarity index 78% rename from meta/recipes-devtools/go/go-binary-native_1.22.5.bb rename to meta/recipes-devtools/go/go-binary-native_1.22.6.bb index b00857f001..ea4577f20a 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.5.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.6.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0" -SRC_URI[go_linux_arm64.sha256sum] = "8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a" -SRC_URI[go_linux_ppc64le.sha256sum] = "5312bb420ac0b59175a58927e70b4660b14ab7319aab54398b6071fabcbfbb09" +SRC_URI[go_linux_amd64.sha256sum] = "999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616" +SRC_URI[go_linux_arm64.sha256sum] = "c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2" +SRC_URI[go_linux_ppc64le.sha256sum] = "9d99fce3f6f72a76630fe91ec0884dfe3db828def4713368424900fa98bb2bd6" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.5.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.22.5.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb diff --git a/meta/recipes-devtools/go/go-cross_1.22.5.bb b/meta/recipes-devtools/go/go-cross_1.22.6.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.22.5.bb rename to meta/recipes-devtools/go/go-cross_1.22.6.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.5.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.6.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.22.5.bb rename to meta/recipes-devtools/go/go-crosssdk_1.22.6.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.22.5.bb b/meta/recipes-devtools/go/go-runtime_1.22.6.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.22.5.bb rename to meta/recipes-devtools/go/go-runtime_1.22.6.bb diff --git a/meta/recipes-devtools/go/go_1.22.5.bb b/meta/recipes-devtools/go/go_1.22.6.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.22.5.bb rename to meta/recipes-devtools/go/go_1.22.6.bb From patchwork Wed Aug 21 12:50:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48040 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9BA1C52D7C for ; Wed, 21 Aug 2024 12:50:43 +0000 (UTC) Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by mx.groups.io with SMTP id smtpd.web11.18868.1724244641269902331 for ; Wed, 21 Aug 2024 05:50:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=CAnYxnys; spf=softfail (domain: sakoman.com, ip: 209.85.160.54, mailfrom: steve@sakoman.com) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-2701824beeeso3471872fac.1 for ; Wed, 21 Aug 2024 05:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244640; x=1724849440; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K9MvrQat7vyziTB8LBGF1ECnGbtKlYM039OR0DHPuUM=; b=CAnYxnysuvukOmW/3m3lyVvyrfW8TGUmXv11IYDNoTYl2BK7k3QbYmfpyR8VHVDdnS tMtSEt0sQL5vlaOIty4s/U05eznIH0fhsCgk8z1I7dpHiS9GKS/DUAsawmLOqwQ4YSYd BUvD7b5d5iMLnkJx8thPmwGNZkSzFJnH5Ppa5kuyiaSGyJk+Zv4VMOXM0DdQRYFT/Bhh SPTnfP6YtNp0zI/vNvsvK+hlOJX0jb8P4+TIJHZDHFedXnPIg7AVFHUTtZV7YE1s2Qdt 58cQa0bQ9DF6ZRk2x2eDmeijnCNi2hXZRzDkHGrbf60R2jTsaqrapc7/NOinn4fFJfdu sp3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244640; x=1724849440; 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=K9MvrQat7vyziTB8LBGF1ECnGbtKlYM039OR0DHPuUM=; b=aUpHwhsyWCr7CHbcz0RNq1Tpo/pC8wcJuAPn7LNLCKkGb8MgNUMjPtoTL54+jCRsvS KB7T37ZtVzqrhC/7EnZ7eCiAmnxnU1upIMhHsh68kje3unqvF9geFH2FoslSvcn2FMYe Hka55IwLDAHMQaACr9ixejae7Q/S/UY+Cmjs6b2j7teURYlGZv80xuw6nahv+RccMg+p XYS7RKBcBGlwssHBy/2t9Oqa2qd+q1A7dk8eLPvKd8jHtNAZFqHU+Y00QPV7yat9W9RL 5B6UFrzEYeDXBfzIUF+2vl04jhlo7Su9FucadGtnle5yWtqKPtdCr2wvpSbobF2nond2 5SVQ== X-Gm-Message-State: AOJu0Ywhu7E0jGcEu33+XJGz8P+I1qz61viPYsuWpv4T8MLdEM410T5B Z+s2HYQYTWEsiTADE8Jq3Q8BJ5oVGmSJXMDkpx46Lpa3+DvLCqcAz6p5s/1E18KM5cg3xLd/Z93 XLvA= X-Google-Smtp-Source: AGHT+IEBZe7hPSuhsfmILjRLnI5ipl+PNizUve9sTRiVvIRQLWUJNqyDx11iuvezxUxwT0hvRQlKMg== X-Received: by 2002:a05:6870:ec8a:b0:260:ffaf:811a with SMTP id 586e51a60fabf-2737eea9b9amr2035646fac.8.1724244640382; Wed, 21 Aug 2024 05:50:40 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 04/18] llvm: Enable libllvm for native build Date: Wed, 21 Aug 2024 05:50:15 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Aug 2024 12:50:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203592 From: Mingli Yu The bpftrace recipe under meta-clang[1] needs llvm-objcopy [2] during do_confgure phase otherwise there comes below error: | CMake Error at tests/data/CMakeLists.txt:6 (find_program): | Could not find LLVM_OBJCOPY using the following names: llvm-objcopy, | llvm-objcopy-18, llvm18-objcopy The commit ec22bfa67f llvm: allow building libllvm in native builds, subject to PACKAGECONFIG [3] introduces libllvm to manage the llvm function for native build maybe because there is only mesa-native to use llvm-native. Considering there are other recipes such as bpftrace needs llvm-native, so enable libllvm for native build. [1] https://github.com/kraj/meta-clang [2] https://github.com/bpftrace/bpftrace/blob/master/tests/data/CMakeLists.txt [3] https://git.openembedded.org/openembedded-core/commit/?id=ec22bfa67f6f1766102501d4593ce29aafe8c166 Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/recipes-devtools/llvm/llvm_18.1.6.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/llvm/llvm_18.1.6.bb b/meta/recipes-devtools/llvm/llvm_18.1.6.bb index b2df5b60e3..0496b8ed14 100644 --- a/meta/recipes-devtools/llvm/llvm_18.1.6.bb +++ b/meta/recipes-devtools/llvm/llvm_18.1.6.bb @@ -55,7 +55,6 @@ def get_llvm_host_arch(bb, d): return get_llvm_arch(bb, d, 'HOST_ARCH') PACKAGECONFIG ??= "libllvm" -PACKAGECONFIG:class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libllvm', '', d)}" # if optviewer OFF, force the modules to be not found or the ones on the host would be found PACKAGECONFIG[optviewer] = ",-DPY_PYGMENTS_FOUND=OFF -DPY_PYGMENTS_LEXERS_C_CPP_FOUND=OFF -DPY_YAML_FOUND=OFF,python3-pygments python3-pyyaml,python3-pygments python3-pyyaml" PACKAGECONFIG[libllvm] = "" From patchwork Wed Aug 21 12:50:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48036 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7CF6C52D6F for ; Wed, 21 Aug 2024 12:50:43 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web11.18869.1724244642580727973 for ; Wed, 21 Aug 2024 05:50:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=PPNHvJWl; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7141feed424so955710b3a.2 for ; Wed, 21 Aug 2024 05:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244642; x=1724849442; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9/2JNiVuIGTl9fpLg116p8QTpE/1PkUXuejp+yADdu4=; b=PPNHvJWlivNUQDAJTE7rrJ/nU7jGFvWmqkz/T+Ekk1T2yKcJ3kZnvrgtbAwWxOjcaq QGKsDy6epDMJPqfRC8/KMOjvMOb5vDq7FI0GYOtTRbc5InqnEC8i9e75OaBwI9ERdb5q PqES9AtDZW95Nsq3dHbTU0YeTSqkGed8/L/6fF3vWlzL2SCYFW/boYh7+BkszRxFWNKo Svi0/u9rokomjZjPvVNcHzL7dezZ+R0k2y6ev/NLg/jPy24gkvcXp+ihy/GOYB2VhWhJ +gUU6YvOCsyLd0FJOFAi/spDIW6MMFl/h63V5+c+TfWHfjTIy1s9AYGdejx8BuzyrLbU brVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244642; x=1724849442; 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=9/2JNiVuIGTl9fpLg116p8QTpE/1PkUXuejp+yADdu4=; b=JTSONg9N22fDR9IiHJNWb9skt8wS7C0ljZgSexOymSJbqWURV5IuNZE2PyE6nTWxlQ DD71BYUvhiJasfhQBYTDOdO/ZmLLvJF64NOjiZvLJ5cw+f9ZwnLjZFBQHoYB3tcMtcAZ CZBJ/ohWSbA/1SQdfeR9tqbubQ+vt1dlc63y6CXhfPNopT4z3uDWRZYTxOPZkk1k9yak huqqoTrsJ4aTcOOPwvYlPQzq1lQL1Cmhf4Vp8Bt54ipSCvxOygW3hDx6iz9GfkzWtPxC a6ruwJcdVCLASEXYjPiPNAsJAlBAgNJlMU9osr7sZwlNtroF7ttoRjBuMHGluz/1O2aY kmfg== X-Gm-Message-State: AOJu0YzMcNRPS/cy29puX0OAbp15748TkIqPJgtr2kzpbGKGPmRqoHss 7h48qD9b+qe7zJlnfSNK3Pkms+rHlRZaXLd7PIQVEurw57VmfavKiI3HdTgCW8iucJ9wcqF86Jb r3Rc= X-Google-Smtp-Source: AGHT+IGnKbd3MK7iV1Uw4akXHXnojdEgz4YC051dF4JV1hb7FSLXi3Xc3p96HobSh3F6GNBEnuZc9w== X-Received: by 2002:a05:6a00:23d4:b0:705:b0c0:d7d7 with SMTP id d2e1a72fcca58-7142346032dmr2566492b3a.7.1724244641753; Wed, 21 Aug 2024 05:50:41 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 05/18] maintainers.inc: add self for unassigned python recipes Date: Wed, 21 Aug 2024 05:50:16 -0700 Message-Id: <97c2cf74e556511b3827362f6b3439daa26091e9.1724244509.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 ; Wed, 21 Aug 2024 12:50:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203593 From: Trevor Gamblin Add myself as maintainer for the following: - python3-setuptools - python3-smmap - python3-subunit - python3-testtools With that, every Python recipe in oe-core has a maintainer assigned. Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni (cherry picked from commit f7c4ab54d3ff1895d9fcb9aa20dece5e0661579d) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 12dfab80a8..baaf971a9a 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -697,12 +697,12 @@ RECIPE_MAINTAINER:pn-python3-rpds-py = "Tim Orling " RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield " RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling " RECIPE_MAINTAINER:pn-python3-semantic-version = "Tim Orling " -RECIPE_MAINTAINER:pn-python3-setuptools = "Unassigned " +RECIPE_MAINTAINER:pn-python3-setuptools = "Trevor Gamblin " RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling " RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Tim Orling " RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen " RECIPE_MAINTAINER:pn-python3-smartypants = "Alexander Kanavin " -RECIPE_MAINTAINER:pn-python3-smmap = "Unassigned " +RECIPE_MAINTAINER:pn-python3-smmap = "Trevor Gamblin " RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling " RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling " RECIPE_MAINTAINER:pn-python3-spdx-tools = "Marta Rybczynska " @@ -715,8 +715,8 @@ RECIPE_MAINTAINER:pn-python3-sphinxcontrib-jquery = "Tim Orling X-Patchwork-Id: 48042 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF614C52D6F for ; Wed, 21 Aug 2024 12:50:53 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.18786.1724244643880836407 for ; Wed, 21 Aug 2024 05:50:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=DEHtivgO; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-70cec4aa1e4so4448892b3a.1 for ; Wed, 21 Aug 2024 05:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244643; x=1724849443; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A47OQfYDva3PJ6Whl4cq0eTvTUhA5ZnGyvCmgqM8wQQ=; b=DEHtivgOAmh0SskR3TFZYdIaW86sKsXkPaqjvyU2sJ4DDbsBBomIFa0Otf04amCsTE A57b0iqp3itv3q8nP6WVzDcncPn1VTLbURQdAYxy5Duz6XwB9FdAMs4fUq/7RNkC6cFX 3d17zSoQqPnzVbcGDm+td2aOqn1J4eNsAce8NHA/B0V/FuFWfqEfxK3PXAvl8C2nQ6b1 s/v+xF2bRPsVCv3o7cOmDEi5sestoGlC6TJY8Oday+B75gSIgy20sPRUqSzex6ZK1wqP lvHKpH1x3kPKngnEjMwQLuBxj9Yvnf7axe2dlkbE4XnEcBtzrxXoAansPu/PV1Gb7QuO FmbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244643; x=1724849443; 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=A47OQfYDva3PJ6Whl4cq0eTvTUhA5ZnGyvCmgqM8wQQ=; b=xLvDiUEywOpEp5Ly2F7JP/F5oUKzHmDi/Et69HrbGWvGeCMgTSlRPB9bq18enj7sg2 hODRvL1Pyu+V8MG094RUp+QUiBKQmcxdMzhiRlqkUr++78ShxeE3rEzpWX9XtGe6vTB5 NZ/PcxYvoKC0qlqKIK3i25oCVdpd78Pta91FtCd+JyDItTyxav0OojrUQu5TrgXNP6gd 5sG+50sRR7R3RHiEFZXyqeJl41P21KAFrCykRXsJ7zm74rhoX88slTuJG/8d6YjL+AwI W1DZlWlFh6ObXihme4whSpiosOAswCtToLGt9cm/U3ogEbu3Gn3Pi6Raxk07ecHORzRh hw1g== X-Gm-Message-State: AOJu0YxhqYux4+KctLmugfiXtrykevL619qpJPtZvkSnK69CbB8qQXb7 IxK4971McRRM58dSdaKw1Oxp8I9NlBnfpxLeMIVdbdEwvy2R1Iz3rFlg4Q7J1fJMW71TAeeEXOc 6ev0= X-Google-Smtp-Source: AGHT+IF4raH/+6mpgRVkx6bZW1RwtNJRxwl60hRw7hyWr/iizqSK6CBW9XV54DtaOScs+f0LyHJwfw== X-Received: by 2002:a05:6a00:3ccb:b0:710:4d4b:1af with SMTP id d2e1a72fcca58-71423769a5bmr2838403b3a.7.1724244643004; Wed, 21 Aug 2024 05:50:43 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 06/18] initramfs-framework: fix typos Date: Wed, 21 Aug 2024 05:50:17 -0700 Message-Id: <29b33a9329d69806fda9ef6ce65423df6c19e787.1724244509.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 ; Wed, 21 Aug 2024 12:50:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203594 From: Ulrich Ölmann Fix typos in debugging and error messages. Signed-off-by: Ulrich Ölmann Signed-off-by: Alexandre Belloni (cherry picked from commit 4995e222ebdc9b5508c2f03a11868f184e4629a0) Signed-off-by: Steve Sakoman --- meta/recipes-core/initrdscripts/initramfs-framework/init | 2 +- meta/recipes-core/initrdscripts/initramfs-framework/rootfs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/meta/recipes-core/initrdscripts/initramfs-framework/init index 567694aff7..20c0455ec8 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/init +++ b/meta/recipes-core/initrdscripts/initramfs-framework/init @@ -117,7 +117,7 @@ if grep -q devtmpfs /proc/filesystems; then mount -t devtmpfs devtmpfs /dev else if [ ! -d /dev ]; then - fatal "ERROR: /dev doesn't exist and kernel doesn't has devtmpfs enabled." + fatal "ERROR: /dev doesn't exist and kernel doesn't have devtmpfs enabled." fi fi diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs index e0efbe6ebe..38e138f618 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs +++ b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs @@ -59,7 +59,7 @@ rootfs_run() { fi fi fi - debug "Sleeping for $delay second(s) to wait root to settle..." + debug "Sleeping for $delay second(s) to wait for root to settle..." sleep $delay C=$(( $C + 1 )) done From patchwork Wed Aug 21 12:50:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48044 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20AB7C5472C for ; Wed, 21 Aug 2024 12:50:54 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web10.18789.1724244645081789421 for ; Wed, 21 Aug 2024 05:50:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=2lM1jq6o; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7141e20e31cso1053477b3a.3 for ; Wed, 21 Aug 2024 05:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244644; x=1724849444; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0CMAtGLlHnnXxDRK+QXgOVvqJDkAqgjcg9pvu39SsNs=; b=2lM1jq6oH3f3eIZV7WYMFt0c+dQJWlTR8d/8BB7+k1qx0czTRF4pprq9mzzi99X92i uIsaoEMPnEdtZgcl1oEmM1eF7gduy815EXJVcjTsf2wRBEmaqN/BlJpsrnB6CLUYovqQ XBpQ61kdX6XX3Z/yckHKJyS0I7j0CTJL0ov9G2iQO6i4QKdejGxVPq8w66P3w1s11UdY JIuOL1/veQAUiiQJ/DLAXtcaycpJY99+1pQ/jUNPJ48fzMR3mmPPfg1QY2dtneB8b++E VlDY7Q2GXtnU2MuoaWsRJqoA5KeF8ZWS582fxYFDgrbSHVreYCP7u7WHWphxBDwmQgbp pNcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244644; x=1724849444; 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=0CMAtGLlHnnXxDRK+QXgOVvqJDkAqgjcg9pvu39SsNs=; b=dj4KmcM2fWgyjOP2squ6xxcb6Ny9WCvNR7+XTe6RCF82Zmfs431hTnz4PhVF6Q8zsd v3T1V6X0TDvDsZtMrMNVjVGJZ5i9wQ9h5YWM6ESAlsyDit+/OXubQppNo/VFHbKD4Ovp uicOH4yklN5REgtuTBZwSO8dj2u6MFOyk/3s4tXjfnJrNySOHqlDfIb1cHJ5kqKUTW6c PVfuhQGZQOn816BknuEhW0gr6jcTo6WXroS7MMVzUGHZ3Cm+N4Ukwhl94VOKpYaF4VD3 88dpxwE8f1wr6mKx7bQKHBkjF75ST7cRY580YIugrUa278ZrhOLLfaQNBI0n59agGyzX 3VPA== X-Gm-Message-State: AOJu0YziMkf8CXC883Zu3noJ4l8T74AGsiulee2QLAoJC25sWgXOC6Kq q0y0vV+ICRquzsITs4jFTInld9uePHlY4zX32pFLmySOyR/qzyJCGpxN/tT0YypqH8dZEyb+vsA DOMI= X-Google-Smtp-Source: AGHT+IG99gdMLMkf9Ob4nHJiQ/jxQSAsVclJeWXZ/klBXMNlyS3KZAw+OXXTHIwwqSyy6f8YyG/7Nw== X-Received: by 2002:a05:6a00:2ea9:b0:70d:3354:a19b with SMTP id d2e1a72fcca58-7142351e466mr3231446b3a.22.1724244644338; Wed, 21 Aug 2024 05:50:44 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 07/18] os-release: Fix VERSION_CODENAME in case it is empty Date: Wed, 21 Aug 2024 05:50:18 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Aug 2024 12:50:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203595 From: Daniel Semkowicz If DISTRO_CODENAME was not set, VERSION_CODENAME field was populated with unparsed string. This resulted in the following line in os-release file: VERSION_CODENAME="${DISTRO_CODENAME}" According to systemd documentation, this field is optional. Fix the problem by setting VERSION_CODENAME conditionally, only if DISTRO_CODENAME was set. Signed-off-by: Daniel Semkowicz Signed-off-by: Alexandre Belloni (cherry picked from commit 70a0b8bc1d846c857be90ce2e97e60c5ee32558e) Signed-off-by: Steve Sakoman --- meta/recipes-core/os-release/os-release.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index 8906906bc3..93af08c182 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb @@ -24,7 +24,7 @@ ID = "${DISTRO}" NAME = "${DISTRO_NAME}" VERSION = "${DISTRO_VERSION}${@' (%s)' % DISTRO_CODENAME if 'DISTRO_CODENAME' in d else ''}" VERSION_ID = "${DISTRO_VERSION}" -VERSION_CODENAME = "${DISTRO_CODENAME}" +VERSION_CODENAME = "${@d.getVar('DISTRO_CODENAME') or ''}" PRETTY_NAME = "${DISTRO_NAME} ${VERSION}" # The vendor field is hardcoded to "openembedded" deliberately. We'd From patchwork Wed Aug 21 12:50:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48047 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E04FC54722 for ; Wed, 21 Aug 2024 12:50:54 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web11.18874.1724244646444793066 for ; Wed, 21 Aug 2024 05:50:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NJRLzAS+; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-70cec4aa1e4so4448912b3a.1 for ; Wed, 21 Aug 2024 05:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244646; x=1724849446; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OSF0yBIzCfhyw2SWK/ZBv/9mlk6ejdJsZTwh2tr1a50=; b=NJRLzAS+st1Kva6mTwlRsiQa0Grzf2k+jvjmyxYfC1/X5mE5qzJ9sY7O+32zkOmnpQ TPQZ3oPPh6tThhVMd1NNqquX+y7mqlEBlXqBmSeC9XdJe2ijBC/i9XSdmv6OJrzgMVPo RG/L89rM3u9pHMUXtxZZrEkdHr1OjDnIPNj74XvLukGOEdjm4iVAW5G+hBorMu5rYudp b+fUPn62tjOZQdxVuHZWc5PKkogji6wCSEyksaYjlZS3sBK/q0dobHD1eAVRUNX06y05 js+yVJfQ9XVLgBrLvxVLhy8R/y+r17SSmE8/9PUoUEPymCi4jQo02gzAhk75GOyb8g0g g2QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244646; x=1724849446; 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=OSF0yBIzCfhyw2SWK/ZBv/9mlk6ejdJsZTwh2tr1a50=; b=VhBG1ihGGrl2kRmsTP5xZ9YgpfYK2dDoJh+qEUgt9ZBAgcW5baKTCe0RUFvug6dMdk GQa5qDQuQxW/zbn08A24czcmNM8veU+OaIHUERFO+HZZE4ebobly1ONm90z/VWU4T0+I fXyDlv6OXSrTKvmRk3xhs+5IuTyD+zIdWanJubOlS1lMtZpNwBVx2kOonJOZ8e4v3S/a pNsedMZp5oFlwBtgHGuVS+4zYcPRxTEVzBEWJb1pkKN3Mq+R6a9ElqaXwz/atuw0+yvi DracrAgPmHp/uFOxzC/gxvlH36/FY9RdV/V92vXdmyY7eZWrPQWd0HWTfoP03wC9d44e dR+Q== X-Gm-Message-State: AOJu0YyMCvN3WZ+3ySsC5s8GcWnjMM4WWlpehqptOzvunWIxuf1ncnGc J/eH4gZA5L5Db0O6ZUrQlCdk+2PQ2yd+VyBIAQFWOrMYu+Og1A1p+cWzwK4FGTXqQ9DjT6DamRb 55/s= X-Google-Smtp-Source: AGHT+IEOHC50Ua50yyyUuS9wjoytat8Wy2mg9QMG4+wIFCtSprkUkr1AEtco1Lm/T0ruMysWTN68Xg== X-Received: by 2002:a05:6a00:4f8b:b0:70d:2a88:a486 with SMTP id d2e1a72fcca58-7142396baa6mr2169924b3a.29.1724244645586; Wed, 21 Aug 2024 05:50:45 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 08/18] libgfortran.inc: fix nativesdk-libgfortran dependencies Date: Wed, 21 Aug 2024 05:50:19 -0700 Message-Id: <63ecb048f8238f67e21f77512b5276021b060d64.1724244509.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 ; Wed, 21 Aug 2024 12:50:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203596 From: Martin Jansa * use virtual/* variables as INHIBIT_DEFAULT_DEPS does to avoid dependency on gcc-cross- from nativesdk-libgfortran * the dependency was added in: https://git.openembedded.org/openembedded-core/commit/?id=00fba52c8a6f6383137cf89fc7aa34cc3e2ff45f causing: build/oe-core $ bitbake -g nativesdk-libgfortran NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'gcc-cross-x86_64' (but virtual:nativesdk:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/libgfortran_14.1.bb DEPENDS on or otherwise requires it). Close matches: gcc-cross-aarch64 ... with: MACHINE=qemuarm64 FORTRAN:forcevariable = ",fortran" * after: https://git.openembedded.org/openembedded-core/commit/?id=44fc7aa1468ff042739cc5a91c84ef5c2a09e0a3 nativesdk-libgfortran is pulled as dependency of nativesdk-gcc so this affects more people who didn't explicitly use nativesdk-libgfortran before * the INHIBIT_DEFAULT_DEPS and gcc-runtime was there since gcc-4.8: https://git.openembedded.org/openembedded-core/commit/?id=a5e7ee5770b9e0cf719c573efffd874440f74289 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 5ce2e9c66cd2c08e141913ec65386f940353a8c5) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/libgfortran.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc index e810146d4d..c68645e392 100644 --- a/meta/recipes-devtools/gcc/libgfortran.inc +++ b/meta/recipes-devtools/gcc/libgfortran.inc @@ -47,8 +47,9 @@ do_install () { chown -R root:root ${D} } +# avoid virtual/libc INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "gcc-runtime gcc-cross-${TARGET_ARCH}" +DEPENDS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}compilerlibs" BBCLASSEXTEND = "nativesdk" From patchwork Wed Aug 21 12:50:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48048 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C436C5472D for ; Wed, 21 Aug 2024 12:50:54 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web10.18791.1724244647956207693 for ; Wed, 21 Aug 2024 05:50:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=tcTMCBco; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-70d28023accso4878517b3a.0 for ; Wed, 21 Aug 2024 05:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244647; x=1724849447; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=o/JqamKBIcLrdMFyOO9inMD98NYlz5sTVswIWzvbXmU=; b=tcTMCBcoCEiAqX/+8ISje5S6OEqjLvkRZzK2hpAcHtnCcsWrMNH2BHyff5h+1cV0qY J1Fw5vDcDEAiwYwGn+yUV30JytztcIiNri+YA1knIMADIYrIWd4VPaZCM9nF6lzZvd3j pO0G0MR1MV81AyheC14IrOP+4v8Qa7IQu5TKeh1FdCgJWgoWL9XzDoW8EPQ3E3+b2Esj 168ENFF/f4GazgHo6Nd5L/YpK0uJN2XQAIv4T/FAWeHjRAlwsJJV9GXBKH9rLcAYUiOc VikNBIEm69iByDjLqUGlsIl8NwbfIiMNmBNROkhJ/WrE5+gTU1xCXRqFdULAVXqhQ6JD k9iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244647; x=1724849447; 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=o/JqamKBIcLrdMFyOO9inMD98NYlz5sTVswIWzvbXmU=; b=Bwjho8t0bFB16GJKjG29IY2PLQygDx4uCG9/TcQLO3KmkcEIZanZ/YoEBEpVAjyiAA iD+svbOl6ysdgU6prb7MOyuag9EvHhwERXRBS/pPBYv6kC586S6UBavmw+d1Bhj/BI1t TEmpUGcosskjSye/j4txYkycQ9H8FP1eHRCHIxxw8WoYEc85chbUTSar1SGtYZe7DeN8 YXdtqvEjCAo/HuTkZV9Kd7JYXfcIMxBx9y9RW0CbjGc/RYY0Vi7Tp2pcfwOrkAl3MKxw /G19FNi+vUeLF2OCYzJtlTGv1KowOTOFtafSJ8bgR1XM6NWt3mbtp9AuNiwYULHAERzu LgoQ== X-Gm-Message-State: AOJu0Yz8MUA9k9EELJaOsvc95UvQukKPkVSRq56CjQHX9S57abzgkSRr yAXL2mAv3FsJbUHwAghDEUMgV5LRJsKOXqGYPd8FAc4vnqDKsHCHX+qExL9eC0vy/rxXwEUpeSW YdvA= X-Google-Smtp-Source: AGHT+IFJ3tSAaNaNsVuYm0C93cmY/5+epVYzpwrZxVM48ESmSabjJC7eyRSm5Zq0na0zFE/2cRRKhg== X-Received: by 2002:a05:6a21:9614:b0:1c3:b0b5:cbd1 with SMTP id adf61e73a8af0-1cad816342amr2575261637.38.1724244647156; Wed, 21 Aug 2024 05:50:47 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 09/18] glibc: fix fortran header file conflict for arm Date: Wed, 21 Aug 2024 05:50:20 -0700 Message-Id: <58a5ddeff446bf459a719f10b07abd731c6c5634.1724244509.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 ; Wed, 21 Aug 2024 12:50:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203597 From: Kai Kang There is a file conflict for arm when multilib enabled: | Error: Transaction test error: | file /usr/include/finclude/math-vector-fortran.h conflicts between attempted installs of lib32-libc6-dev-2.39+git0+312e159626-r0.armv7at2hf_neon and libc6-dev-2.39+git0+312e159626-r0.cortexa72 Install math-vector-fortran.h to the gfortran default search directory which is arch specific to avoid the conflict. Signed-off-by: Kai Kang Signed-off-by: Alexandre Belloni (cherry picked from commit d2165543e796d4558c632af24eb7b115bca45969) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-package.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 1ef987be0a..b90ff66612 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -39,7 +39,7 @@ FILES:sln = "${base_sbindir}/sln" FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" +FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal ${libdir}/gcc/${TARGET_SYS}/*/finclude" RDEPENDS:${PN}-dev = "linux-libc-headers-dev" FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \ @@ -169,6 +169,12 @@ do_install_armmultilib () { oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h } +do_install_armmultilib:append:class-target() { + gcc_version=$($CC -dumpversion) + mkdir -p ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude + mv ${D}${includedir}/finclude/math-vector-fortran.h ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude/ + rmdir --ignore-fail-on-non-empty ${D}${includedir}/finclude +} LOCALESTASH = "${WORKDIR}/stashed-locale" bashscripts = "mtrace sotruss xtrace" From patchwork Wed Aug 21 12:50:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48045 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EEC6C5320E for ; Wed, 21 Aug 2024 12:50:54 +0000 (UTC) Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by mx.groups.io with SMTP id smtpd.web11.18875.1724244649761956361 for ; Wed, 21 Aug 2024 05:50:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zKmynUgP; spf=softfail (domain: sakoman.com, ip: 209.85.210.47, mailfrom: steve@sakoman.com) Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-7093efbade6so4242710a34.2 for ; Wed, 21 Aug 2024 05:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244649; x=1724849449; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SUTXV9B3a3HJ5cDgKYPX9nR4xthbc0NP9DNpSzTv510=; b=zKmynUgP/L9itmitqaGljLsSuV0j9GKrya431ahsqyMf5nZAHXifSdxv3Eh57dJ3Rv LfvHnL4PsZNjRrF3gK3P1umf95KlDUm20co+z2OPZKA6XQhaEzXdINm/Svtj2kj7P1Tx P3KwzNK9chej9Mk/UcK5Z+5xyWWT5/DPB+04tcYyuU0LInP8yIfJtWQDrl0lH/JrVREp MglDnHv0V4uuEHcIiTYengvpoyuSpJ7dLHzUaILrJMXPB2zQamKtZO2H/Tz23eaS3HOA uuaauUBLGPc0u7n0TMn7ouV+t3lpny6fPtgFatg0sDxtA9oXv7VAU56C4DhCTWhhR1m3 nkNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244649; x=1724849449; 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=SUTXV9B3a3HJ5cDgKYPX9nR4xthbc0NP9DNpSzTv510=; b=dLMK+ZQiStnY3er0WJ7Uywk5noLzg7mhqze8Qkdh8k/9h5hRyHHb/SA21jCEFG5YLc Rx6APhAqAxW0BWHCXFA7tSYk2/y8mOnJv6hOljM4rRYGtFUbVoTEXMRljdV3Z5bzGjNI 31UGvuudndD3//QZ0ZZfcU5gWyaCDFX5yyPyNH9bq1mYcKQBwUsQDAxZ5t+oKsiLBkJw P7hAN83e9KW8eSMu3Hf7jgfpxWyn8I7M3PID20boDAeZMNyLAC+jfIMPgF3p99N/050z nGnjMfsuidflQqDDKPkL9Otg/Nrr46shHQJQJoZZiBiwa6gRk4RBtPudLsgyeSbaVn0X oRHg== X-Gm-Message-State: AOJu0Yy26Lz3bBLjbaiRXNR7wS3EbT2umZbOc4/eLvWzUDasaXjjbxti Nhg9rojfHFx9O9cdcfnVTuDFd2Sz4kDkg2TCsMdeWEPZKEaBRk752ZaVTOXhAblOGUpWE1hIaG2 boaw= X-Google-Smtp-Source: AGHT+IGX8bdRrNZkTVLtJL/u4R12g6cYwTtHwBrzArk6ZJ8ioDUDbZA3piFZflsvxtDL2HJqcP+pxQ== X-Received: by 2002:a05:6870:9721:b0:270:22be:a97d with SMTP id 586e51a60fabf-2738be846e3mr2353844fac.47.1724244648620; Wed, 21 Aug 2024 05:50:48 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 10/18] gstreamer1.0: disable flaky baseparser tests Date: Wed, 21 Aug 2024 05:50:21 -0700 Message-Id: <90a510acd11fe342d01c62e3b247425836711c50.1724244509.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 ; Wed, 21 Aug 2024 12:50:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203598 From: Ross Burton There are three baseparser tests which are causing trouble on the AB, so disable them as we've filed an upstream bug. Also fix a typo when we were attempting to disable parser_pull_short_read where a colon was used instead of a comma. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 91dbe8d6c57805f38bd287f1b392759df066589b) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest index ab2df80dcc..7fee5a3d09 100755 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest @@ -16,6 +16,11 @@ GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live" # Known unreliable tests as per subprojects/gst-devtools/validate/launcher/testsuites/check.py: -GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE:parser_pull_short_read" +GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_pull_short_read" + +# These tests are fragile +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14884 +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3524 +GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_convert_duration,parser_pull_frame_growth,parser_reverse_playback" gnome-desktop-testing-runner gstreamer From patchwork Wed Aug 21 12:50:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48043 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15B3FC52D7C for ; Wed, 21 Aug 2024 12:50:54 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.18876.1724244651200159247 for ; Wed, 21 Aug 2024 05:50:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=B64VP7LA; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7142448aaf9so477039b3a.1 for ; Wed, 21 Aug 2024 05:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244650; x=1724849450; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=j/MfxLiN6Nt25vvF+/psLlbeGudtZMYK+MrdiMSEQF8=; b=B64VP7LAigMaIxsy+7auXTHle3o6zoLagJHEhAqISOkobkN+kF3e96vzZaYoE2TV+Q eLvfY9kueMzb10gtjYFAHb4iJ3uVKGkQZjS6B4PleFlxl93HsP+GQ0t14yZat8AjJcU8 IDbF3d4EshJ/SUqNbq+FSUEQVBFaiE+1E485e1j8Qak9/XU1Da+Yc0NjV55iE9clnIaB NsDU+rOuNb4lG+JeKP+Xl8y7pLv/6ASZmfB6Ls0S7/kJlbEktE50GHDu+PM0/lKuM7NF Dn+1su77vact0WiUkOh7P/BIHDpaRTPqbnNgpAsxHs8StDoMMFbUBF6Jq/jgWxFnR8Hc uEQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244650; x=1724849450; 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=j/MfxLiN6Nt25vvF+/psLlbeGudtZMYK+MrdiMSEQF8=; b=hqXAayjYTd6bv4GsIo8sidRVqn8WIex3KpSAZr1r2+58zLLc3hnVqMAP2ABsCC5zCc sH+1v3d0QuTg4fig7bVIqzX7sBG80f2wCMjp63gVEN9L4XNonlGKVLOGJl2914RgIOBN F87kLdl8cwIEygIsPELzTyGUskKQAYhu0FaAiZmmLEvXQ1wqEa4S2q1ms7vYBj8OqeJI 3bO6qDURBK1bf4QdfUebuH2mMBr4uFIquydW8Avkho9Zi5GXixGaXHYLTB76moA4Bia7 v254iFfnniowHToMGTncvENuxriH3uPvVZuFy/4loYRcxlfXTGVjmOXQbzx+pEf8R87T xlSA== X-Gm-Message-State: AOJu0YzmmfXD2OFG/xaGTlMq6M9FN0HE6odNSmxFLFX26EN55LgZfmJg e5ravlHoOfNT7VSWbBrgfn/91cZEsyYktR/G+U9xMHtewQ0CgmGVsnbUkTND7UFOYaFwoMDflA5 rTBY= X-Google-Smtp-Source: AGHT+IGTkaLPpTSt8aJn6AFu9DbTS+PPtvZjjqCbVm2lNqmPzRIcC62HOVkkbTwZMpZ3PEghj/cJYQ== X-Received: by 2002:a05:6a20:43a8:b0:1c4:d14f:248f with SMTP id adf61e73a8af0-1cada1b967fmr4828341637.13.1724244650352; Wed, 21 Aug 2024 05:50:50 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 11/18] librsvg: don't try to run target code at build time Date: Wed, 21 Aug 2024 05:50:22 -0700 Message-Id: <310e9387a7a89b8a2a01ecc9fe889ede16622d66.1724244509.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 ; Wed, 21 Aug 2024 12:50:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203599 From: Ross Burton The rsvg-loader test binary isn't installed but building it causes a mix of build host and target code to be executed. As we don't install the test, don't build it. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 78667e67a77df39c2af417e56ebf480962ff2e42) Signed-off-by: Steve Sakoman --- .../librsvg/disable-rsvg-loader-test.patch | 40 +++++++++++++++++++ meta/recipes-gnome/librsvg/librsvg_2.57.1.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch diff --git a/meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch b/meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch new file mode 100644 index 0000000000..e56772a7e2 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch @@ -0,0 +1,40 @@ +From df94cfa4a637c229fef32c349b5c2dfee2dca3fc Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Thu, 27 Jun 2024 17:09:11 +0100 +Subject: [PATCH] Don't build rsvg-loader in cross builds + +This binary is a non-installed test binary that isn't any use in cross builds, and +causes problems because it generates a gdk-pixbuf loader cache at build time using +a mix of host and target libraries. + +As we don't install the binary, we can just not build it. + +Upstream-Status: Inappropriate [upstream has moved to Meson] +Signed-off-by: Ross Burton +--- + gdk-pixbuf-loader/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index 44df9c6c..fb417d24 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -30,6 +30,7 @@ if PLATFORM_WIN32 + libpixbufloader_svg_la_LDFLAGS += -no-undefined + endif + ++if !CROSS_COMPILING + noinst_PROGRAMS = rsvg-loader + + rsvg_loader_SOURCES = \ +@@ -52,6 +53,7 @@ EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile + $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++endif + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +-- +2.34.1 + diff --git a/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb index 4b52d4062b..ceaf1dfc00 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb @@ -21,6 +21,7 @@ require ${BPN}-crates.inc SRC_URI += " \ file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ + file://disable-rsvg-loader-test.patch \ " SRC_URI[archive.sha256sum] = "074671a3ed6fbcd67cae2a40e539107f4f097ca8a4ab1a894c05e2524ff340ef" From patchwork Wed Aug 21 12:50:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48046 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2094DC5321D for ; Wed, 21 Aug 2024 12:50:54 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.18878.1724244652568897795 for ; Wed, 21 Aug 2024 05:50:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=aHj2Ouzb; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7142448aaf9so477054b3a.1 for ; Wed, 21 Aug 2024 05:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244652; x=1724849452; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AP/5vnbXU5nT0ydhoMB0geFvc23fmCMSYedhT3oDEMM=; b=aHj2OuzbzPxQw3vx8hVs7sqzkcWFmc41MOhFfzLcn54hrXrMf9cLQU0wDpRiqw/V7Q bNuwxEH0mqqNe9pJBiZYgHYCJQkmX1hb0fFUWMc//Pvr59YyQ9F/BhztsZzJZBs7R/9w nh7dlJTtGh408oYwlSjZ9nRTVVKL33FI3aKY0dAIa4X6td1ntYvdJsCnR1lxUlnKijEi 54kraJnTSN6nFJeY6rzYN9RdoLDvp2n+AFOO5iQunD3l3kTjrUy+u91DwlAHZxa14cDW NOvyKaliTPEVPPcpHtdf8y62F38zC8pb8KolWV+OHWxIuEGEfm7t+eOuvI1vjZftK5Dh /v2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244652; x=1724849452; 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=AP/5vnbXU5nT0ydhoMB0geFvc23fmCMSYedhT3oDEMM=; b=hGGE8yjCmgR64d5Ytfazblitu+OYx33aDzq8NXBZETdBExzuENNBStf/kQTYgSbyNH 68R2a1txVj9tijhMKj3Ho23OxRmxhLKK8DHdZhYvfWJ3asxUMDQiKYlNWGc6AiD+B6AA dJO5XgARilPsR/ZDrbIT7NIrYO2v+Pcy2dr5l3zCQ6X+jYKBm1deqJrAEXOpx5qAdotO ph8vK4HAHds9ckwLCEutO3RSBUCtPoXtfdMpkfspvvePRffCVC7nkYOi+X9LazffgH+H cIeUIAuGRTjofOfzITy+QWvcx8PIQuCqZaJ7FhsZ+8HY8187/7hfWqxQydHrBu6tSJ+h Y+uw== X-Gm-Message-State: AOJu0YxEclbayX7k6JlCSpwuR6Hh7/Z+DXxtJbzkVJvpzdFxswBEqD1m ZC+wGAHgYmKpM2LsJ00wmtIXKxjqthKAexVJ5BQmNvYuEwtyNtwFjIEi2dTqbzMRFaOfkSKN9PO C+Fs= X-Google-Smtp-Source: AGHT+IE0+yCKW2u+baVSNK3FF5i4W8hlMcI6SmhoDlF2YHfCb3NzBL0HikfXRk+v99Bz7Zsb9zGhkA== X-Received: by 2002:a05:6a21:b85:b0:1c3:b148:690e with SMTP id adf61e73a8af0-1cada1476bdmr3587814637.5.1724244651778; Wed, 21 Aug 2024 05:50:51 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 12/18] populate_sdk_ext.bclass: make sure OECORE_NATIVE_SYSROOT is exported. Date: Wed, 21 Aug 2024 05:50:23 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Aug 2024 12:50:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203600 From: Gauthier HADERER Fixes bug 15464. OECORE_NATIVE_SYSROOT is correctly set up and exported in the SDK's environment file. But it's then unset in buildtools/environment-setup-*. The value is restored in the SDK's environment file but is not exported again. Signed-off-by: Gauthier HADERER Signed-off-by: Richard Purdie (cherry picked from commit 825c996b7995d3ad510933b1a88229831ca5ea29) Signed-off-by: Steve Sakoman --- meta/classes-recipe/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index 09d5e2aeb6..e76ef60720 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass @@ -732,7 +732,7 @@ sdk_ext_postinst() { echo "# Save and reset OECORE_NATIVE_SYSROOT as buildtools may change it" >> $env_setup_script echo "SAVED=\"\$OECORE_NATIVE_SYSROOT\"" >> $env_setup_script echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script - echo "OECORE_NATIVE_SYSROOT=\"\$SAVED\"" >> $env_setup_script + echo "export OECORE_NATIVE_SYSROOT=\"\$SAVED\"" >> $env_setup_script fi # Allow bitbake environment setup to be ran as part of this sdk. From patchwork Wed Aug 21 12:50:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48049 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 359F8C52D6F for ; Wed, 21 Aug 2024 12:51:04 +0000 (UTC) Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by mx.groups.io with SMTP id smtpd.web11.18881.1724244654229088744 for ; Wed, 21 Aug 2024 05:50:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=BwBSSoIu; spf=softfail (domain: sakoman.com, ip: 209.85.210.47, mailfrom: steve@sakoman.com) Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-70c9cda7f1cso2934599a34.3 for ; Wed, 21 Aug 2024 05:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244653; x=1724849453; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fQt7QtS553QQXBjWLgJAic+zhDha9IbVo201V8/My3g=; b=BwBSSoIuE4nfAXPA8XMHEJsi3zQDMX9ay4TnELuBSejFxQQsVL60zI6595RC0fvTPD dfJgMdu8rzqZP6rm/1x5jTO4aCGSTqz6RFmpQoaIJFS0KFbIeJ7HVF21qQ4FghR9FJcW lRODQkKv4nhfsilKOlJXAXtbOZT9P9FaJtrjBlqXrmFCSDPOvhgYF7b/+IM2A6NExSZz YINAW2ACgY6BNFD4YSxb56k/q5UGl8nF0HavGjGz41Ruy7MS1wOO2Ne2XPUVweatyZAG PEdoTeCGXh6sVc8WxaN76fGLZWQDdRfPIOei/OSHuuayyPq9fPBlR08hp5h93mNGVDUv IwdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244653; x=1724849453; 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=fQt7QtS553QQXBjWLgJAic+zhDha9IbVo201V8/My3g=; b=mIjtMf9rNcJ190Asf0FHM4+U6q0/vk3vprbIlIfWp8S/C07h9fadyX3mXXKzv/ZTP6 7+QQmfDiEmskVdkARH8Rj8HiOf7J6V4oqPmsFi/sn6RbDxhdKdP/t7c63jo4sWfsmufn OYrElykdA/K0d5RrotwRf0wv/Yei+kVBzXaYodnhD7w1+CS49zpdLrnsyzyNi6DaJkTt tgWRUZimqKJeMFZlRq+l+CVD3WEzRJFU6xk9KNMBYuCroiq5WYDikGkn5pdWNGTSVJJY zA06kGwggoWUkKafd3DqtVIu2D1LWFyYLQHtBevE/dTS4u7DfUzRy2mmJmHIx3bo5lug KSrw== X-Gm-Message-State: AOJu0YzSYDwr+gemDB0G7DlJPVzuTJhrn0JGKWV7M+3NSPXQIBySSTb3 dHtUpkeJFtag3Rj8Tm/m/qXXqYEC0TKTd4jLbpkfe2ge3/6GRspk+7e1KfweHx1Hv1TLPVJomqC ceBY= X-Google-Smtp-Source: AGHT+IElaEy5bGrzeQF8obxI54acosIeZCSyE6tGw3hSf5lH0Z9cOZZ8I5FH8kwBYAbXry+D4uLfyQ== X-Received: by 2002:a05:6870:b621:b0:268:9f88:18ef with SMTP id 586e51a60fabf-2737ef28a25mr2498926fac.13.1724244653297; Wed, 21 Aug 2024 05:50:53 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 13/18] qemuboot: Trigger write_qemuboot_conf task on changes of kernel image realpath Date: Wed, 21 Aug 2024 05:50:24 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Aug 2024 12:51:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203601 From: "Weisser, Pascal.ext" The qemuboot.conf file contains the realpath of the kernel image referenced by QB_DEFAULT_KERNEL. So, it must be recreated in case the realpath of the referenced kernel image changes. The variables KERNEL_IMAGE_NAME and KERNEL_IMAGE_BIN_EXT determine the realpath of the kernel image relative to DEPLOY_DIR_IMAGE. Adding both of them to the vardeps of the write_qemuboot_conf task triggers the write_qemuboot_conf task in case the realpath of the kernel image referenced by QB_DEFAULT_KERNEL changes. Fixes: [YOCTO 15525] Signed-off-by: "Weisser, Pascal" Signed-off-by: Richard Purdie (cherry picked from commit f8b3975a9ce36ea7af5fd76243a823da2842415b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/qemuboot.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass index 895fd38d68..0f80c60ab5 100644 --- a/meta/classes-recipe/qemuboot.bbclass +++ b/meta/classes-recipe/qemuboot.bbclass @@ -129,7 +129,8 @@ addtask do_write_qemuboot_conf after do_rootfs before do_image def qemuboot_vars(d): build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE', - 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME', + 'KERNEL_IMAGETYPE', 'KERNEL_IMAGE_NAME', + 'KERNEL_IMAGE_BIN_EXT', 'IMAGE_NAME', 'IMAGE_LINK_NAME', 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE', 'STAGING_DIR_HOST', 'SERIAL_CONSOLES', 'UNINATIVE_LOADER'] return build_vars + [k for k in d.keys() if k.startswith('QB_')] From patchwork Wed Aug 21 12:50:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48053 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D01FC5320E for ; Wed, 21 Aug 2024 12:51:04 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.18792.1724244655516779624 for ; Wed, 21 Aug 2024 05:50:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1a96zp68; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71423273c62so646067b3a.0 for ; Wed, 21 Aug 2024 05:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244655; x=1724849455; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HDzElHhpPH5EaKYk0JRxHe7eoUng+m9Y+d7qz+qfxx0=; b=1a96zp68an7PJbXl2XvpKsylqCS1G4lqhArOq9Jfgp6Rrex+gBJrkGSCXGxa3BH3F4 7myBVNSUK11MCEjsU468IONO4Ej24a+jB423L/o0M8y10DQrp1ZSA8HdZFDkqeWxDkmV lZZSDSN8iCwM+kgmz3PvoYWpb+9jvmNRhOB/U03USMsvu/TxLzbfaebWtv3/tVQCkFFD X7EuefYMVYkiOwadg+9BMRJMSsSDjR74A8hFHtYYy0liMRFMYHdPbY0Bdoy6WF+HC+zW DOqfl1L4/SVMhM1dsml7tRiVL4zH5UXVFxyQ3rIdV1uCw/oXCBAx8KuyyDQnHEsAmFAU audw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244655; x=1724849455; 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=HDzElHhpPH5EaKYk0JRxHe7eoUng+m9Y+d7qz+qfxx0=; b=n30Io9GkP7mOpZF3z3RVHP2BdzFskD6b4ZZgY8DKZnB7v7CqZIIHbbvmeuTqDE7/DB yxfvRInh+ff59MXJA6LIx1oOU01DbU/ohz5mGXjsq3d42m9zHIA/Q53gC6G2vIrIBCYc qw2AWzoj0uRmUCUDqKUvxeTu3+WJlsRSOyaGB6H7psBpG4m+Sq3l9uwZtIqc4eEN+DdL khke57s1t3mmvvyEjc5acf9j4fq/Km1xCJ0BWrzACfUmWBraEq2TLYFvHSvPV0S3DNci ooCpIiV+K/tiwelWp8JQbvEpBwZFAgsuDOJ7HEgiXeHfdLmbPbu9W4falMBlQD9L7r1S lajg== X-Gm-Message-State: AOJu0YyvCPAkvLzaJUjQvaGI1y12H+J7IAdTjutv+fh6uPt3I/Zg99rV PFttRTWbnX+mTFjR9Tk8LUjJ3SWSqxb1ujPg55R6KES9lQlvmmWJYzZqAo4QetHGSm0hBVBkUZQ 2Tb0= X-Google-Smtp-Source: AGHT+IFLFQRlFykcM48vRER4EMsLOzP/QhvMlkvTU9JBUAxLa22EQlKUOlwj6iLlru6HPkc/lqgejg== X-Received: by 2002:a05:6a21:2986:b0:1c0:e49a:6900 with SMTP id adf61e73a8af0-1cad80ef085mr2459650637.7.1724244654668; Wed, 21 Aug 2024 05:50:54 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 14/18] oeqa/runtime/ssh: add retry logic and sleeps to allow for slower systems Date: Wed, 21 Aug 2024 05:50:25 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 21 Aug 2024 12:51:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203602 From: Jon Mason On exceptionally slow systems, the ssh test can intermittently fail due to a race between when ping works and the networking applications being brought up. To work around this issue, add some retry logic when ssh fails to connect. According to the man page of ssh, "ssh exits with the exit status of the remote command or with 255 if an error occurred." So, only retry if the return code is 255, and limit the number of retries to prevent it looping forever. Signed-off-by: Jon Mason Signed-off-by: Richard Purdie (cherry picked from commit f0fe0b490d309cdf1c97754f85a61b5b948b7f28) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index cdbef59500..ae92bb34cd 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -4,6 +4,8 @@ # SPDX-License-Identifier: MIT # +import time + from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends from oeqa.runtime.decorator.package import OEHasPackage @@ -13,12 +15,20 @@ class SSHTest(OERuntimeTestCase): @OETestDepends(['ping.PingTest.test_ping']) @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): - (status, output) = self.target.run('sleep 20', timeout=2) - msg='run() timed out but return code was zero.' - self.assertNotEqual(status, 0, msg=msg) - (status, output) = self.target.run('uname -a') - self.assertEqual(status, 0, msg='SSH Test failed: %s' % output) - (status, output) = self.target.run('cat /etc/controllerimage') - msg = "This isn't the right image - /etc/controllerimage " \ - "shouldn't be here %s" % output - self.assertEqual(status, 1, msg=msg) + for i in range(5): + status, output = self.target.run("uname -a", timeout=5) + if status == 0: + break + elif status == 255: + # ssh returns 255 only if a ssh error occurs. This could + # be an issue with "Connection refused" because the port + # isn't open yet, and this could check explicitly for that + # here. However, let's keep it simple and just retry for + # all errors a limited amount of times with a sleep to + # give it time for the port to open. + time.sleep(5) + continue + else: + self.fail("uname failed with \"%s\"" %output) + if status == 255: + self.fail("ssh error %s" %output) From patchwork Wed Aug 21 12:50:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48054 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81EE9C5472D for ; Wed, 21 Aug 2024 12:51:04 +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.18883.1724244656819325717 for ; Wed, 21 Aug 2024 05:50:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=TsVdBwuL; 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-7c6b4222fe3so4018410a12.3 for ; Wed, 21 Aug 2024 05:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244656; x=1724849456; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pjL4ZbbRwjyX2A7MTvPjx33/hdmkF+pgA1G/nt62P6I=; b=TsVdBwuLIa3+KZpvFydsjG+/2V+iJ5YPdZbGJuRE4QAXNPVS4/Tpu6/DC4yqqS8jTk 1nAorKLiJFDx/tJoFg5dFm98I1pkN6MMS8PmQtuG2mskyrXFs4YyfXb+huPqXNtLB5r5 R88y4AXGYtx+SldCHbWS4kqOwZYlSpS6Kk8eEawTuN9U7DjLqAL3uLz6PSvCkxoXb8sr SutnxnqInQzBru9v3eOHM5argleUH69LXIat0p5nu9WxM098Xk9iND5vVTAmxEzsZcZs wKfF2S+KPY4J0VgKi6SjUxwEMpkgx0eP9t7+fXWc3lKgCmWxTIfyk+COroyy2nItZC4x B2Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244656; x=1724849456; 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=pjL4ZbbRwjyX2A7MTvPjx33/hdmkF+pgA1G/nt62P6I=; b=W2M5aEeZorgsxsiTxDgaXKtzv2PiSo0y5SnuY76TKrxxWghIme9BWfRclxRxjb2pGx 5zBItYjZF0Q6SM/w7LGU4/8V3Q/JbUe2O3WyOZljZqtVXSkKSCzEcMrRcSfQXvvSWbHQ GPiiwRjaYJwvRFYjGJ3roOQ2k991O9rROq+puUKdh7VUjQAdBbmYpjnmYlrs50NtO0sG 95UwDXcZdgK3xs1ByxDFzNOI76bRlPk2N72G11hcdjv26pTzHQdc603CpSCoLV9nuZzS mXk7pOOCFHpR2oRRFHck2jDepmiUXuYBOl6DyUYreNf7DlrUp+okTH/GrwONtGotyPpb MBBw== X-Gm-Message-State: AOJu0YwViHJfLHlN5EwmucTSRoXUBYF+DJPFUb+7SJ66XxqqZSLg7MPh l7ote4jZ//pnAuhxfhR9gGN7A1J0VD+ZatYGZMFNXeUwogFWGkPjzDlOUgrsFYXLLVdDQ35jZB9 En4c= X-Google-Smtp-Source: AGHT+IHg0wTliD0BOc+AMjhvlXXy3bLDWqjjitVzD+peWZXVe6zbmK1FHNZGEJmt468obYxrNsZAdA== X-Received: by 2002:a05:6a20:6f87:b0:1be:c5ab:7388 with SMTP id adf61e73a8af0-1cad7fcd121mr3036732637.25.1724244655974; Wed, 21 Aug 2024 05:50:55 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 15/18] oeqa/runtime/ssh: In case of failure, show exit code and handle -15 (SIGTERM) Date: Wed, 21 Aug 2024 05:50:26 -0700 Message-Id: <1bd6b0e29650c34652c1027b6975eb8620a73c55.1724244509.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 ; Wed, 21 Aug 2024 12:51:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203603 From: Richard Purdie Ensure we show the failing exit code in case of failures. We're seeing autobuilder failures with -15 (SIGTERM) which is probably from slow boot/init. Retry in these cases for now. Signed-off-by: Richard Purdie (cherry picked from commit 127d3bd8d5509ae17e359c1365859fd362ffc74f) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index ae92bb34cd..9a8deb3f25 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -5,6 +5,7 @@ # import time +import signal from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends @@ -19,16 +20,18 @@ class SSHTest(OERuntimeTestCase): status, output = self.target.run("uname -a", timeout=5) if status == 0: break - elif status == 255: + elif status == 255 or status == -signal.SIGTERM: # ssh returns 255 only if a ssh error occurs. This could # be an issue with "Connection refused" because the port # isn't open yet, and this could check explicitly for that # here. However, let's keep it simple and just retry for # all errors a limited amount of times with a sleep to # give it time for the port to open. + # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely + # from boot/init not being 100% complete, retry for these too. time.sleep(5) continue else: - self.fail("uname failed with \"%s\"" %output) + self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) if status == 255: self.fail("ssh error %s" %output) From patchwork Wed Aug 21 12:50:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48052 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81DA4C54722 for ; Wed, 21 Aug 2024 12:51:04 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.18885.1724244658244950205 for ; Wed, 21 Aug 2024 05:50:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YnDXdrXh; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7cd8131c7f9so933087a12.0 for ; Wed, 21 Aug 2024 05:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244657; x=1724849457; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jRvEO6Ohaax2CHAdkoREjF7Q2aJAiV2c4RExO2URKIA=; b=YnDXdrXhtjcpN11pzyarFWDys/dYh3FESbDHk3ch44EUNKFRT1QWSbq4ZWBE0pBqEm dKq0o9hwCZIrxsMBotQOln+TNrKc2PzWxwWxJET0S2zl6V/tlUcVnZIQVFLHae+D4ut6 gLDsBGBPc6wqgtRzePlEHQN+qgO8Xa/n9Q6SMlQ6tHyqE+d3LHOuKYFhqstCz9Njuv2U Sgdj8DuskbgKQHVPmmB+jPJ3QbbBYxzp06RWGxwye3JJ4A8VUsHsKzMeXWkHpfvUml0g VXnl5lKe3Rtj1oflwaxltEqK+r+x2ltZidAGQ8xdgmypEE4a732DmTl7SUlUA9Zxaw7B RayA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244657; x=1724849457; 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=jRvEO6Ohaax2CHAdkoREjF7Q2aJAiV2c4RExO2URKIA=; b=WUy1BI7KjYvRN6isizHAt44z7auWZxoXD+3xdF02iYASYDllWgi1/jxc70yMaQojHu +UW5Z3Lifk6uP07hGcb0fEX/n3HDi1Ab9iZA329Z7FYYHtuVAGIz7NM0U0C2+a7a9JuX rNzdDRvUBobEkMN3pkqvkxo6gQbu8yxJ9jlQjgXyL2yb9kn8g61RA0nf2ynnHMx+06Wh gmxx+B86WERyjtaIuQ5JFs/A8SmIZVzkt8ZGB5IHK02OMLM8cLwxZRnnapZK+logaHst WtmrBHPJweMf09Dw6yRGJs63kbbJq5fG6y/HlW5lPce3pEI6hse8GAGn1FCozd0SOyQ+ rKQA== X-Gm-Message-State: AOJu0YwTOTw/mYYX6sGOLosl21nqh7A5f3P6RH9vgnweYwMK8pVhaI0w ES1JhaswgVmGHUmK9CVGOvm0m6e9Vuv+b6eyOHaAvHP2hk7yZ5DyK7GMUo21/eAKYrJTUr/nrK4 aQGA= X-Google-Smtp-Source: AGHT+IGlUXGuxsltnFVXlalvhMiA+ghPg3DlQsoexcRIfAcfTR5rk0SaO7muBxZPEfB8w1PAImpGCg== X-Received: by 2002:a05:6a21:6282:b0:1c4:8293:76db with SMTP id adf61e73a8af0-1cad80f3f35mr2630569637.29.1724244657400; Wed, 21 Aug 2024 05:50:57 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 16/18] oeqa/runtime/ssh: check for all errors at the end Date: Wed, 21 Aug 2024 05:50:27 -0700 Message-Id: <52a67132d4d7e656a39d87c03b1c6162018e8908.1724244509.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 ; Wed, 21 Aug 2024 12:51:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203604 From: Jon Mason With the retry for the -SIGTERM, it is possible to still see that error after the 5th attempt and mark the run a success. Check for any non-zero status in the final check and error out to close the gap. While there, make the error print match the one above and be a little more verbose. Also, I'm seeing it take roughly 6 attempts on my local (very slow) system to pass. So, increasing the number of attempts to 10. Signed-off-by: Jon Mason Signed-off-by: Richard Purdie (cherry picked from commit 3c3ebe591eef6e0479d623ec2237cfea16db5c80) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/ssh.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py index 9a8deb3f25..08430ae9db 100644 --- a/meta/lib/oeqa/runtime/cases/ssh.py +++ b/meta/lib/oeqa/runtime/cases/ssh.py @@ -16,7 +16,7 @@ class SSHTest(OERuntimeTestCase): @OETestDepends(['ping.PingTest.test_ping']) @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): - for i in range(5): + for i in range(10): status, output = self.target.run("uname -a", timeout=5) if status == 0: break @@ -33,5 +33,5 @@ class SSHTest(OERuntimeTestCase): continue else: self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) - if status == 255: - self.fail("ssh error %s" %output) + if status != 0: + self.fail("ssh failed with \"%s\" (exit code %s)" % (output, status)) From patchwork Wed Aug 21 12:50:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48051 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FF2BC52D7C for ; Wed, 21 Aug 2024 12:51:04 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.18795.1724244659859698060 for ; Wed, 21 Aug 2024 05:50:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=QkyY+E8/; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-71423273c62so646128b3a.0 for ; Wed, 21 Aug 2024 05:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244659; x=1724849459; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GcuXV5pOtzaQK9d/7/FRojEFAcxKPsGuB9i19+WRUNU=; b=QkyY+E8/WtdEmsaQr6SPco0xxQUoJFgBI1UCc5fw31AV2FqqWGtCkalHCoZG1O3fnB /VFjg40RfGyi+ohKI1YFnEDeyCFyr7uXnhylV2DxR8LHnFPl/oUnNfQq7/9nGbfAO9z1 7plbFrMXQxpDJjfpd5xR/9XvYpwZJlmlaZedoKthbuurkR8fqjS7BQhSfUh4l6TkfPmZ 9n1aSdMW7ukkpRb/ukPzPjklnoeWaQ+FdxG00WQ18Sp6PkujtLAfiiRqh0HjzovyiNwi UDoHvEZSIrebGpOnKhkOShAJkisQFI+lJO2TZTSC6ycGcDunwvcf3hv4LCuHAmowudkv BK6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244659; x=1724849459; 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=GcuXV5pOtzaQK9d/7/FRojEFAcxKPsGuB9i19+WRUNU=; b=bHl/Sdz1l94DJjMB06kZHQJJDHeEaCUMyZIpZX1qWcDHSbVdvzVk2tf5d4zBYLN43C byaPmmshOGAQ1zlMrTROHXvGJa+sgAnaFYfgtTZqLzGQrVWWJmYW8zd5b8YieluBwHjk XdU/DytLyUiK6X5ycIFE4WM8cnCNV2qKtutb856bNaslAT12KeuP4Hn+zwLn5o4TVmPA 91UgYJsJ5Oy/3eKh+rAQkkFpgpqfloJXvN9DJqNXjbX5DHl0KZ/SIOHiz9Jnv+ShdPgX VDQNXsGD8Jhpm6/v2HOOYLMg6696HHzBNI0q1l1ZDyO8E6Gzlf/tueor4WE/mg0kGMh8 vL0A== X-Gm-Message-State: AOJu0YyOXXjDRtV1H0aASnEwUTJufA95kw9CLb5F5yU0QLPramWtumXK pCsMhgYwJ8XML17IzQD3s6g8kZiQSlRyfHZuOKRJLk2XfST3QLO8aAyy60PFDQ5xfxVQKQeAn3c IgD4= X-Google-Smtp-Source: AGHT+IGawdH5K49yOEpVKnOKYGL012Z0TVL6lQo04cR4n4RLgb/RoTw5CheNdQB5RdQTs9qR3qzQPg== X-Received: by 2002:a05:6a21:6282:b0:1c8:bfa8:d552 with SMTP id adf61e73a8af0-1cad80f00bcmr3014037637.9.1724244659057; Wed, 21 Aug 2024 05:50:59 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:50:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 17/18] oeqa/selftest/reproducibile: Explicitly list virtual targets Date: Wed, 21 Aug 2024 05:50:28 -0700 Message-Id: <9f0eba6aba5e9b37975f86556c1234b145a0859e.1724244509.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 ; Wed, 21 Aug 2024 12:51:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203605 From: Richard Purdie We're seeing reproducibility failures where some packages don't appear in the "from sstate" builds. The common factor is these are all recipes with PROVIDES = "virtual/XXX". In a full build from scratch, these are build but in a build from sstate, there are situations where they aren't. For now, to try and keep builds working, work around the problem until we can better look into the problem. It is likely recent taskhash imrovements have caused this to occur more regularly. Signed-off-by: Richard Purdie (cherry picked from commit 68086a333acc54390e4e589ef928dc90da3edb48) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/reproducible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 80e830136f..021e894012 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -133,7 +133,8 @@ class ReproducibleTests(OESelftestTestCase): max_report_size = 250 * 1024 * 1024 # targets are the things we want to test the reproducibility of - targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world'] + # Have to add the virtual targets manually for now as builds may or may not include them as they're exclude from world + targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world', 'virtual/librpc', 'virtual/libsdl2', 'virtual/crypt'] # sstate targets are things to pull from sstate to potentially cut build/debugging time sstate_targets = [] From patchwork Wed Aug 21 12:50:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 48050 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49025C5321D for ; Wed, 21 Aug 2024 12:51:04 +0000 (UTC) Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by mx.groups.io with SMTP id smtpd.web11.18888.1724244661402204209 for ; Wed, 21 Aug 2024 05:51:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=h8VRAYlt; spf=softfail (domain: sakoman.com, ip: 209.85.160.48, mailfrom: steve@sakoman.com) Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-270263932d5so3104059fac.2 for ; Wed, 21 Aug 2024 05:51:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1724244660; x=1724849460; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=53UViDb+qAsZ0iYek70JCpBFOlMlA0pkNmFmYEtq+2c=; b=h8VRAYltVTsHrCvjOpRu7iOXtrw5Ur4NLEptE/k3X/xWmQ1sk9GweKNrb9EQMexZDV EnDPlnYsgZej0/kz0sFMlRq33lmBmgsgQljCPOvoSCbZ8yXTifwdBHx0IstN4L0Gr3gP e8zs1nc9P7XOoQcq12NnEc84XCmiKRqNcEtma/LF2i01/g+ReV9OnTZuwe0bGFW2sR7Q gO0GZjRIic+wqofAOLRm0wjfcASl/ASj5gz4IyzexAIjTYOgi4bE7J8OY07+hphEoJgA evYOrjmwUv4TwLOKsnboBo3YThlY5k3OKcxyNkKBOWvUUSifUQgYoRZGrjS1yTMZOJmg +dSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724244660; x=1724849460; 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=53UViDb+qAsZ0iYek70JCpBFOlMlA0pkNmFmYEtq+2c=; b=fnlUa4YJBEZq7wczvAlZtgVtDtXcYOn9O7gAUr19vUNq+So800gNHAW8Ey72zVHpiG pogv22U5XNXjFxKJ+6s5iKgaQOG1GozcOjJZimIajcS8J0VDvZQHyQtN8SeH67ZO7H1Q y3+JDjn6ZX4QYWvR7UkRnu83FrQQEz+UTSjLN1rUqKGjCFgcuKRBB2zSYKiTvSbePnCr P/5ED3Hn7KGIPikoGwqVapWfnRMN+uLtvNgQmAv+qackqcVLah970AqfTsIbjoULFuu2 ZovHOFFCb4sLRWFDqdCdQQh84fCs1rQ/6Sg5XbAPIEhaSY+1u57hFqEwPLbMa55MQ7qF DnVg== X-Gm-Message-State: AOJu0YxPoEleyBXl+89IvH70WKa3QEa52UpPoWp5+DmJL8BCyvzNotu7 7uGX04spSoxlyFqRkIENZUwQ4ulEDca+g4PGFEoQRkHBCKxu0iE8vUpr8QL3IlUhfIyKALyHmht RkCk= X-Google-Smtp-Source: AGHT+IGpS+xecuZFfC5qFR8rxFboSEKi2ZlLTq8bqwl9mRdUxI3xDYuiwn2pYHkQ0NOSd1a7IF3OPA== X-Received: by 2002:a05:6870:b52c:b0:260:fb11:3e49 with SMTP id 586e51a60fabf-2738becd823mr2016634fac.45.1724244660479; Wed, 21 Aug 2024 05:51:00 -0700 (PDT) Received: from hexa.. ([98.142.47.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7142a8a481dsm691789b3a.36.2024.08.21.05.50.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 05:51:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][scarthgap 18/18] oeqa/utils/postactions: transfer whole archive over ssh instead of doing individual copies Date: Wed, 21 Aug 2024 05:50:29 -0700 Message-Id: <8b5c66c91d94f4c8521fe9443e65d86063dba5e5.1724244509.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 ; Wed, 21 Aug 2024 12:51:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/203606 From: Alexis Lothoré Fixes [YOCTO 15536] The postactions retrieval actions currently rely on scp executed individually on any file or directory expanded from TESTIMAGE_FAILED_QA_ARTIFACTS. Unfortunately, symlinks are not preserved with this mechanism, which lead to big storage space consumption. Things may go even worse if those symlinks create some circular chains. This mechanism then needs to be updated to preserve symlinks instead of following them during copy. There are multiple ways to do it: - create a local archive on the target and execute scp on this file - use rsync instead of scp for all files - create an archive and pipe it to ssh instead of storing it onto the target The first solution may create pressure on targets storage space, while the second assumes that rsync is installed on the target, which may not be true. So the third one is a compromise: tar is very likely present, at least through busybox, and no disk space is used on the target. Replace the current per-file scp call by a single call to tar run on the target. Retrieve the generated compressed archive directly from SSH output, and feed it to another tar process but on host, to uncompress and extract it at the same place as before. Signed-off-by: Alexis Lothoré Signed-off-by: Richard Purdie (cherry picked from commit 4aeb10aa38efc6768928fbb74985e36e972b8e46) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/postactions.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/meta/lib/oeqa/utils/postactions.py b/meta/lib/oeqa/utils/postactions.py index ecdddd2d40..2a08129d6c 100644 --- a/meta/lib/oeqa/utils/postactions.py +++ b/meta/lib/oeqa/utils/postactions.py @@ -62,17 +62,16 @@ def get_artifacts_list(target, raw_list): return result def retrieve_test_artifacts(target, artifacts_list, target_dir): + import io, subprocess local_artifacts_dir = os.path.join(target_dir, "artifacts") - for artifact_path in artifacts_list: - if not os.path.isabs(artifact_path): - bb.warn(f"{artifact_path} is not an absolute path") - continue - try: - dest_dir = os.path.join(local_artifacts_dir, os.path.dirname(artifact_path[1:])) - os.makedirs(dest_dir, exist_ok=True) - target.copyFrom(artifact_path, dest_dir) - except Exception as e: - bb.warn(f"Can not retrieve {artifact_path} from test target: {e}") + try: + cmd = "tar zcf - " + " ".join(artifacts_list) + (status, output) = target.run(cmd, raw = True) + if status != 0 or not output: + raise Exception("Error while fetching compressed artifacts") + p = subprocess.run(["tar", "zxf", "-", "-C", local_artifacts_dir], input=output) + except Exception as e: + bb.warn(f"Can not retrieve {artifact_path} from test target: {e}") def list_and_fetch_failed_tests_artifacts(d, tc): artifacts_list = get_artifacts_list(tc.target, d.getVar("TESTIMAGE_FAILED_QA_ARTIFACTS"))