From patchwork Sun Jul 3 19:35:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9774 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 0A60AC433EF for ; Sun, 3 Jul 2022 19:36:26 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web11.63994.1656876984055619540 for ; Sun, 03 Jul 2022 12:36:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=8FIXIU7+; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id o15so2884233pjh.1 for ; Sun, 03 Jul 2022 12:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QdGyJHuYju6tYqVzJtYtiahpMlu3fVWgYyw8TBmSkUM=; b=8FIXIU7+8tlSnNK7mgAtf0l79CYPsNqx+TswMTaRlhdgj+/t8YD7mbS+bnJTgZXwsF TG9ywCNiMnwfbEevMhc/s19QAWQjNe3W9uaxexwKBQWXfNiKtdMz+G1Z4DVI8xGpV80Z zTVZJHXn8Qso5SYMXJ/+VK6XhPAHhjL8NjTew2w5hCHVB0dehc7mFuRA6sam2Gu+wIi0 xZ/EZyPP9ZxqDgQaxDJbUcJ1zMjULYaOgboGX2TWXQ95e54DhGJq2MsIBMOhcltUWhuc 680xsp/SId9DJaURhVFEmMagzEoBzyNi9BigukY/aELHwizf7ML94OUhZsG/xHlT50w8 aq/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QdGyJHuYju6tYqVzJtYtiahpMlu3fVWgYyw8TBmSkUM=; b=WoorHsj/W+1X1mjkPq2ENKJKDq7C0PkbMcyKuq8MR6gvEu7i6Uf8Hq6jkF1zcCaM82 u61eC9hQmZBKRV1ci1XHj3DVA7QvCAFa2CS72X8prJ8uVu/g8sQJSxfILfA1DB+KrRn8 M0jTO1im9SIIU+He9BPHerdM3tgKZawMSTLdPlwj3mucmuULAUNA727bUHaOeOUkygAD udlo758JyRFOQ6keTaKDLDtsACnrwFz7KzrNXL2JRkrl7cr7Hy1xbSKY/IMybFcEFHl7 htI75/SGHiMBvpvCODeFI8P/zpAREDkG6MIh8qhf85Wlshbm/eVFcTZPtXuWp9VR3LvC qOVQ== X-Gm-Message-State: AJIora9/34H/e9rWqiqJcB4/jNBttWt1sDgx4aCk1peqR0VTl0++bhLC GA2lT03D6D0NVGoa36iqHwmQRz554kYk5G8j X-Google-Smtp-Source: AGRyM1smG1oSyREYBo9nx8YWdWF0DIro0HTOVQUysgiYCPnnZuoWXzXP+28D7ba/fHZRlBuxVPIZMA== X-Received: by 2002:a17:90a:6b45:b0:1e3:3cfa:3104 with SMTP id x5-20020a17090a6b4500b001e33cfa3104mr32926071pjl.113.1656876983050; Sun, 03 Jul 2022 12:36:23 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/30] unzip: Port debian fixes for two CVEs Date: Sun, 3 Jul 2022 09:35:36 -1000 Message-Id: <6a277ba7964c0ce029e1097f061007484f63bcf5.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167561 From: Richard Purdie Add two fixes from debian for two CVEs. From: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010355 I wans't able to get the reproducers to work but the added error checking isn't probably a bad thing. Signed-off-by: Richard Purdie (cherry picked from commit 054be00a632c2918dd1f973e76514e459fc6f017) Signed-off-by: Steve Sakoman --- .../unzip/unzip/CVE-2022-0529.patch | 39 +++++++++++++++++++ .../unzip/unzip/CVE-2022-0530.patch | 33 ++++++++++++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 2 + 3 files changed, 74 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2022-0529.patch create mode 100644 meta/recipes-extended/unzip/unzip/CVE-2022-0530.patch diff --git a/meta/recipes-extended/unzip/unzip/CVE-2022-0529.patch b/meta/recipes-extended/unzip/unzip/CVE-2022-0529.patch new file mode 100644 index 0000000000..1c1e120deb --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/CVE-2022-0529.patch @@ -0,0 +1,39 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010355 + +CVE: CVE-2022-0529 +Upstream-Status: Inactive-Upstream [need a new release] + +diff --git a/process.c b/process.c +index d2a846e..99b9c7b 100644 +--- a/process.c ++++ b/process.c +@@ -2507,13 +2507,15 @@ char *wide_to_local_string(wide_string, escape_all) + char buf[9]; + char *buffer = NULL; + char *local_string = NULL; ++ size_t buffer_size; + + for (wsize = 0; wide_string[wsize]; wsize++) ; + + if (max_bytes < MAX_ESCAPE_BYTES) + max_bytes = MAX_ESCAPE_BYTES; + +- if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) { ++ buffer_size = wsize * max_bytes + 1; ++ if ((buffer = (char *)malloc(buffer_size)) == NULL) { + return NULL; + } + +@@ -2552,7 +2554,11 @@ char *wide_to_local_string(wide_string, escape_all) + /* no MB for this wide */ + /* use escape for wide character */ + char *escape_string = wide_to_escape_string(wide_string[i]); +- strcat(buffer, escape_string); ++ size_t buffer_len = strlen(buffer); ++ size_t escape_string_len = strlen(escape_string); ++ if (buffer_len + escape_string_len + 1 > buffer_size) ++ escape_string_len = buffer_size - buffer_len - 1; ++ strncat(buffer, escape_string, escape_string_len); + free(escape_string); + } + } diff --git a/meta/recipes-extended/unzip/unzip/CVE-2022-0530.patch b/meta/recipes-extended/unzip/unzip/CVE-2022-0530.patch new file mode 100644 index 0000000000..363dafddc9 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/CVE-2022-0530.patch @@ -0,0 +1,33 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010355 + +CVE: CVE-2022-0530 +Upstream-Status: Inactive-Upstream [need a new release] + +diff --git a/fileio.c b/fileio.c +index 6290824..77e4b5f 100644 +--- a/fileio.c ++++ b/fileio.c +@@ -2361,6 +2361,9 @@ int do_string(__G__ length, option) /* return PK-type error code */ + /* convert UTF-8 to local character set */ + fn = utf8_to_local_string(G.unipath_filename, + G.unicode_escape_all); ++ if (fn == NULL) ++ return PK_ERR; ++ + /* make sure filename is short enough */ + if (strlen(fn) >= FILNAMSIZ) { + fn[FILNAMSIZ - 1] = '\0'; +diff --git a/process.c b/process.c +index d2a846e..715bc0f 100644 +--- a/process.c ++++ b/process.c +@@ -2605,6 +2605,8 @@ char *utf8_to_local_string(utf8_string, escape_all) + int escape_all; + { + zwchar *wide = utf8_to_wide_string(utf8_string); ++ if (wide == NULL) ++ return NULL; + char *loc = wide_to_local_string(wide, escape_all); + free(wide); + return loc; + diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index c222a684b4..f35856cf61 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -29,6 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://unzip_optimization.patch \ file://0001-configure-Pass-LDFLAGS-to-tests-doing-link-step.patch \ file://CVE-2021-4217.patch \ + file://CVE-2022-0529.patch \ + file://CVE-2022-0530.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Sun Jul 3 19:35:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9775 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 DD6E6CCA473 for ; Sun, 3 Jul 2022 19:36:35 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web09.64577.1656876987597484452 for ; Sun, 03 Jul 2022 12:36:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=DITqoqxn; spf=softfail (domain: sakoman.com, ip: 209.85.216.46, mailfrom: steve@sakoman.com) Received: by mail-pj1-f46.google.com with SMTP id h9-20020a17090a648900b001ecb8596e43so7560985pjj.5 for ; Sun, 03 Jul 2022 12:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=o34fG+NPXN0+GfpLzPo8UT3ICYNE5RuzcOPc4z9NdGs=; b=DITqoqxn9e74uCi7HIE2aHnls1zCIxR0/j6C0ancdDTeZFiB0duNgzLB2o+ODt64Vs OLehsqAQxoKSR7eiew7mIBAhg0Xgo/ka5K5wSz5On/Pq39g6LNpbNneoQM87tVimyZ0v IQBUS/B5R4V2hq8/k2in3nJB1rHeyLBxBA2ytFsnfsD9Crownrm0SRQwDlp3kpso14fu NFfpuxwWhgP9blda9MQzi6jgVzp1WH3f14iX/ninWvIaRtq0m0De0xeB09S3fz3Udujd bMBi4NhuoS6wF/5sbMb9LTe8+k53e5jxl51LTYGPRpHKnGfZ4KOC1iXgBOUHqMtfzzKA mtcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o34fG+NPXN0+GfpLzPo8UT3ICYNE5RuzcOPc4z9NdGs=; b=EintaE5VEdV5dicSd3RVC5Snlr8+VpIpOR7Hew7VFmSHrnY9WMR+BpCgdNwmk3Xu5S 484Nx+B3TS1KcZSZUlxomqjJRJMjDGOTW8wZMnHvGuHdntjrZDdZFEnDJs+x0/8iiBmn TRq+RH8A2H4R/ZgWjrvPe4d4snul/PQtJ0woIHY030oF8qIhrzCkKEL+jS9Lzf5u0JVT NZ2o6D7zFjlh9gXXdSbOam9gyjRPiC06PEuVxXlZyrKOhi9b93SZdqckTPj5bDZGnsHY WI4cootnwvfQlRV1d4jXxDCkoF7rtGgHVq1ovB9bl0FVRPtB7qDhU5sOZQTBDg9QWl0N WEcA== X-Gm-Message-State: AJIora/aMMJFMimMPpcIgeRICuEMAeCT1AAxzlV1bXGSaMYEUQhOnNyn XEG8OHC+88TIM/2/7YLd16JMUD98y/laMpae X-Google-Smtp-Source: AGRyM1tz6QHQYs+DH3vtPxJQbpBNWZ4rWj2RGymDtVK31UOYx41xX7mm5Bmc5HzJ58XJ4JjiY83A5A== X-Received: by 2002:a17:902:76c4:b0:16a:deb:c0ae with SMTP id j4-20020a17090276c400b0016a0debc0aemr33058309plt.22.1656876986588; Sun, 03 Jul 2022 12:36:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/30] ghostscript: fix CVE-2022-2085 Date: Sun, 3 Jul 2022 09:35:37 -1000 Message-Id: <645a619524d04aa6a2029a2810e2d84dc751fc48.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167562 From: Lee Chee Yang Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- .../ghostscript/CVE-2022-2085.patch | 44 +++++++++++++++++++ .../ghostscript/ghostscript_9.55.0.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2022-2085.patch diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2022-2085.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2022-2085.patch new file mode 100644 index 0000000000..58cb93727a --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2022-2085.patch @@ -0,0 +1,44 @@ +From ae1061d948d88667bdf51d47d918c4684d0f67df Mon Sep 17 00:00:00 2001 +From: Robin Watts +Date: Wed, 16 Feb 2022 15:22:50 +0000 +Subject: [PATCH] Bug 704945: Add init_device_procs entry for mem_x_device. + +When allocating a buffer device, we rely on an init_device_procs +being defined for the device we are using as a prototype. Which +device we use as a prototype depends upon the number of bits per +pixel we are using. For bpp > 64, we use mem_x_device, which does +not currently have an init_device_procs defined. + +This is a fairly hard case to tickle, as very few devices use +more than 64 bits per pixel. The DeviceN device is one of the +few that does, and then the problem only kicks in if the +MaxBitmap figure is high enough (or conversely the resolution is +low enough). + + +http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=ae1061d948d88667bdf51d47d918c4684d0f67df +Upstream-Status: Backport +CVE: CVE-2022-2085 +Signed-off-by: Chee Yang Lee +--- + base/gdevmx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/base/gdevmx.c b/base/gdevmx.c +index 08b0cbcfe..89e9ff774 100644 +--- a/base/gdevmx.c ++++ b/base/gdevmx.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2021 Artifex Software, Inc. ++/* Copyright (C) 2001-2022 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -25,4 +25,4 @@ + + /* The device descriptor. */ + const gx_device_memory mem_x_device = +- mem_device("imagex", 256, 0, NULL); ++ mem_device("imagex", 256, 0, mem_initialize_device_procs); +-- +2.25.1 diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb b/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb index c28e62f089..365420fb64 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.55.0.bb @@ -33,6 +33,7 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://do-not-check-local-libpng-source.patch \ file://avoid-host-contamination.patch \ file://mkdir-p.patch \ + file://CVE-2022-2085.patch \ " SRC_URI = "${SRC_URI_BASE} \ From patchwork Sun Jul 3 19:35:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9776 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 DCBECC43334 for ; Sun, 3 Jul 2022 19:36:35 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web09.64579.1656876992173322453 for ; Sun, 03 Jul 2022 12:36:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fhMwS00g; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id g16-20020a17090a7d1000b001ea9f820449so11526488pjl.5 for ; Sun, 03 Jul 2022 12:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QhSDRUQHh6vDRe6i+5g4w6pvKSibNr3BO2ynIBLt4JM=; b=fhMwS00gL4OVdeSoJZOKMFbG2uCij0iA+XqugZEvOeu8lvb0ct+2gXFmgJy5CGbxmp RtWv20xfvFcUu+kEFxwpcLFwUDaTOHw7p22VfrDQylpdYQRWQXmk/E2eCc7HQqq6j3/7 ekcwnFyoOYkLMqDQa5AeEFC7cH+QntpkpwxrkhHFm/9ilOxyLxA1LbCqLhPt1yzLce7e sJL/rADB5UiB1/T/PiD9cp/UnoLFF3fhAhgT9lFXjAInYjlJTg7jFqf4fv239Yk6S+MI bEIlTOb+V16KYp2xzBOq93IAEJDr9/V6S3DjM3IEMnWuKefXEnqSBGloUdpDbQ7VpAUZ 85+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QhSDRUQHh6vDRe6i+5g4w6pvKSibNr3BO2ynIBLt4JM=; b=PyZmrG5K6wFezD9G8YWakX7IVgps8yX9gytzviXkODdaKafC/3zTOiWDDY3fQR9cjr Okg7iaEJmSMGjTrCzk9JQp1SAUiVSiM+iTtTCqGUfcWoK/FOD1skcHvFh9VXiiti+OxG IUTzjiejyo6Aa6yalFW8RagHCLG8VctWPaVDY+14X+6wJ8msrt/EZT9Ix5DGXanDC9A+ h/IolHdn/FtRv2n5KwbJI6v0hYZTpNKqfFkunB0FTSi5j+D6am71tyR0cWUZUHboc7LJ NmWPz/AWR39Tmx3oWXJecDXGc8CQ/51joi5Pov8cjUNjnc8o10EIELPsjgxGyrCLEoIA QVxg== X-Gm-Message-State: AJIora8/npbFDBETtKM6GP4D6r8Nc8bugSlyxVRVe7pBjlFCGd65Qgoo ImFJ8tsPf0W2DbbJbtYRvoSGhev4AS5DU1GT X-Google-Smtp-Source: AGRyM1uuNHaE/pXrmhc/4SLgaSXqxKxluCZpO97LT9/4C/1/rC/7NWWaxknr87pc87RTitwT4vTo5Q== X-Received: by 2002:a17:903:120e:b0:16b:8167:e39e with SMTP id l14-20020a170903120e00b0016b8167e39emr31244734plh.165.1656876991111; Sun, 03 Jul 2022 12:36:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/30] binutils : CVE-2019-1010204 Date: Sun, 3 Jul 2022 09:35:38 -1000 Message-Id: <4bc6bb36dba96a534998928959acf637f9360775.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167563 From: Pgowda Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2a4fc266dbf77ed7ab83da16468e9ba627b8bc2d] Signed-off-by: Pgowda Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0c55355a83130c2c0a59e9fb94f8914499943dd4) Signed-off-by: Steve Sakoman --- .../binutils/binutils-2.38.inc | 1 + .../binutils/0014-CVE-2019-1010204.patch | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc b/meta/recipes-devtools/binutils/binutils-2.38.inc index dc0a2a4054..a069071c97 100644 --- a/meta/recipes-devtools/binutils/binutils-2.38.inc +++ b/meta/recipes-devtools/binutils/binutils-2.38.inc @@ -32,5 +32,6 @@ SRC_URI = "\ file://0011-sync-with-OE-libtool-changes.patch \ file://0012-Check-for-clang-before-checking-gcc-version.patch \ file://0013-Avoid-as-info-race-condition.patch \ + file://0014-CVE-2019-1010204.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch b/meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch new file mode 100644 index 0000000000..dad4a62038 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0014-CVE-2019-1010204.patch @@ -0,0 +1,49 @@ +From 2a4fc266dbf77ed7ab83da16468e9ba627b8bc2d Mon Sep 17 00:00:00 2001 +From: Nick Clifton +Date: Mon, 27 Jun 2022 13:07:40 +0100 +Subject: [PATCH] Have gold's File_read::do_read() function check the start + parameter + + PR 23765 + * fileread.cc (File_read::do_read): Check start parameter before + computing number of bytes to read. + +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2a4fc266dbf77ed7ab83da16468e9ba627b8bc2d] + +Signed-off-by: Pgowda +--- + gold/ChangeLog | 6 ++++++ + gold/fileread.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gold/ChangeLog b/gold/ChangeLog +index 5103dab7b67..8557dc6db7f 100644 +--- a/gold/ChangeLog ++++ b/gold/ChangeLog +@@ -1,3 +1,9 @@ ++2022-06-27 Nick Clifton ++ ++ PR 23765 ++ * fileread.cc (File_read::do_read): Check start parameter before ++ computing number of bytes to read. ++ + 2022-02-17 Nick Clifton + + * po/sr.po: Updated Serbian translation. +diff --git a/gold/fileread.cc b/gold/fileread.cc +index 2b653f78c2e..af2df215468 100644 +--- a/gold/fileread.cc ++++ b/gold/fileread.cc +@@ -385,6 +385,12 @@ File_read::do_read(off_t start, section_ + ssize_t bytes; + if (this->whole_file_view_ != NULL) + { ++ // See PR 23765 for an example of a testcase that triggers this error. ++ if (((ssize_t) start) < 0) ++ gold_fatal(_("%s: read failed, starting offset (%#llx) less than zero"), ++ this->filename().c_str(), ++ static_cast(start)); ++ + bytes = this->size_ - start; + if (static_cast(bytes) >= size) + { From patchwork Sun Jul 3 19:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9777 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 DB6F9C43334 for ; Sun, 3 Jul 2022 19:36:45 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web11.63999.1656876996006810935 for ; Sun, 03 Jul 2022 12:36:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=y7A+ugAE; spf=softfail (domain: sakoman.com, ip: 209.85.215.180, mailfrom: steve@sakoman.com) Received: by mail-pg1-f180.google.com with SMTP id e132so7122187pgc.5 for ; Sun, 03 Jul 2022 12:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=g6ZgzLjRBlK54iWYMa1JOrAJAzzqf2uHuO9wbSa0oE4=; b=y7A+ugAEX4BA8zuGyMzQGkbtS7hrL8cdE9C/W8KFGqbcbontbTuCNSOdb/n4lPveMq 9KenYNJjalS0SVo1ZLv88kxbjvL2NlqnT8ACl9uPYlM7fGIUg72RNbpqsD83LOub+rZp /Vt2TipyJDU08IlRxWEQEP/gU3RvPcddER9Sq7uNN37RmM8e3Vz/yrP/9dRr/XSOnsB1 mTEesOX4pwLzuWiLAArZIIsH2iON6UnO0RMwUriiBAoWxtI8urE+P5XmlE/m0oBfVuGk SEphVzVaRV2bJGbxe1qPBEpwSq0TGyHRXbIUTt0A9O6myAANvu28t7Y4Q/GJCNgjj4hj +LhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g6ZgzLjRBlK54iWYMa1JOrAJAzzqf2uHuO9wbSa0oE4=; b=l1prQkWJeALZspF2SHIigaKqLTsry3oc88YBbpR1hZZ8aQTLPxBv4bBekmuenvlEhd 5u5ItcynWQZTI7meoNYip665BsWQdEihzpNB0pbWwry48WqEIsnf5LHIfMp8qCAPueRE /aT2GKwx4jP+tiKBDK9MidIB7fZZpL0EPt+O4Tk/3z4wQuRBSeOXMrRhRAej93kZfyzT vaUaTsKIdZljXIdP0ukUg9iVzsjOL14Lg3eCxq35ebRtXLMl1N0D8jnkQ1SJ3/ddoDWa /8b+58TUIq1h5kOB1BRQCFDDrP/OwSypN61BKCZ6AT8ra9sosFZrscNpqwP+eB4DtSj0 UvKg== X-Gm-Message-State: AJIora+419CCF+MDuiuwENg8ZUDK4QXVeJ1MhM63YaA9OA+erxGj2mPJ 8vl4pR4qFJAteBcBh5InLRr4zJ6W37X5I6z0 X-Google-Smtp-Source: AGRyM1v3OUakWpAI2P4zM8UgPzmhoOMdha27+nYRr+uoB6bXcOOTkAfdpemO881dihyYGRJasZYRDg== X-Received: by 2002:a05:6a00:893:b0:528:646f:528a with SMTP id q19-20020a056a00089300b00528646f528amr2815489pfj.21.1656876994941; Sun, 03 Jul 2022 12:36:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:33 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/30] cups: ignore CVE-2022-26691 Date: Sun, 3 Jul 2022 09:35:39 -1000 Message-Id: <8eb224d3160e8483c2bc6ffa207a2b6fc8644c6f.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167564 From: Ross Burton This is fixed in 2.4.2, which we have, but the complex CPE in that CVE isn't parsed by cve-check correctly so it thinks that we're vulnerable. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit b40dd920f8b40eabe78db363249257818c63c074) Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 8f2ad8a009..4592980766 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -26,6 +26,8 @@ CVE_CHECK_IGNORE += "CVE-2008-1033" CVE_CHECK_IGNORE += "CVE-2009-0032" # This is an Ubuntu only issue. CVE_CHECK_IGNORE += "CVE-2018-6553" +# This is fixed in 2.4.2 but the cve-check class still reports it +CVE_CHECK_IGNORE += "CVE-2022-26691" LEAD_SONAME = "libcupsdriver.so" From patchwork Sun Jul 3 19:35:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9778 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 DB724CCA473 for ; Sun, 3 Jul 2022 19:36:45 +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.web09.64582.1656876999617003520 for ; Sun, 03 Jul 2022 12:36:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rRwMLLLp; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id a15so7163398pfv.13 for ; Sun, 03 Jul 2022 12:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7TF3c6xrkMpiSXmgSTabxuU+FWDdz7T6ny93UN95McU=; b=rRwMLLLpzVxYorQ771epD1olm2FtqkFPucjSX+JTkkULEa+yPw4pySKjMuiiGbyQ6J rQUXsbY385kXvL1SSXNJB9djMFXklewOeebW/6ZM3d9Hxa4Nv9mQ/mlnI+1h/DnMZhGx Wge965ACOAU1YC/m241Ap+OkVFNsGoCdPmvW2RcJX0Q8UynzYJDcxm2EEdZ3tL5XbuSs 1B7T5QvOq/E9o3b1wF5xOzVkIzQPbZjJlM2I7m6hbrOUnmcxaDk4KdPAJR/R09cBJlG4 1sbLkXhD4HDdQbc7qtkPfyYripjdPzl3xgJ/AyVhHVtclfrOEe2sbZ9BIXmdl4LdSHYw Ic5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7TF3c6xrkMpiSXmgSTabxuU+FWDdz7T6ny93UN95McU=; b=eCTSWKuYD+/Jmcr9PCSzjNkKDocT1gLpedUOns/84gLDT8uRfQef7wYSoQLfG/PIeD JiMyaCemPKa3ZmZx7zY8fUy/MKxCZ+AKC8egtJv+Qj8vXcTMd2wxHP856JahyhZluON9 raFADd7RivzhaQ4FnGr7eD1szKp2sTZGskp3QFY4Y57nFXKP9dMea3Fdws3t5eCAtL+T fcyjwTplwb4f74kzIpAhOZzLJYqxUV2bua8JLR551XoGWy1bnsos68xeRKIZhn+1lFew dfoIuZ6hMhKES38RcXy9M1KjEkQmCIYYgSeaJwBfPZGhNs4uIUm/hdxPu67kAxvBDMM3 fChw== X-Gm-Message-State: AJIora/jlbIRgMJ3dQfSrCWO+O2TPIZerVDYWumKOhSoXX3ZZhcqe5Xp s56nhbjWB5Rm9q4qMsNHHVP/Jvh1QocHJFQm X-Google-Smtp-Source: AGRyM1vYVHbYYkVxv96CbRFI74xu8pwMNqe01FCRmim9AnzjoPRmn4TuRSo0Dw81tobeyPVat5xDtw== X-Received: by 2002:a05:6a00:1491:b0:528:1aa1:743c with SMTP id v17-20020a056a00149100b005281aa1743cmr18977471pfu.84.1656876998491; Sun, 03 Jul 2022 12:36:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/30] busybox: fix CVE-2022-30065 Date: Sun, 3 Jul 2022 09:35:40 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167565 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit bf3d981b0303eab91d4cb19092ac27b489c8ad27) Signed-off-by: Steve Sakoman --- .../busybox/busybox/CVE-2022-30065.patch | 29 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.35.0.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/CVE-2022-30065.patch diff --git a/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch b/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch new file mode 100644 index 0000000000..25ad653b25 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2022-30065.patch @@ -0,0 +1,29 @@ +Fix use-after-free in awk. + +CVE: CVE-2022-30065 +Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2022-June/089768.html] +Signed-off-by: Ross Burton + +fixes https://bugs.busybox.net/show_bug.cgi?id=14781 + +Signed-off-by: Natanael Copa +--- + editors/awk.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/editors/awk.c b/editors/awk.c +index 079d0bde5..728ee8685 100644 +--- a/editors/awk.c ++++ b/editors/awk.c +@@ -3128,6 +3128,9 @@ static var *evaluate(node *op, var *res) + + case XC( OC_MOVE ): + debug_printf_eval("MOVE\n"); ++ /* make sure that we never return a temp var */ ++ if (L.v == TMPVAR0) ++ L.v = res; + /* if source is a temporary string, jusk relink it to dest */ + if (R.v == TMPVAR1 + && !(R.v->type & VF_NUMBER) +-- +2.36.1 diff --git a/meta/recipes-core/busybox/busybox_1.35.0.bb b/meta/recipes-core/busybox/busybox_1.35.0.bb index f2f1b35902..edf896485e 100644 --- a/meta/recipes-core/busybox/busybox_1.35.0.bb +++ b/meta/recipes-core/busybox/busybox_1.35.0.bb @@ -49,6 +49,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ file://0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch \ file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \ + file://CVE-2022-30065.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " From patchwork Sun Jul 3 19:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9779 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 E1C5DC3F2D4 for ; Sun, 3 Jul 2022 19:36:45 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web12.64394.1656877003457662009 for ; Sun, 03 Jul 2022 12:36:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=zu4Ow74D; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id 5so960567plk.9 for ; Sun, 03 Jul 2022 12:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LnnBk7L6z45t8aTRRBnqzXg2OPzv3ec56uaT/1D2DpE=; b=zu4Ow74DWT2WIUnxREvAe2LoaK9zt/87wK7aElpOKGEJd1ku3fAu95Wka/CP96oriX fiHemwrVKH/xSnTGRBDOfOeOPCNUOkLOaf5Nl16uC31JeDOm1fX+LyAHB+N6/B2EQzTt bQCyZQErdGmK7kS1wZBNfVcnRmHL/nbRN0DO6DzBJIe8ozjHAqgm49wR9QIPHVADqPGw 3BfyhUlRv6N7mDgbxC52V8vEvXV/P/SjCpRWs50PXPquqiLhM1yYWKAL8ngCkReNl6YT 0lUno81IsrID0OvdVGrVlHamBinA+zh3VaZij90bifP8hAC9cPS7g2FnWNO08s7Mex/X oB9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LnnBk7L6z45t8aTRRBnqzXg2OPzv3ec56uaT/1D2DpE=; b=NlokZW7CagjDapk5VuL7Yjlx5y78i9Tjp2/W7QihxL6Bbaqav0BZCHFGe3cEQKNvSO cwStBjxMBUAlTbi3pVvHmqBaZ2eu3teJ2KQefWyxT2K4LFqN7fSUtEfdnWPCy/nbK/j6 4JrT/aRXBLnWMtAbjvlgLgAU2QRL5EFxNLDyV14pA7HHVXV/Ywehfv5pp6wLz6HSDZop YdADlu7aoBl7oe/l8c4xobKJN5xzvYb3xbajUbeM0oCM4un5wbE/CRmM/6ED2p02E+Cn /NwWjvcZpJcq2q9DI0y/f8OMMrXyut8SJ2lSIpr8r8cSwEXrqECyvD06Q3CyuFWkxI8w Fpqg== X-Gm-Message-State: AJIora+UlSVwHm+nSpd4RU+bMojY0i/IY21HSsmABqEj8TjnI4HHWw7X Pw6yX+I4BhhWTP9kAGgCi7WMAq0HlXWYXFi/ X-Google-Smtp-Source: AGRyM1sfmPDI9tZoGs1PkYgZ51wFwOMmOMpORNxg5vTBT7fUp3CgjTTyOg23oaylx5O3oINEYO6qqw== X-Received: by 2002:a17:903:185:b0:16a:6113:c01 with SMTP id z5-20020a170903018500b0016a61130c01mr33767306plg.113.1656877002429; Sun, 03 Jul 2022 12:36:42 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/30] cve-extra-exclusions: Clean up and ignore three CVEs (2xqemu and nasm) Date: Sun, 3 Jul 2022 09:35:41 -1000 Message-Id: <94fad58c6f10d0dfc42be816b0a7f6b108bd03e6.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167566 From: Richard Purdie Remove obsolete comments/data from the file. Add in three CVEs to ignore. Two are qemu CVEs which upstream aren't particularly intersted in and aren't serious issues. Also ignore the nasm CVE found from fuzzing as this isn't a issue we'd expose from OE. Signed-off-by: Richard Purdie (cherry picked from commit 68291026aab2fa6ee1260ca95198dd1d568521e5) Signed-off-by: Steve Sakoman --- .../distro/include/cve-extra-exclusions.inc | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/conf/distro/include/cve-extra-exclusions.inc b/meta/conf/distro/include/cve-extra-exclusions.inc index 993ee2811a..8b5f8d49b8 100644 --- a/meta/conf/distro/include/cve-extra-exclusions.inc +++ b/meta/conf/distro/include/cve-extra-exclusions.inc @@ -90,24 +90,24 @@ CVE_CHECK_IGNORE += "CVE-2022-0185 CVE-2022-0264 CVE-2022-0286 CVE-2022-0330 CVE CVE-2022-28356 CVE-2022-28388 CVE-2022-28389 CVE-2022-28390 CVE-2022-28796 CVE-2022-28893 CVE-2022-29156 \ CVE-2022-29582 CVE-2022-29968" -#### CPE update pending #### - -# groff:groff-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2000-0803 -# Appears it was fixed in https://git.savannah.gnu.org/cgit/groff.git/commit/?id=07f95f1674217275ed4612f1dcaa95a88435c6a7 -# so from 1.17 onwards. Reported to the database for update by RP 2021/5/9. Update accepted 2021/5/10. -#CVE_CHECK_IGNORE += "CVE-2000-0803" - - - -#### Upstream still working on #### # qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-20255 # There was a proposed patch https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg06098.html -# however qemu maintainers are sure the patch is incorrect and should not be applied. - -# wget https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-31879 -# https://mail.gnu.org/archive/html/bug-wget/2021-02/msg00002.html -# No response upstream as of 2021/5/12 +# qemu maintainers say the patch is incorrect and should not be applied +# Ignore from OE's perspectivee as the issue is of low impact, at worst sitting in an infinite loop rather than exploitable +CVE_CHECK_IGNORE += "CVE-2021-20255" + +# qemu:qemu-native:qemu-system-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12067 +# There was a proposed patch but rejected by upstream qemu. It is unclear if the issue can +# still be reproduced or where exactly any bug is. +# Ignore from OE's perspective as we'll pick up any fix when upstream accepts one. +CVE_CHECK_IGNORE += "CVE-2019-12067" + +# nasm:nasm-native https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-18974 +# It is a fuzzing related buffer overflow. It is of low impact since most devices +# wouldn't expose an assembler. The upstream is inactive and there is little to be +# done about the bug, ignore from an OE perspective. +CVE_CHECK_IGNORE += "CVE-2020-18974" From patchwork Sun Jul 3 19:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9780 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 ED04DC43334 for ; Sun, 3 Jul 2022 19:36:55 +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.web09.64582.1656876999617003520 for ; Sun, 03 Jul 2022 12:36:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ixihpwob; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id a15so7163582pfv.13 for ; Sun, 03 Jul 2022 12:36:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Rqrfc/tnPvqrNTv8YEQ/B4SN1hE2JL8TtutGWtksydM=; b=ixihpwobmMHDOOdyLczvqxMhzYkXXi1e3uhyjdZLP21DAws9EUYEC65qURD3jZQusA n7gH2gokuYBDw8da/6V33MJICvnXSKuYQP9Z+LbX62FqtxC7Chdl4aSMiDyEfbkidqS5 E94GWZ6VKwGtAmUtRBqgluswoZwa5ZImGSY+uAzGDBHRM+qAnI6P0/vDq1nvOKEArNpV BTkgfdXDKAffg63nkVdadbieVw4HzloCWV4gkQ8zQhF3saytXpIU7P+bXp9yB79Oqxmv hNxtwXXurzuK+X97eOfYvUGRwS2HEJmh1ggyXzB1ce3EWthyEZa/1YViZAs2Jp+0GFy4 T9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rqrfc/tnPvqrNTv8YEQ/B4SN1hE2JL8TtutGWtksydM=; b=eQ2GJ/B5ZgGLP7I843jcdlhP54ko4fYJc6Zlq/3zSjdFQxd01NpXf+WWhYnmTDQTT5 QzIsTwCQjrlkxAw11drjoVGv1d1M8OwRIJ5TbnMSlirVp3eqyfIw1ONCxlA4q8iCVY67 oLv/kfL3p6MnIdzZAbohDbUidrkKsAo/1ccPsVDR8ut06K6A7uaBB9hLW2ImcvDXK2WQ AlRFY+XAzIkiuTj/9XCTlQkRLikhvaS6/Vu3i4NVWi9NIs2BQVJVfULR3R1z4UPGvqjv mei/ZWw/ZQO3UxgRgqZpkFy0i9k/8RnkPNtGIq8W2+mFM+2TpLvcH1ygMqvOvDzHVRXz TP/Q== X-Gm-Message-State: AJIora8uh/ZLozD4mfuXENp0Sy5G5Ab/Sf9Ob7wUCvUbqWeoOSN5cIvf Dl0Gdc1V10siuASN3xZp7t0S6AdNIwzvKY/d X-Google-Smtp-Source: AGRyM1tb2eTtj4QLOQY1fIYCZBfhB50mTkFW3O+B+QA8YY/k9YDjsa3mL6CMCnGIqsmvF1YOrlPllg== X-Received: by 2002:aa7:9823:0:b0:525:15b1:3297 with SMTP id q3-20020aa79823000000b0052515b13297mr31916630pfl.13.1656877006614; Sun, 03 Jul 2022 12:36:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/30] cve-check: hook cleanup to the BuildCompleted event, not CookerExit Date: Sun, 3 Jul 2022 09:35:42 -1000 Message-Id: <6f9c806dd1580a80856a687a2ad3a0b32d74dd17.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167567 From: Ross Burton The cve-check class writes temporary files to preserve state across the build, and cleans them up in a CookerExit handler. However, in memory-resident builds the cooker won't exit in between builds, so the state isn't cleared and the CVE report generation fails: NOTE: Generating JSON CVE summary ERROR: Error adding the same package twice Easily solved by hooking to BuildCompleted, instead of CookerExit. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit fccdcfd301de281a427bfee48d8ff47fa07b7259) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 50b9247f46..da7f93371c 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -166,7 +166,7 @@ python cve_check_cleanup () { } addhandler cve_check_cleanup -cve_check_cleanup[eventmask] = "bb.cooker.CookerExit" +cve_check_cleanup[eventmask] = "bb.event.BuildCompleted" python cve_check_write_rootfs_manifest () { """ From patchwork Sun Jul 3 19:35:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9781 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 D7B40C433EF for ; Sun, 3 Jul 2022 19:36:55 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.64005.1656877012656779331 for ; Sun, 03 Jul 2022 12:36:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=OeNzPhuH; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id b2so6831260plx.7 for ; Sun, 03 Jul 2022 12:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hOosUmVBZxbFO0laKqnxwyWxFa/DTCPE2w2tlClJDhM=; b=OeNzPhuHzZtqI7al7oR7N4mzGfpL9aaPGlSC63L4jXMJQDVpcvjmWc734sMUhgOTNv y5OJSaApF8BUmlEBWh3hqNXQh5wwDrxmIYJZ3Wqp4chJRJ72XqoWu/u5/iL2PmT8Jps1 RAriEuU7jhkAIfzYUAqd+Gjl79BkiUxgFIsYQvgj6hzPxfGoeycv19dp9vFGHClAR7oo 89JgNCX6EbKVFYgV1X7aB3QJmA2PseqwAEYPbsGkDfy2We3adLUAN+GDIZ5+uZoqhOlt w09uzdrOFI7ijff0DYPK+Vv//7CCdF6em9GTtGxQBWETt854bSFY/AHQA//aCTOc1vxa 5Eag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hOosUmVBZxbFO0laKqnxwyWxFa/DTCPE2w2tlClJDhM=; b=i1ucuX84aJo4noxwpPi2D+EiSMARX8Qxdpvp80Yr9cADwBGa6/cs6mrpl6uWLzQxAH qpQ3eF9acj/fWA9JTHg6a4RfNn5oPITu7IUZG+4Vnn5ZaCKGR5keV7SQQ/9OMLD7eltb JNhfXftVv+vtQGFTDsrjSVyeYtUqVOeQyFaTsrkFvmWD6jOYSBUNACarsjSIYbEp8JMv 7attzjr4k34/w+EaaIxTrGIu8+yqEX386QpRORCa0p2MGx4YXWJkc1femsrj/Hz09Jv3 vvPWivUp8lq6aO5vgJbwiKBQ/rP6prdtMeVveIjQA+kZJ+9GVggucNN/tbAy2rTJBVIz jzwA== X-Gm-Message-State: AJIora8UVwOjSt2cd58naDjGWs0juEkhzFx1XrrQ+a+N2jwzQMoKkCNp lrykZtVOicKMew0zzbcqICPq49YXBW2lUePS X-Google-Smtp-Source: AGRyM1t+XqN4+iJ2gqS9NolwxNsySXStsyVj8CwUou8P8I2ZGLwWeUBg+LEq3tY9okcp8QhRRXJF/w== X-Received: by 2002:a17:90b:1e42:b0:1ec:f362:8488 with SMTP id pi2-20020a17090b1e4200b001ecf3628488mr30950556pjb.32.1656877011656; Sun, 03 Jul 2022 12:36:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/30] wireless-regdb: upgrade 2022.04.08 -> 2022.06.06 Date: Sun, 3 Jul 2022 09:35:43 -1000 Message-Id: <681df7c4a761cc92234baf08fbd3d82f83b4bf10.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:36:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167568 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 4c27711292f93dfad1ffdeab6d715becad32a4ff) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2022.04.08.bb => wireless-regdb_2022.06.06.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.04.08.bb => wireless-regdb_2022.06.06.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb index cd42039680..2eba4f873b 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "884ba2e3c1e8b98762b6dc25ff60b5ec75c8d33a39e019b3ed4aa615491460d3" +SRC_URI[sha256sum] = "ac00f97efecce5046ed069d1d93f3365fdf994c7c7854a8fc50831e959537230" inherit bin_package allarch From patchwork Sun Jul 3 19:35:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9782 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 DC1CDCCA473 for ; Sun, 3 Jul 2022 19:37:05 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.64007.1656877017462163598 for ; Sun, 03 Jul 2022 12:36:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lZBTUHAN; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id m2so6849953plx.3 for ; Sun, 03 Jul 2022 12:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=tGTkJy+x/v9GfSDctTvInARDNXtdFutip6/TE+H+Lkg=; b=lZBTUHANPjdP/ZwtnK3jvJNV7IWdDSATwmdH7BNJpa9e85BSY8+lOQAlAHXJEB6cKd PjMslnWBjQ/JVI5eZQJ4znQEYfF1LnJ1wUukJut/EzANRpAFtOC5htxtQFuVA5Af7W5U RTARAw59SJwcT3cH9BotwlRiTXngZkcHNflc2XUSRw+xalAuoN1j2kvYBHyHZ+1+t6Mh 71eVhjb2KT/5+OsTD818L4tPPVyY8lp2ar3eCJ6rjZJrA1GeodIfD3E4KD1CWn12yJ+9 p7wJhflbJqbM1KJfWW1h6e+XpG2YgXbxDvvEyQlFurccUgU9wjCsJlcZHzCRjFfq3F1d wamg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tGTkJy+x/v9GfSDctTvInARDNXtdFutip6/TE+H+Lkg=; b=hh5JVhTICmuaMcBppZ3UzL7bIPO0g2cuep+1HE1l11PQVbDuZ1yuvU8+EH+H5qOqwr xZ01W5JcxG998Daj9iS52vjqJXdnTTQZOIBjQqcfbBf02FNnxkeUWYawq46dlfkp1c8F mzhRgis3fmRDJZbRNvFg67QxlsN4VZl7D25uYJm9wh6pyCMcL/aNNHz7MDjb0OGzOxVG LOcyMCAdqcwE9qu4/zjU25yGctnHorvfDl1KMrwCSq8b8Bo/FPtI3uk6HOCv18+FZuc8 ou9IG86Y82zkUUR2ANSLU7iBSRrPzxXxvgp5bPqSB+kmWqfMzxA7kegf6Q8Nf9pXRJwQ WEvA== X-Gm-Message-State: AJIora/2+kOnLByygm+8qfYGbNtRlmz3Nv0XZQqZNX+JZoRpYQX6l/LX SEBEwMQQiWBu0Q7oNqUGNpjtLCPsU4vUNsvl X-Google-Smtp-Source: AGRyM1vFfLuTtMPwRZsMClJ7ETNxg0Mzcj6gqfRi1S/GyrbU6Sv74V8fqxGDOy4ypst2eVB1Q0+ZCw== X-Received: by 2002:a17:902:f710:b0:167:7a06:b2ce with SMTP id h16-20020a170902f71000b001677a06b2cemr32707100plo.104.1656877016373; Sun, 03 Jul 2022 12:36:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/30] vim: 8.2.5083 -> 9.0.0005 Date: Sun, 3 Jul 2022 09:35:44 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167569 From: Richard Purdie The license checksum changed due to a major version change in the referenced file. Signed-off-by: Richard Purdie (cherry picked from commit 89f34d8aa4f4572d048dbb732ca4c83d443157fb) Signed-off-by: Steve Sakoman --- .../vim/{vim-tiny_8.2.bb => vim-tiny_9.0.bb} | 0 meta/recipes-support/vim/vim.inc | 6 +++--- meta/recipes-support/vim/{vim_8.2.bb => vim_9.0.bb} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/vim/{vim-tiny_8.2.bb => vim-tiny_9.0.bb} (100%) rename meta/recipes-support/vim/{vim_8.2.bb => vim_9.0.bb} (100%) diff --git a/meta/recipes-support/vim/vim-tiny_8.2.bb b/meta/recipes-support/vim/vim-tiny_9.0.bb similarity index 100% rename from meta/recipes-support/vim/vim-tiny_8.2.bb rename to meta/recipes-support/vim/vim-tiny_9.0.bb diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 06707dbe11..b85f34d6c8 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -11,7 +11,7 @@ RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \ - file://runtime/doc/uganda.txt;md5=daf48235bb824c77fe8ae88d5f575f74" + file://runtime/doc/uganda.txt;md5=001ef779f422a0e9106d428c84495b4d" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".5083" -SRCREV = "db77c49401145d76441fbb3d22a1d7d987681c13" +PV .= ".0005" +SRCREV = "040674129f3382822eeb7b590380efa5228124a8" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" diff --git a/meta/recipes-support/vim/vim_8.2.bb b/meta/recipes-support/vim/vim_9.0.bb similarity index 100% rename from meta/recipes-support/vim/vim_8.2.bb rename to meta/recipes-support/vim/vim_9.0.bb From patchwork Sun Jul 3 19:35:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9783 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 DC19DC43334 for ; Sun, 3 Jul 2022 19:37:05 +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.web11.64009.1656877022127742980 for ; Sun, 03 Jul 2022 12:37:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MMDLXA2U; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id r6so2864193pfq.6 for ; Sun, 03 Jul 2022 12:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vSErLjevhbGZhNCyUuyYeil715qryD24qT1TjLUjQjE=; b=MMDLXA2UP6C9iZLKbEanfOFZl8bVC6o/hITFJVBTAS+85x4pG7t4X9uYpWRsU0Kat/ luc4+8DCBY6V5SI+Cc1MGsecz/c5hh/3HMK5gUH7VcNavaYvpnkfSzj0ZpBcYHAeyy0o k4XBrRzrHvHaYOwDPcQbcESWEXx8bQuQVY4Y5o1wd2RWMXnuF/aaZlbNUG4rD7mf/c15 5e5DzNEasfERbHurxZA6SCQvO2+cTz4jVN/5+bTbyrDcTwHLY6LacWwTf49/SuoruW3m z72QSV+LtHNDa/Pqkh2Q6A7NsUmwetC0K37kCycds9DR1qVyTjZ5uz57dU1tNKUjGgOT HGyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vSErLjevhbGZhNCyUuyYeil715qryD24qT1TjLUjQjE=; b=VIqAdl4xaxUZqnIpIHsUPORXfm2Ejl9h4pPYPArpoYRA7nABwkVW+GYARR9/0qbCmL 0ezrOybhR3l79Qs4vG53D6SR72y8/dvDClSdoidb1onk6HzJRqL5NDoIWLYW6zz+k4gq 0oq5IdFIh8QKK+uXcfPUa1xNpz+h/tKcNnYeZURP7wjT5skAX3uv95Dwn0fcuyu5d2Gj Fyl/c6SCpTrKWg2XLA381/GUtebh/apIcJhbBjKw04i2jDg7QW8aEPiwQ8bpNW7IdtPU tkg0m30BnCsIiA8IPAv9mcuIdWxXsEjW/Y5HtWPPG4giK95V922b5Qf0d0XCyM/R9c0I BO+Q== X-Gm-Message-State: AJIora8zQCBJAQW0QHYAwsRSa5v5Z3mzm28xM+rY6YddZ3tZd1ROvHLQ XEnP0hJk+D1aoCsOoRTcPJgC6A4//oVCfqEV X-Google-Smtp-Source: AGRyM1v9heyRLGsZhHKKjaW9aNoBgcg6ezgJV+99iwpoCFgxmb6spkEyxuD2gLL0R28hOJNyaxvH0A== X-Received: by 2002:a63:33ce:0:b0:40c:5487:6e6d with SMTP id z197-20020a6333ce000000b0040c54876e6dmr22492824pgz.135.1656877020909; Sun, 03 Jul 2022 12:37:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.36.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:36:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/30] openssl: Upgrade 3.0.3 -> 3.0.4 Date: Sun, 3 Jul 2022 09:35:45 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167570 From: Richard Purdie Includes a fix for CVE-2022-2068. Signed-off-by: Richard Purdie (cherry picked from commit f034faebd45e63385849078e6ee4b51257763e99) Signed-off-by: Steve Sakoman --- ...1-Configure-do-not-tweak-mips-cflags.patch | 10 ++-- ...sysroot-and-debug-prefix-map-from-co.patch | 20 +++---- ...ea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch | 55 ------------------- .../openssl/openssl/afalg.patch | 10 ++-- .../{openssl_3.0.3.bb => openssl_3.0.4.bb} | 3 +- 5 files changed, 21 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch rename meta/recipes-connectivity/openssl/{openssl_3.0.3.bb => openssl_3.0.4.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch index 5effa6c6f6..0b7abc3a11 100644 --- a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch +++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin Configure | 10 ---------- 1 file changed, 10 deletions(-) -diff --git a/Configure b/Configure -index 821e680..0387a74 100755 ---- a/Configure -+++ b/Configure -@@ -1422,16 +1422,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) +Index: openssl-3.0.4/Configure +=================================================================== +--- openssl-3.0.4.orig/Configure ++++ openssl-3.0.4/Configure +@@ -1423,16 +1423,6 @@ if ($target =~ /^mingw/ && `$config{CC} push @{$config{shared_ldflag}}, "-mno-cygwin"; } diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch index 60890c666d..bafdbaa46f 100644 --- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch +++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch @@ -34,11 +34,11 @@ Signed-off-by: Khem Raj crypto/build.info | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index f88a70f..528cdef 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -471,13 +471,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), +Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl +=================================================================== +--- openssl-3.0.4.orig/Configurations/unix-Makefile.tmpl ++++ openssl-3.0.4/Configurations/unix-Makefile.tmpl +@@ -472,13 +472,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lfl '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) @@ -63,10 +63,10 @@ index f88a70f..528cdef 100644 PERLASM_SCHEME= {- $target{perlasm_scheme} -} # For x86 assembler: Set PROCESSOR to 386 if you want to support -diff --git a/crypto/build.info b/crypto/build.info -index efca6cc..eda433e 100644 ---- a/crypto/build.info -+++ b/crypto/build.info +Index: openssl-3.0.4/crypto/build.info +=================================================================== +--- openssl-3.0.4.orig/crypto/build.info ++++ openssl-3.0.4/crypto/build.info @@ -109,7 +109,7 @@ DEFINE[../libcrypto]=$UPLINKDEF DEPEND[info.o]=buildinf.h @@ -74,5 +74,5 @@ index efca6cc..eda433e 100644 -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)" - GENERATE[uplink-x86.s]=../ms/uplink-x86.pl + GENERATE[uplink-x86.S]=../ms/uplink-x86.pl GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl diff --git a/meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch b/meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch deleted file mode 100644 index 0249d4181b..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 770aea88c3888cc5cb3ebc94ffcef706c68bc1d2 Mon Sep 17 00:00:00 2001 -From: Tomas Mraz -Date: Wed, 1 Jun 2022 12:06:33 +0200 -Subject: [PATCH] Update expired SCT issuer certificate - -Fixes #15179 - -Reviewed-by: Matt Caswell -Reviewed-by: Dmitry Belyavskiy -(Merged from https://github.com/openssl/openssl/pull/18444) - -Upstream-Status: Backport -[Fixes ptest failures in OE-Core] ---- - test/certs/embeddedSCTs1_issuer.pem | 30 ++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/test/certs/embeddedSCTs1_issuer.pem b/test/certs/embeddedSCTs1_issuer.pem -index 1fa449d5a098..6aa9455f09ed 100644 ---- a/test/certs/embeddedSCTs1_issuer.pem -+++ b/test/certs/embeddedSCTs1_issuer.pem -@@ -1,18 +1,18 @@ - -----BEGIN CERTIFICATE----- --MIIC0DCCAjmgAwIBAgIBADANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJHQjEk -+MIIC0jCCAjugAwIBAgIBADANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJHQjEk - MCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENBMQ4wDAYDVQQIEwVX --YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAeFw0xMjA2MDEwMDAwMDBaFw0yMjA2MDEw --MDAwMDBaMFUxCzAJBgNVBAYTAkdCMSQwIgYDVQQKExtDZXJ0aWZpY2F0ZSBUcmFu --c3BhcmVuY3kgQ0ExDjAMBgNVBAgTBVdhbGVzMRAwDgYDVQQHEwdFcncgV2VuMIGf --MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVimhTYhCicRmTbneDIRgcKkATxtB7 --jHbrkVfT0PtLO1FuzsvRyY2RxS90P6tjXVUJnNE6uvMa5UFEJFGnTHgW8iQ8+EjP --KDHM5nugSlojgZ88ujfmJNnDvbKZuDnd/iYx0ss6hPx7srXFL8/BT/9Ab1zURmnL --svfP34b7arnRsQIDAQABo4GvMIGsMB0GA1UdDgQWBBRfnYgNyHPmVNT4DdjmsMEk --tEfDVTB9BgNVHSMEdjB0gBRfnYgNyHPmVNT4DdjmsMEktEfDVaFZpFcwVTELMAkG --A1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRyYW5zcGFyZW5jeSBDQTEO --MAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW6CAQAwDAYDVR0TBAUwAwEB --/zANBgkqhkiG9w0BAQUFAAOBgQAGCMxKbWTyIF4UbASydvkrDvqUpdryOvw4BmBt --OZDQoeojPUApV2lGOwRmYef6HReZFSCa6i4Kd1F2QRIn18ADB8dHDmFYT9czQiRy --f1HWkLxHqd81TbD26yWVXeGJPE3VICskovPkQNJ0tU4b03YmnKliibduyqQQkOFP --OwqULg== -+YWxlczEQMA4GA1UEBxMHRXJ3IFdlbjAgFw0yMjA2MDExMDM4MDJaGA8yMTIyMDUw -+ODEwMzgwMlowVTELMAkGA1UEBhMCR0IxJDAiBgNVBAoTG0NlcnRpZmljYXRlIFRy -+YW5zcGFyZW5jeSBDQTEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0VydyBXZW4w -+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANWKaFNiEKJxGZNud4MhGBwqQBPG -+0HuMduuRV9PQ+0s7UW7Oy9HJjZHFL3Q/q2NdVQmc0Tq68xrlQUQkUadMeBbyJDz4 -+SM8oMczme6BKWiOBnzy6N+Yk2cO9spm4Od3+JjHSyzqE/HuytcUvz8FP/0BvXNRG -+acuy98/fhvtqudGxAgMBAAGjga8wgawwHQYDVR0OBBYEFF+diA3Ic+ZU1PgN2Oaw -+wSS0R8NVMH0GA1UdIwR2MHSAFF+diA3Ic+ZU1PgN2OawwSS0R8NVoVmkVzBVMQsw -+CQYDVQQGEwJHQjEkMCIGA1UEChMbQ2VydGlmaWNhdGUgVHJhbnNwYXJlbmN5IENB -+MQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHRXJ3IFdlboIBADAMBgNVHRMEBTAD -+AQH/MA0GCSqGSIb3DQEBCwUAA4GBAD0aYh9OkFYfXV7kBfhrtD0PJG2U47OV/1qq -++uFpqB0S1WO06eJT0pzYf1ebUcxjBkajbJZm/FHT85VthZ1lFHsky87aFD8XlJCo -+2IOhKOkvvWKPUdFLoO/ZVXqEVKkcsS1eXK1glFvb07eJZya3JVG0KdMhV2YoDg6c -+Doud4XrO - -----END CERTIFICATE----- diff --git a/meta/recipes-connectivity/openssl/openssl/afalg.patch b/meta/recipes-connectivity/openssl/openssl/afalg.patch index b7c0e9697f..cf77e873a2 100644 --- a/meta/recipes-connectivity/openssl/openssl/afalg.patch +++ b/meta/recipes-connectivity/openssl/openssl/afalg.patch @@ -3,11 +3,11 @@ Don't refuse to build afalgeng if cross-compiling or the host kernel is too old. Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688] Signed-off-by: Ross Burton -diff --git a/Configure b/Configure -index 3baa8ce..9ef52ed 100755 ---- a/Configure -+++ b/Configure -@@ -1550,20 +1550,7 @@ unless ($disabled{"crypto-mdebug-backtrace"}) +Index: openssl-3.0.4/Configure +=================================================================== +--- openssl-3.0.4.orig/Configure ++++ openssl-3.0.4/Configure +@@ -1681,20 +1681,7 @@ $config{CFLAGS} = [ map { $_ eq '--ossl- unless ($disabled{afalgeng}) { $config{afalgeng}=""; if (grep { $_ eq 'afalgeng' } @{$target{enable}}) { diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.3.bb b/meta/recipes-connectivity/openssl/openssl_3.0.4.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.0.3.bb rename to meta/recipes-connectivity/openssl/openssl_3.0.4.bb index 35a62755ad..d9d17378d4 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.3.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.4.bb @@ -12,14 +12,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ - file://770aea88c3888cc5cb3ebc94ffcef706c68bc1d2.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b" +SRC_URI[sha256sum] = "2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f" inherit lib_package multilib_header multilib_script ptest perlnative MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" From patchwork Sun Jul 3 19:35:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9784 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 DC812C43334 for ; Sun, 3 Jul 2022 19:37:15 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web12.64398.1656877027628082023 for ; Sun, 03 Jul 2022 12:37:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZSFj7uHo; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id s21so2827711pjq.4 for ; Sun, 03 Jul 2022 12:37:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hugpsB5X4pePnMfK0Bwcu5Ya80oChQ15w5F1LgOsa1E=; b=ZSFj7uHoxbk9PN2JEAaXcA0i7V4X0FVoDd7aNsNL1RVT1TAMFaxHcMpQpGhXIwiIw8 AkrLpPWVr4up/mWCFd90XJfBXIYZ7ZNtrq6Mt9nOMYYgF9sgo21cNYMkRWxjRzm/MUif OKwCwsOj6z0IUnN5Jkuw9C7x7JxHgQ65a/DlKU8EqL7a9fDcka3NVGMWCMPEKPLW8ULz H8M8EBcrIQY12VLjrWNMJAv5rDlMBVVGfKXMqeSxOQvXxTTls/5xDPQt9TqrX7EePqcf 0W1etuzUZCdF8eOownjcyt+zlcRzJWfItnL4L1C+qv9uoWvW6ZxiyoOOBCq8XR5WGIGj DE0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hugpsB5X4pePnMfK0Bwcu5Ya80oChQ15w5F1LgOsa1E=; b=VwTCA8w+EGG72VLIGIjAE41V2pglbEUAGrUHqLLpIl2ocr+yACnJcbtTx8jgHtRKQA zeDl26WG5hF+l7qX4B2HZyQAtyNsIMYFCxsgOURPpcr5GjSEqkeHkAe9vAHQnbSx2opd jpyzt+YSm7utF4kiJUx3IfhJDI7yroc8V+jxY/oEaeYBootjgRNA7CX6OtKQdPYNvjz6 oSX1+FWyZwMcGBT64eOOdw5rATPGEhBhksEXcrvNYqViA1LLERnxjsZT9c/+S6NntpEY LTfaI04R+NgNEtOwHv718h4zoBaXseh+ERikUiiYXzFv0QfUfkHqadR9gW7OOCkBCB+E GRAQ== X-Gm-Message-State: AJIora+S/z7aMZGBMn5/pulJd6JhD7/EDHr+N17K1vf5VCzZBPdDW4BE 5SzRHmRrcV+Mj9dBD/bvMsi/IEy5wPx3LEfR X-Google-Smtp-Source: AGRyM1s4UjGk044kGZeM1CogK+zk9ljQYXYEiBgWPPxiUglZNZEBv6L8B8C2UbsgVFT+EskWxp1L2A== X-Received: by 2002:a17:902:d48f:b0:16a:755f:86db with SMTP id c15-20020a170902d48f00b0016a755f86dbmr32364396plg.77.1656877026620; Sun, 03 Jul 2022 12:37:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/30] initramfs-framework: move storage mounts to actual rootfs Date: Sun, 3 Jul 2022 09:35:46 -1000 Message-Id: <0a3ebc5584384e4bf7d9c7ba4c827db587ef3bee.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167571 From: Muhammad Hamza Operations such as mkfs fail on devices that are not switched to the actual rootfs before switch_root is called. The kernel interprets these devices as still being used even after unmounting and errors such as below are seen when the target is fully booted root@v1000:~# umount /dev/sdb1 root@v1000:~# mkfs.ext4 /dev/sdb1 mke2fs 1.43.8 (1-Jan-2018) /dev/sdb1 contains a ext4 file system last mounted on Wed Nov 28 07:33:54 2018 Proceed anyway? (y,N) y /dev/sdb1 is apparently in use by the system; will not make a filesystem here! Signed-off-by: Awais Belal Signed-off-by: Muhammad Hamza Signed-off-by: Alexandre Belloni (cherry picked from commit ec53ffd01972d1be2d6a28de828b3f0b80dc1e61) Signed-off-by: Steve Sakoman --- .../initrdscripts/initramfs-framework/finish | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish index f08a920867..ac0de9f996 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/finish +++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish @@ -26,6 +26,15 @@ finish_run() { info "Switching root to '$ROOTFS_DIR'..." + debug "Moving basic mounts onto rootfs" + for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts`; do + # Parse any OCT or HEX encoded chars such as spaces + # in the mount points to actual ASCII chars + dir=`printf $dir` + mkdir -p "${ROOTFS_DIR}/media/${dir##*/}" + mount -n --move "$dir" "${ROOTFS_DIR}/media/${dir##*/}" + done + debug "Moving /dev, /proc and /sys onto rootfs..." mount --move /dev $ROOTFS_DIR/dev mount --move /proc $ROOTFS_DIR/proc From patchwork Sun Jul 3 19:35:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14258 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 12/30] libffi: fix native build being not portable Date: Sun, 3 Jul 2022 09:35:47 -1000 Message-Id: <58804e0051e3b77e0378aa4accbd26b2588b68e7.1656876825.git.steve@sakoman.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Maxime Roussin-Bélanger Without `--with-gcc-arch=generic` libffi looks up the cpuid to automatically determine which mtune/march to use. This makes the native sstate-cache unuseable since it's possible to have a newer cpu building the recipe and the library being pulled from another older cpu which doesn't have the instruction. Signed-off-by: Maxime Roussin-Bélanger Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit cddaecac1fdd4d033c2ff8ccaf1d60e1c598d5b7) Signed-off-by: Steve Sakoman --- meta/recipes-support/libffi/libffi_3.4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libffi/libffi_3.4.2.bb b/meta/recipes-support/libffi/libffi_3.4.2.bb index 733fcc5e6c..71d9518baf 100644 --- a/meta/recipes-support/libffi/libffi_3.4.2.bb +++ b/meta/recipes-support/libffi/libffi_3.4.2.bb @@ -19,6 +19,7 @@ UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" UPSTREAM_CHECK_REGEX = "libffi-(?P\d+(\.\d+)+)\.tar" EXTRA_OECONF += "--disable-builddir --disable-exec-static-tramp" +EXTRA_OECONF:class-native += "--with-gcc-arch=generic" EXTRA_OEMAKE:class-target = "LIBTOOLFLAGS='--tag=CC'" inherit autotools texinfo multilib_header @@ -33,4 +34,3 @@ FILES:${PN}-dev += "${libdir}/libffi-${PV}" MIPS_INSTRUCTION_SET = "mips" BBCLASSEXTEND = "native nativesdk" - From patchwork Sun Jul 3 19:35:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9785 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 D782BC43334 for ; Sun, 3 Jul 2022 19:37:25 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.64014.1656877042874667539 for ; Sun, 03 Jul 2022 12:37:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Fsff1WxU; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d17so7175110pfq.9 for ; Sun, 03 Jul 2022 12:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vpxF9p40a9HAlXH4ISFDanCcGk+nD4ibDLlybq152Wo=; b=Fsff1WxU9jTNO1Zu/e6I+ZvDYG0IjMkDyBSHjOAmPbYyef7OE9riwBAMyqn9mrs0+t 5zqfv7ikm0EsN3o8hYMk4XvYX840WnVrf4tGPVKetcomv7ifXK4tcj91Gzb3HSxqpe0G fodBYeE8PkrcqZyp6/qejkQi2n8F5xUfc2qOlnpuePWM1U8t29wA7IqGEWeinrWtgIJ0 H1dQU3cCZk950ruzMRRdjiThhYAxoj2Pm+qcsCc0eEHpWaONWotprZ8Am6WKIa8tflJq jqaoosX5IsKxHH5MZDK7B8fY5KBCChHd2WIPEBoFXBML4ZnPjHYnH6NGGgaELn4EWHgZ dqyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vpxF9p40a9HAlXH4ISFDanCcGk+nD4ibDLlybq152Wo=; b=UyuN/IcuVwxrzAz17ZX+OVS/ZT8nw5hULuQxatU4YVlizX6+YdKKyKsaGoHBJc/77R euC8xcAXAM3TSL3Gpyc7rmUe18BgMtYcIe+xmlUB1X+el0q9u94Z5yx9Y+EKzg8P9pbn CmQ22twHeoDxFEXFbOE1xo7mVOoKDykoIk++qMGx3cemHa/n1QhHkrbtFYARRRiD/jNY KSpi/yjfbi4/Ff3ApKY/sYvBePQc0XGge4coWXx4VcdEMlWuFpsP2S8gflzdAeDek18e xFfaR8cUUdWhn3cI3+s22ODIskj9D9HrCjFLPgJId7msvTxmIBrv0+JpprDyOqepvDWO C1XQ== X-Gm-Message-State: AJIora/irpRjeq7VQWwCdtqS0TyedlWWz9R0XK37MU36gVv2SPD8NxU7 cp/apeOty0r+Iuqyt0l2mZujq4E0LsooASNO X-Google-Smtp-Source: AGRyM1sMSNdqa2HkJlGrlkDqV5O/pf1KTsrjm1swOwPnXMzvZbJgieL4rlhqkvwQdcDPennBOAapPQ== X-Received: by 2002:a63:8441:0:b0:40d:34a3:b7ce with SMTP id k62-20020a638441000000b0040d34a3b7cemr22601807pgd.292.1656877041835; Sun, 03 Jul 2022 12:37:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/30] wic: fix WicError message Date: Sun, 3 Jul 2022 09:35:48 -1000 Message-Id: <772c9f66633e85c5059670d328e1b5fad407457f.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167573 From: Martin Jansa * add missing % to print the values instead of: | INFO: Build artifacts not found, exiting. | INFO: (Please check that the build artifacts for the machine | INFO: selected in local.conf actually exist and that they | INFO: are the correct artifacts for the image (.wks file)). | | ERROR: ("The artifact that couldn't be found was %s:\n %s", 'kernel-dir', '/OE/build/deploy/images/qemux86-64') Signed-off-by: Martin Jansa Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit e104c2b1273d8c5bd97893f318bf2a2699ef7f2d) Signed-off-by: Steve Sakoman --- scripts/wic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wic b/scripts/wic index aee63a45aa..06e0b48db0 100755 --- a/scripts/wic +++ b/scripts/wic @@ -209,7 +209,7 @@ def wic_create_subcommand(options, usage_str): logger.info(" (Please check that the build artifacts for the machine") logger.info(" selected in local.conf actually exist and that they") logger.info(" are the correct artifacts for the image (.wks file)).\n") - raise WicError("The artifact that couldn't be found was %s:\n %s", not_found, not_found_dir) + raise WicError("The artifact that couldn't be found was %s:\n %s" % (not_found, not_found_dir)) krootfs_dir = options.rootfs_dir if krootfs_dir is None: From patchwork Sun Jul 3 19:35:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9786 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 DB2ABC433EF for ; Sun, 3 Jul 2022 19:37:35 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.64016.1656877047420803404 for ; Sun, 03 Jul 2022 12:37:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=lWt91nqy; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id h9-20020a17090a648900b001ecb8596e43so7562394pjj.5 for ; Sun, 03 Jul 2022 12:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+ugZPqvXV8XX0kujAQvijggAgBeXUQp7B36JuM0FxI0=; b=lWt91nqy1d1gDDbClt7SmontPRBHLtYwtLzBAQ0lh4pr86fLd0Px+yZuIaEiWRor56 PIprLIBdYA0yBGuh5qikoQj8Zb4xcquyeYpjLr0KKmc4dSzZG4Cjdxti0IjR/M2UJgF1 7WkyNl0gr+CsKrn5sisACjeGC/KmwX90cWVr9u70ugNkeAJG8/OXh8nn+e1oR2Vn7iHL XqajW9XgyAjS9v+qWuFL7H1e3UDcfpGJrSAzcdqsaTjV5FnMJ8nlHZV1Xsuy0KccEPfB Un3Pth2ISsekoUbcLVlHVrpPAFlaqwIvPAMXlgwuBCvG80EKlsEjBxj6BW3xFieSUyY+ k9xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+ugZPqvXV8XX0kujAQvijggAgBeXUQp7B36JuM0FxI0=; b=OJv0FJY2UIJLeTeH2rB5h8CF0DSVboQkVK6qdeUnpSpRSIc0/3A1bLua1DsEdkIujH nY4xWUzibj1Lm0rqyIhW7YfXHM3t1jQUx877tEbpIWgT9mN2CthtK9qEHu/BTH/f83LX DB33fDRi8HBtXAx4I5RSuRhNolLlR94Gce3rq3V2Gpmn+Po3LWq1KJCTKKVs1lz1Vgqa QFoW6uQ2CaOBB6fxs5FeTjx9vDsh3QwfICBerR4CQrIzDUuaNrxiJZpW2kucJEJUBkiU +UWEA797RzcPkq8j94D/zEfWN0mn/R0RPwcyJYLqdeIWYJ2xM2wBU1aEDnzHv/aZsYkN wF/g== X-Gm-Message-State: AJIora+ozVcLF2y7jN0OVHorABS5YwtKDcCUfzVyY48jGRRW6IPOtCgU zDI4eO2sC7ewnTO/RHJ6ZZTKo3sWep7qrmxn X-Google-Smtp-Source: AGRyM1vpF6muWqljw193/tyiFM5SsD3vAizBdd9lmpIgch/q1ilSsBQxv8r9i0mJdcgqL2ztEgz+gQ== X-Received: by 2002:a17:903:453:b0:16b:ce52:f610 with SMTP id iw19-20020a170903045300b0016bce52f610mr9465046plb.25.1656877046392; Sun, 03 Jul 2022 12:37:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/30] perf: sort-pmuevents: really keep array terminators Date: Sun, 3 Jul 2022 09:35:49 -1000 Message-Id: <70d4a09c1f9fada1a02cf7b3886ffaf39d1b9baf.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167574 From: Lucas Stach Commit e1382583cd50 ("perf: sort-pmuevents: don't drop elements") tried to fix a case where the array terminator elements were dropped from the sorted list breaking the build, but it only worked for the case where the terminator is the only element of the array. When the array has other elements the terminator will still be silently dropped, causing invalid memory accesses at runtime when the perf utility iterates over the array. Fix this by treating any unmatched entry as an array terminator and also add a comment to make it a little more clear how things are ending up at the right position in the sorted list. Signed-off-by: Lucas Stach Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 69c35a48c5100b884f1b633142b07222b9390e92) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/perf/perf/sort-pmuevents.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf/sort-pmuevents.py b/meta/recipes-kernel/perf/perf/sort-pmuevents.py index 09ba3328a7..0362f2d8fa 100755 --- a/meta/recipes-kernel/perf/perf/sort-pmuevents.py +++ b/meta/recipes-kernel/perf/perf/sort-pmuevents.py @@ -62,7 +62,10 @@ for struct in re.findall( struct_block_regex, data ): #print( " name found: %s" % name.group(1) ) entry_dict[struct[2]]['fields'][name.group(1)] = entry - if not entry_dict[struct[2]]['fields']: + # unmatched entries are most likely array terminators and + # should end up as the last element in the sorted list, which + # is achieved by using '0' as the key + if not cpuid and not name: entry_dict[struct[2]]['fields']['0'] = entry # created ordered dictionaries from the captured values. These are ordered by From patchwork Sun Jul 3 19:35:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9787 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 DB3E3C43334 for ; Sun, 3 Jul 2022 19:37:35 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web08.64317.1656877052585849186 for ; Sun, 03 Jul 2022 12:37:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=v017Y+xa; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id 9so7114512pgd.7 for ; Sun, 03 Jul 2022 12:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=a/gUiPecixbe+DKvm9t6FUd3/OsIRMbEFxaVlPeNniU=; b=v017Y+xafgVuqkQJwmFbWqsISZwpRGgwiRlhEZX8e4AZpk3A7htvYDJEESfwpEYIeU 1C63NyCWDh9LF3nJ4t5WSYtAKP3VLhM5DZEey+IVk3NWnTpPDfqpUbpeC7uSi1tynBmg dmkOFl0d0vv5ZnHbS5lz0hQUizdrT/S6lAElPQS2+DhmuGLP3ie2UAffVMQl0qY0hJB2 bmaTNo0kruQJm7A1ofFYgr4YwV0imGCFXpxK5wHs9UaZJobNPGMD6KWdsOZ391MH445t 09KxeN7ZJ39Y2xBqsZrdXpNJ9IInE2QaXDVG5ZJZU1UBVbEfEsTAD4ZYpH/bbSBRKDLB yvHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a/gUiPecixbe+DKvm9t6FUd3/OsIRMbEFxaVlPeNniU=; b=pxzv4Ehca4KUQ1NVIA9vWDvzIfkfB72FvAQtacZ/JzN2L+RmThXap3l/ZSOUzotpDh QGoBi320jXN48nml4cv73m8knzojXFHm54ODdHpGFljTYxd4Ad0zneRwFII4qXMRXzco VeZVgglCGqpDZDiArhYr6LVxxcM7wKoiJpM2NkllpxfVbuBXLed4DUL/ytruDh5U1vho COoJYMWkINWED8RPuoMKVB0z4BeoDkUYdbYn7rSx6VEwxblNW0CESttbyGTdgTsVq7Bs QedqN+X+PQAreVN+PNrr5+FxwZ8j1cvZKvX/ahY9dXMgiMuPMpcKASLOXOx1DwzNie1S hsXQ== X-Gm-Message-State: AJIora9AbG3adjGYghcQQGpKbRjVMmblJds3nQ4z+pJesDYTixwF+wuk Cnc4iQoRqg5y+ipAysW9qYJXINOllTMl2GDu X-Google-Smtp-Source: AGRyM1vE4+6Oru6BZj2faJfL+kw8UBrSTb5sSwlk/Lj7u6PYK4QqjsFbBNd2P7+erp08MEafNTzELg== X-Received: by 2002:a65:6c0a:0:b0:3fa:c20c:cbe7 with SMTP id y10-20020a656c0a000000b003fac20ccbe7mr22231183pgu.611.1656877051536; Sun, 03 Jul 2022 12:37:31 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/30] kernel-uboot.bbclass: Use vmlinux.initramfs when INITRAMFS_IMAGE_BUNDLE set Date: Sun, 3 Jul 2022 09:35:50 -1000 Message-Id: <3f8a49c4f276c65ccec149e3dc2e06d74c3c5a80.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167575 From: Raju Kumar Pothuraju vmlinux file doesnot have the initramfs image when INITRAMFS_IMAGE_BUNDLE was set. Use vmlinux.initramfs in uboot_prep_kimage when INITRAMFS_IMAGE_BUNDLE set based on the implementation in kernel.bbclass do_bundle_initramfs function, https://github.com/openembedded/openembedded-core/blob/master/meta/classes/kernel.bbclass#L316-L317 to be able to use proper linux.bin file in creation of fitImage. Signed-off-by: Raju Kumar Pothuraju Signed-off-by: Luca Ceresoli (cherry picked from commit e0a4e45e067d9fdb67a7d223aea463f259469035) Signed-off-by: Steve Sakoman --- meta/classes/kernel-uboot.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass index 2daa068298..2facade818 100644 --- a/meta/classes/kernel-uboot.bbclass +++ b/meta/classes/kernel-uboot.bbclass @@ -15,6 +15,12 @@ uboot_prep_kimage() { linux_comp="none" else vmlinux_path="vmlinux" + # Use vmlinux.initramfs for linux.bin when INITRAMFS_IMAGE_BUNDLE set + # As per the implementation in kernel.bbclass. + # See do_bundle_initramfs function + if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ] && [ -e vmlinux.initramfs ]; then + vmlinux_path="vmlinux.initramfs" + fi linux_suffix="${FIT_KERNEL_COMP_ALG_EXTENSION}" linux_comp="${FIT_KERNEL_COMP_ALG}" fi From patchwork Sun Jul 3 19:35:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9788 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 D78CBC43334 for ; Sun, 3 Jul 2022 19:37:45 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.64021.1656877059589986594 for ; Sun, 03 Jul 2022 12:37:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KanaDjbW; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id w185so3481214pfb.4 for ; Sun, 03 Jul 2022 12:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RLITg/2AElZSoyhx5MrjBYkePq2mIg4pBhQPoLHu5cw=; b=KanaDjbWdHKH4Phfz4z2ozXLMxA/fSzK+vJC9kBX/gPw1H/sBiene0t/xmIuHTWObb K48dEUFKw0K4AwBoEZPhdmk3DDJnBVVSfr/dzT0gULJNtnjWyyP4KtgcCkItA/NJLJG1 zXzZrqf4pod5nWTopyAxbYxKgwAIpeyMGJQIIrHslvnuFbp6FiCNYpNvFAYilVl942RQ nlc7hx44Pi7KBCWT5UoSnwXxFjOKS8dNhmBx48zBAS8GPVP/u2SH11kMwsvMS0O2GtHf 9cp6LSPGGK9WJ12xOBQ5zDnl10cpMPV1j6+V+HGsHOHv0OWL8th+j6D5tLwPQCPC/Svr JHQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RLITg/2AElZSoyhx5MrjBYkePq2mIg4pBhQPoLHu5cw=; b=dir94BZcOK8famwwfvE1H7Vm3jXweVIi8BwkDz1ma1PEMEv6SPWW7kJ3T309YT3D5+ KSH8zVgOwRhgZ7CVpZoGbJpk7dm2JZ35J1N8OJDGlcjm5ygTqciSSRfqfzAFiXJz3GyE eiBxPLUrXxjn5uKmsb5InLluHBhqJ9nJX9vUdABkCTW5t7gwyhsz/HyF+f2kQbLzKSca 5m744bVMzGpcZcar2YQHQSC5487UCex1dTsCrusqG1ldUGxZr6Cu7rYxgTQooZUwyZsV pd+kJwKeP11betzZQ6xjmDxY69RFenYplrHyeXP8ZpnPagnCNde6N2kKItkZNG888atm G5Gg== X-Gm-Message-State: AJIora/E3p5ezP4sf3VSM3b20vxOSx7Z1Q5RaN/GZh2XKaUmYgx2+PPh 3oi21ZCZaEwV8ue7EsiNtw2TIZMmmp5ulVDv X-Google-Smtp-Source: AGRyM1vcvQGVM0hhM3WXDmfskVWZvI8Cbss3kAQdcaxrgz07wMz1LZUsbEgpMC+X7gwlcAc4NICnSg== X-Received: by 2002:a05:6a00:400b:b0:525:1c50:557a with SMTP id by11-20020a056a00400b00b005251c50557amr32078338pfb.4.1656877058596; Sun, 03 Jul 2022 12:37:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/30] insane.bbclass: host-user-contaminated: Correct per package home path Date: Sun, 3 Jul 2022 09:35:51 -1000 Message-Id: <3aaf9708be7b7ce67513af4e332733ea58403517.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167576 From: Ahmed Hossam The current home path that is compared against is incorrect as it is missing the package name, this patch adds it. [YOCTO #14553] Signed-off-by: Ahmed Hossam Signed-off-by: Luca Ceresoli (cherry picked from commit ae8f22d9e2694eea5ede3b31c6f3bca404ea4a5a) Signed-off-by: Steve Sakoman --- meta/classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 9ca84bace9..6f6dcb3dd5 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -970,7 +970,7 @@ def package_qa_check_host_user(path, name, d, elf, messages): dest = d.getVar('PKGDEST') pn = d.getVar('PN') - home = os.path.join(dest, 'home') + home = os.path.join(dest, name, 'home') if path == home or path.startswith(home + os.sep): return From patchwork Sun Jul 3 19:35:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9789 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 D6C79C43334 for ; Sun, 3 Jul 2022 19:37:55 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.64472.1656877066250728027 for ; Sun, 03 Jul 2022 12:37:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=c5BcRUFY; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id b2so6832386plx.7 for ; Sun, 03 Jul 2022 12:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Np/us0oCN8qSTfsi3tqkCKHrnWfXsZTT6727L3e1cHk=; b=c5BcRUFYp29yU3SkyzamdhP+2+duljxFkyA0gB6LruA6YTQw1V0pNUWqwnKv7thmgi r85ivQiunL/2ynz+ya1qyd/YSfemnPz1PeVf/XvZf8IiFpDrnPhsCpD/tGRgLceqEWAE 8Wc+KWvwsfaOQvCxs+sMxQ0XUaZgwJraeF0bLRgK5r+psct62BGbEtv6qSHZ4o6nkvgO dwAQRdnMDPKUwBAYxwiWIwV9x4rbwpfCDul69rq1h/X2UC1tpv4d9lJ/e3oygS5wbHS+ EsJ6JQeBJLTrMcB1u7/lmNUpo9rC9ON/ecyhd/T142o9ISKlmlGbTZYEl5oLkGwx2kQ1 o0XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Np/us0oCN8qSTfsi3tqkCKHrnWfXsZTT6727L3e1cHk=; b=PuYG4zYBzFExwmbjnJhYlAzxnnBrHB4eBzdfodk97Vj7w3q3CbsVQvATYQrZIw+6gT twqEMsQoUzsb9TpYQg1hHmvhSFRNZ4/poDzAhdmcoBg3udOTVfTvCYg/hX9+5LbeZOdR 2uBw4TeidHWG0kD8+iAnykz9MLo7y9WbMLbRKkoKFm57uoScaH2H/gz7c8bbnhDGeCBF RUMh2d4hYgY6dBaoI4dxIrx71GMuLxAFV2WiXITgSBYJZWhTgTUz3Z1H94eAp4un2QGX kOl0YrA01KolPdvET+1sWA0ckQJaNRZYotcZaAzi+NoGQKODsw5Gbvn5FwkD4KKwBzzh nvyg== X-Gm-Message-State: AJIora+4JwJcbfTdqXiYFG9HgUiZRbXxUIPzStHtKvjtdw5EO/ODPsu0 nkJPF3REn2m1RbK7zbaa4wyUS0eoEuJOwCbF X-Google-Smtp-Source: AGRyM1uZ4oj73sgiKfDGO+0epe2dMIOmEEvLxPxI+Eb5H+tcho/f5/H4kS26LUa7Nbvy3qIJ91mLuw== X-Received: by 2002:a17:90b:b12:b0:1ee:f30f:2fdf with SMTP id bf18-20020a17090b0b1200b001eef30f2fdfmr30989803pjb.146.1656877065144; Sun, 03 Jul 2022 12:37:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/30] sanity.bbclass: Add ftps to accepted URI protocols for mirrors sanity Date: Sun, 3 Jul 2022 09:35:52 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167577 From: David Bagonyi Signed-off-by: David Bagonyi Signed-off-by: Luca Ceresoli (cherry picked from commit 10f3a9d5173ef4bf92ff4a7d8aef0cd2cb23e4d4) Signed-off-by: Steve Sakoman --- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index eb0ca05804..b1fac107d5 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -858,7 +858,7 @@ def check_sanity_everybuild(status, d): mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS'] protocols = ['http', 'ftp', 'file', 'https', \ 'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \ - 'bzr', 'cvs', 'npm', 'sftp', 'ssh', 's3', 'az' ] + 'bzr', 'cvs', 'npm', 'sftp', 'ssh', 's3', 'az', 'ftps'] for mirror_var in mirror_vars: mirrors = (d.getVar(mirror_var) or '').replace('\\n', ' ').split() From patchwork Sun Jul 3 19:35:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9790 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 DD0A2C433EF for ; Sun, 3 Jul 2022 19:37:55 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web09.64605.1656877072807813160 for ; Sun, 03 Jul 2022 12:37:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QC6UeHUY; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id o18so6861850plg.2 for ; Sun, 03 Jul 2022 12:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=U5Tity0DTxxTE4RSV0i7PfhIIJZbjqhF5axqzv+oCGI=; b=QC6UeHUYeqzdXS8CdiMw61dl7fGAmoLS+SBf8qkyCGSXMHCwxwXoEfAiWlrfLF52cK YD267sCD3cUokYQivLVLx91UwodTfZNzY/mGjJJ1Mmp/73NzFG1of0JAb4O0f8qo4P3I ZoTagkeyAOGdeERQGICb+RcRPNzWdpKCA3PAj/HD9raWusDamxdZg/K8f2G4tjEslBuw aksKQmOkJ6Fum5nx6/wNhlHIueYmGwQWtn+dUxHvrTsM/q3NHqV7jUdj0e7D61ZqLXFh vk36Nm9NBW9OCNo1Cc90NpUqkGXVSCu24LqreKUqO1y2cKwQP49DrvT7sykt9tV9yPfR 8YOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U5Tity0DTxxTE4RSV0i7PfhIIJZbjqhF5axqzv+oCGI=; b=X5VnIaGhH8KGRyScahg0z593GXV8u7gpmj8ezc1diH70FuBrKAM0NYegPEDnYFEGi2 8ZWvh2WDA4CtpsmEHEAAD6PELKvw4VW1Pvv6DgRHU/0jjjYDNcqs/uW07iGHIVZiGU7R AJYTU6m/uY+1Nq5kYJbuWo3DTJlS70+NaVbdWr8k3v3pJglMg6ogBfnpB7sCDcBjYsVz qchN6D09zJ7eXSR1j6oX/O6D5lHL+PNuJLMLrdXOf12FLQJ//Fo1VtvEW84fU0dhKcn0 WUXLOVrQBXTpW0/tMV8gZtxTG8DKGS/tGABS+pg/qKsovP4VOCp7F1J0Dra437ex62tJ EPrw== X-Gm-Message-State: AJIora+lrtmvxEi1/sgb8gXbbKB1FPOQNNi0L4MVj+HusYcpyI3ulc/0 W2xsOeE6l2nNCwWfKw2wExvOvzzLxjZDhQgs X-Google-Smtp-Source: AGRyM1vkPQ6kdmwR7Bx6AfeA4prrHjqshO9txgxcQxRIsE8vPUalFbnsatwO012JpEXTEc/hknu6uA== X-Received: by 2002:a17:90a:8915:b0:1ef:7e13:258a with SMTP id u21-20020a17090a891500b001ef7e13258amr6746068pjn.236.1656877071688; Sun, 03 Jul 2022 12:37:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/30] oeqa/sdk: drop the nativesdk-python 2.x test Date: Sun, 3 Jul 2022 09:35:53 -1000 Message-Id: <53eca714b874d2cd323ab6d3e11641fdf746a980.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:37:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167578 From: Alexander Kanavin Python 2.x has been EOL for a while, and so this test never runs. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit b687627e9cffb8123c156413f55ea1929f1a7831) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdk/cases/python.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py index a334abce5f..d43354c32a 100644 --- a/meta/lib/oeqa/sdk/cases/python.py +++ b/meta/lib/oeqa/sdk/cases/python.py @@ -8,17 +8,6 @@ from oeqa.sdk.case import OESDKTestCase from oeqa.utils.subprocesstweak import errors_have_output errors_have_output() -class Python2Test(OESDKTestCase): - def setUp(self): - if not (self.tc.hasHostPackage("nativesdk-python-core") or - self.tc.hasHostPackage("python-core-native")): - raise unittest.SkipTest("No python package in the SDK") - - def test_python2(self): - cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" - output = self._run(cmd) - self.assertEqual(output, "Hello, world\n") - class Python3Test(OESDKTestCase): def setUp(self): if not (self.tc.hasHostPackage("nativesdk-python3-core") or From patchwork Sun Jul 3 19:35:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9792 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 D7DA2C43334 for ; Sun, 3 Jul 2022 19:38:05 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web09.64606.1656877075736006412 for ; Sun, 03 Jul 2022 12:37:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1dKkKdUG; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id bh13so1178685pgb.4 for ; Sun, 03 Jul 2022 12:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=A0/r9VQBUOYCLm57u4ntfn3lAMGvsksERostDxXxZPM=; b=1dKkKdUGh+jWDujIFXWjzfat1YrR9iIwtfwDWdU9uvH2QCZmSP4Hiufs5Z8NKW0mSC lA25KrjbAm8FpfnhzGRQTVM4gFedmBSESmpK6L5KnyWDUlSUH2annMY0re3XDkHnijHE qTActaguN0UZIBWnDQqnMFUuj3TB0zgxBM8oXL8BFy04TwuTjmNgFTIUdoGL8vFm3nLr oQYUnOlhls2mdu3Ie3vi0vfE/DadJRNF8RhKEOgAwBkJoQl0NpfYT/OUUC/tCD8y7Sy4 PNtKJD2ePwpFnaAY+2tbpGdrfq49CA9ykrqy/oFDovmPa7zWVV9Pg0yBuwTow3nfkv/5 CkRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A0/r9VQBUOYCLm57u4ntfn3lAMGvsksERostDxXxZPM=; b=kEgQ95JAkNK+tjpYsijvdH8i4zoIqs7PYsAW1guXPePHr705lRiD3qzeFn57QbDKaw m4RLk3MHvM43yoBfNppudbrYDOReRWj9RgzqgirX0C3BiiZUpGywZTWSsYdnB6RuTZB1 Gqh/cbHLDGvZJOh1lMPnKsirxvn/iwX/3xG9rYMBK1aHIJsPcLEMTqcxbahzA6HOy6w7 jWNjxsbGznM1FGoGFwopdMhLAAhaE7fAmtrbaW+NM2zZru/rRAHlwiuGvjx5RFcrEg6x NltSVwExCozQRS799VgeRf5iL8cYEWB1VLcWqSRCrwIAoPDv3iU+K8nL0iGhJG2m5G3r I3jg== X-Gm-Message-State: AJIora9hILQg32NpbReVI+8b/b3PBrkDsFZIGETvqnkXfvi1FAQVNP5H jLxpixkKH+fortT0VBhWYVndRZ9UquTHR4D7 X-Google-Smtp-Source: AGRyM1uyrAD9nvsn2QQW5X14zWo0WJEF7LcRaX68XqNijHDKRXrSA9gTEPuvE7wqYzyrscH2HyN/cQ== X-Received: by 2002:a05:6a00:2185:b0:520:7276:6570 with SMTP id h5-20020a056a00218500b0052072766570mr32717997pfi.84.1656877074710; Sun, 03 Jul 2022 12:37:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/30] base.bbclass: Correct the test for obsolete license exceptions Date: Sun, 3 Jul 2022 09:35:54 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167579 From: Peter Kjellerstedt The test for obsolete licenses used in INCOMPATIBLE_LICENSE_EXCEPTIONS tried to match the ":" tuples with the obsolete licenses and thus never matched anything. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie (cherry picked from commit 3ad994d95815eefed2a72b675c7a323b3ed38191) Signed-off-by: Steve Sakoman --- meta/classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index bdb3ac33c6..0cf27fbb91 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -596,9 +596,9 @@ python () { for lic_exception in exceptions: if ":" in lic_exception: - lic_exception.split(":")[0] + lic_exception = lic_exception.split(":")[1] if lic_exception in oe.license.obsolete_license_list(): - bb.fatal("Invalid license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) + bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) pkgs = d.getVar('PACKAGES').split() skipped_pkgs = {} From patchwork Sun Jul 3 19:35:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9793 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 DB0C8C433EF for ; Sun, 3 Jul 2022 19:38:05 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web09.64609.1656877079165382919 for ; Sun, 03 Jul 2022 12:37:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5lDh9Y/G; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id ju17so2258842pjb.3 for ; Sun, 03 Jul 2022 12:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t2kEJHOZd41Nl3z0AmVlNYddeC9pxVwxkrlCY5WoLww=; b=5lDh9Y/GzojBQ6QGgP/4sQAcWucnThJmtcn7BSWnjB9U+w92wc0c172FTc7cP1vQ+0 mFzFk8pMb4MguKFI3iR/pPAop7y9RbKC91MpxIYQEaMW60v3xF1IJHziJ7Bcm3SIkKn6 arlBewjN1JTptlFw7e43PTVblOWATLyXeGctCgMfUx8S7EySlDsAui9laqpbQr+vbnWq i8QK1hLNeQQEzWPHuQVRJRislZXFROVkSPTKaBFAxT/I4IIXnw7nkAAfblamgNT1EJfF Q+jOcmslrxFZ4aKocpSrqkAwxFkBqS402eztzkGHpaTma+erfIbLY0Qx7r7LQacI0J87 XVHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t2kEJHOZd41Nl3z0AmVlNYddeC9pxVwxkrlCY5WoLww=; b=qIjSEgpLzFdSD1sUzCC39x7WIwulJDDD/0SYlLIOdjaNPrrUEFYK5+LQJP5hHUV/4L tNY1vkNmMf+poZHD28bKUInaWqMqfzAtusywX4kNi6Vlo8XCFRpu38YfPcrlmyPwfWCE NMYpkaaZyN+jDHBafSqQCTcq14KyMWJ1H3TE+dTyd4Mft4VPey8Zr/csAxG3KLNlCfmf sgMB8PCnxjMB54kD6+2H5dwdryyz/eyPNQz8VawDWDK/6u8wz3MbiM0VNmSFZWnUsMSa pgmOYEzfMUf6SfTDDV0auWjtn4PiU6skwDW/qedv/xmFBE0uU8tNbyV4n7HT6WhV28HA rn4Q== X-Gm-Message-State: AJIora829dCtTVAvQTmx8SpW1MrTLXxeXBzk8AoGZEiUwB5QuvCH8wDM 2o7K780onVIEM9GmQNam0OeHLszPdwC3hwi/ X-Google-Smtp-Source: AGRyM1stu6zigQ47uo7mAu5vOxDy+eJBVuLSAa/M560+9vq/40B+GzJqrk/PhHAky/c8+AUhxkeP+A== X-Received: by 2002:a17:90b:3584:b0:1ee:fa46:3986 with SMTP id mm4-20020a17090b358400b001eefa463986mr30918358pjb.227.1656877078177; Sun, 03 Jul 2022 12:37:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:37:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/30] coreutils: Tweak packaging variable names for coreutils-dev Date: Sun, 3 Jul 2022 09:35:55 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167580 From: Richard Purdie PACKAGES uses ${PN}-dev so be consistent with the addition to the variable to avoid weird variable conflicts. The flags variable used here is messy, key expansion and overrides are not supported by flags. The plain variable access does happen to work though, so leave it as is for now and note. Signed-off-by: Richard Purdie (cherry picked from commit a5edae117d0d2a59fd3456ccbeeb6cd35dd1951f) Signed-off-by: Steve Sakoman --- meta/recipes-core/coreutils/coreutils_9.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/coreutils/coreutils_9.0.bb b/meta/recipes-core/coreutils/coreutils_9.0.bb index e4a948c7e5..865cffd4cd 100644 --- a/meta/recipes-core/coreutils/coreutils_9.0.bb +++ b/meta/recipes-core/coreutils/coreutils_9.0.bb @@ -174,8 +174,9 @@ RDEPENDS:${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-module # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy # may need tweaking if DEPENDS changes +# Can't use ${PN}-dev here since flags with overrides and key expansion not supported RRECOMMENDS:coreutils-dev[nodeprrecs] = "1" -RRECOMMENDS:coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" +RRECOMMENDS:${PN}-dev += "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" do_install_ptest () { install -d ${D}${PTEST_PATH}/tests From patchwork Sun Jul 3 19:35:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9791 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 DB520CCA47F for ; Sun, 3 Jul 2022 19:38:05 +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.web12.64412.1656877082725884684 for ; Sun, 03 Jul 2022 12:38:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QTdEzcOT; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id b2so7179404pfb.8 for ; Sun, 03 Jul 2022 12:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yFgaEUCiqu4atmelxPg+yl/U+rcF4BOUbOz5j5FaiWM=; b=QTdEzcOTXBvamRPomEKQr4KQ0K7ASanvXgIKFJSXIPjfpza0ZltAmwHzJDABlyEnng fA30McJr4VN+tsUrFGIUrAYOUTLOwqgFELgUj5TJ9da0Z9nLAJUigDKNicODzUsrHPfP b1fh/P2BuZvym4ni3TZ1cIh36qNfg7jJSEF8t+t9+A6GJS7mdryeoCbPob4Ewy7cHEvr /Xkr5ntfaIZAUraYVGy/bdULPuDqVwN3mFO8m/0k1anCaCdTTrHmCqlWoRXigSZygQ8A w+I5JgilnjV4OmEJ77WQ3FPnXTOxKDse3E1jfZbxXNS0x9D4reKdf/9cVA5o1dTma0GL +xrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yFgaEUCiqu4atmelxPg+yl/U+rcF4BOUbOz5j5FaiWM=; b=4FsZAAoYPNXt8DvhxNrSHgfddPfAY8PwCIgKPyTUQvarynuqOQz/8TWf2QG1mk5DFn yBgzu4RdTiJAynkUBP/082scZVXSeAyF6qtKyDM+fHueCldUGRTLTyBFlrV7xMJXztC8 IZrLaIFr84MUg91GbbJ5aYhXin+nC1BG2mfdFNOmQyqcgUHSZKIz9yOVbTaLqz5O/1Hd xIyg8E9t97ZZTa5yLJ9bhX183MVsVclsiT1OY3QU8I3gc7IGsN/rP/kPk4F5D5vabcJR f89VewPuj/STk1scgB+cVGnLkUXNDQyzGkrUuVNzn2bU9vgIf6ModJiseYT9S2fI/qci VGxQ== X-Gm-Message-State: AJIora+vVrbMn7nTVkAwvuY/9q9a++az6nC3oQpdk0kC9QV0bvvd6pTf Nb2UCvVDF2Q/xcHlxaTeywLfvoETml3aOYD+ X-Google-Smtp-Source: AGRyM1uFGRIz8+ReXE6uylIC2EhxEsMZjcP0TwfTlrCLkGjfA+PzLiVsApGlvR2SXhwGRoBo5vt/UQ== X-Received: by 2002:a63:86c7:0:b0:40d:af99:608 with SMTP id x190-20020a6386c7000000b0040daf990608mr22311357pgd.515.1656877081773; Sun, 03 Jul 2022 12:38:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.37.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/30] at: take tarballs from debian Date: Sun, 3 Jul 2022 09:35:56 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167581 From: Alexander Kanavin The original site went down, and at is more or less maintained in Debian anyway; the tarballs are identical in name and content. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 5fcf9e5c368188e920a995492b342012cbc7016d) Signed-off-by: Steve Sakoman --- meta/recipes-extended/at/at_3.2.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index 6769eb364b..87a436173f 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb @@ -22,7 +22,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits" RCONFLICTS:${PN} = "atd" RREPLACES:${PN} = "atd" -SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/a/at/${BPN}_${PV}.orig.tar.gz \ file://posixtm.c \ file://posixtm.h \ file://file_replacement_with_gplv2.patch \ From patchwork Sun Jul 3 19:35:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9794 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 DC0BFCCA473 for ; Sun, 3 Jul 2022 19:38:15 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web12.64414.1656877087850248894 for ; Sun, 03 Jul 2022 12:38:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=g5VnzI+1; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id l6so6818259plg.11 for ; Sun, 03 Jul 2022 12:38:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ayLMnFdQG4RuHN0kHLXm71HYUHZvN/ARIakzWcUbqTY=; b=g5VnzI+1h7ZRFkOcbhbbJ9SbRQT4SvoAcuyMvLUUEttQArpg+rJ9k1si7VxkXYPjCc yMEyfcI2jKpmrJ6YB5AR5mhWGTa2zaFszPGOFazj45eMlNRXM5RPS/gtMl5uSFw8BT5F VdH8IPr/WQ1hPUnGsxT0pvewsQGsCTmWhPC1RVL9j5nLaEYSjvojPpvivPiLH8V/K3JJ 9FdA7wOsjpVAt0COiBezWWxrB3svgrspH/hYTvwXzX9vqkFEsY4xEEJBQ9vYEtbuNSF/ MYCM94ar4bIQYxA4DTEWmeohHEJW1OMlnzJWfKZIOW8+S3l45ynxtHdDrru8nDGO6r36 Nl4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ayLMnFdQG4RuHN0kHLXm71HYUHZvN/ARIakzWcUbqTY=; b=HVW/aSr5J1MoryWFoIjnWwWVRxJ/PrGAbWZl1uXJKjwaAELUJWA027yYMwUUMsvRI3 hWMpEo7MNmPjGxU4nKCVVozCra37du6+DZOEIH0jcpyY/32uQZSQVbZ2wLmvu8XLvO3u M43B73d/62Gm+uGjthCTOz32CCIcjeB+ip/CYkPnepHbPjsbACJp8cvCmzVKwmejyPu3 SR57yQiQLREwdI1o8OauSw+2AvQhOXxtLBO5kKJrJIdVQ7/YMkPVJOrr0/pNzYGV0Is4 lgcHKnrv0zT3UtIJCBAM01wT7gHaWPsyzowNZ3SS3OZodzqAAz6KtrtFkque0DNL80ny xhRA== X-Gm-Message-State: AJIora/QVs7C7mWEnNx6Yp8gAAVM+w/vCN+wOyVKykHU3rMNxdgwAHRB I21WrXzsqPtV8SmEy4WqqHCq+3ahTI8xbR07 X-Google-Smtp-Source: AGRyM1uhCfw6X9cKLC7gpyBLqUTGgKwiO8F1nI1/T5E6LUj8/YMudb25nkZ2MQWs6tsGVKpyA4mqYw== X-Received: by 2002:a17:90b:508a:b0:1ec:73d9:a143 with SMTP id rt10-20020a17090b508a00b001ec73d9a143mr30564316pjb.71.1656877086832; Sun, 03 Jul 2022 12:38:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/30] rust: fix issue building cross-canadian tools for aarch64 on x86_64 Date: Sun, 3 Jul 2022 09:35:57 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167582 From: Peter Bergin Commit bd36593ba3db758b3eacc974e48468a665967961 did introduce a regression when building package rust-cross-canadian-aarch64 on a x86_64 host. This commit will fix that configuration. Suggested-by: Richard Purdie Signed-off-by: Peter Bergin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ef566af964e9f9d2c440a3b5771ed801216f30f9) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/rust/rust-common.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index 621cd4ad57..ef70c48d0f 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc @@ -309,10 +309,7 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): # build tspec tspec = {} - if bb.data.inherits_class('cross-canadian', d): - tspec['llvm-target'] = d.getVar('RUST_HOST_SYS', arch_abi) - else: - tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) + tspec['llvm-target'] = d.getVar('RUST_TARGET_SYS', arch_abi) tspec['data-layout'] = d.getVarFlag('DATA_LAYOUT', arch_abi) tspec['max-atomic-width'] = int(d.getVarFlag('MAX_ATOMIC_WIDTH', arch_abi)) tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) From patchwork Sun Jul 3 19:35:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9795 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 DC094C43334 for ; Sun, 3 Jul 2022 19:38:15 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web09.64613.1656877092336652872 for ; Sun, 03 Jul 2022 12:38:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=OQV3twRf; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id i8-20020a17090a4b8800b001ef8a65bfbdso29350pjh.1 for ; Sun, 03 Jul 2022 12:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ucRra75ISpMDFwZ0uymN3CXWiRc/rrexx/O6lXQ61Hs=; b=OQV3twRfuaSkZ0TgmwTWwHDGbbGKH7RXfzqY5iFbv+KpP2Q4DnC8I+oQprDCSDtDis LFU6OalAGUMHDhR/KV4ycfEnH/GX2jNX91khl4JtDrZ1AT0Md3eOZk0EDDutiks29nWV UaqsRl6R/EEKWQyGNNWmmC4/QAHBQs+bnF0nmzsXA2Gv9SA5Mj+lk0iObEH1ssSpGTq5 vLy+jkLzK3hFfASgRsvd+Vfpei2YUVgUK+yCCIVht3sNFG0rjQen1n1kTkNn/uP90ao1 RHJp5JgTPh22cF8iBeFXr6KkSiOWa+plhmtD+F8XWqVcXeZ3TbNbvUr2QoIDZKKavJcx +CqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ucRra75ISpMDFwZ0uymN3CXWiRc/rrexx/O6lXQ61Hs=; b=I6nHYcxHpWLH4EvaC12KbyOn42Ojz22Mxxfw+VolT3L6xUnaTghZqzK0io5dLfU7n/ ndNQ5+4dY58+sXbeEeEt3Wa1sjdPzjyHnKVj/yMEef0I/bu3dpk6dZRHZAcy7kIX/Xmo wG9Oq2drSO5SksO2/EHl2DOJViJkr+kxiKDxhxzot1gZ7KJmcWGgVnW/BrkRMDKDgWAX siI+Fiaeo+BpCuucs+9+XuIsYOZjswdaWHGBlYLqUrXDfdYzqq1JCnSR9NADtZEQq9WB 4oiDKsbQk7QkLSgwEZ+on7YAUTg3G3/XH68iq3RuVzTYRZ+T3Y3hC7V8I3FIzgsXuz3b XxOw== X-Gm-Message-State: AJIora9fqeJQBooT09Znkg3QAPHtN0NC2+drTPwUy6T+zkhnKn6JqFR/ DaDFvbxsYLuvVEhtoMZLMACNjKX5D9mzaql1 X-Google-Smtp-Source: AGRyM1sAL/tYzeIA/Qb7XrBlhqY8KYjDPzza3Gpdeg4Y8tLHI1uLLw/OYntb+y3EBJq2P9F4pIDZ+Q== X-Received: by 2002:a17:90a:f8ce:b0:1ef:798c:ae03 with SMTP id l14-20020a17090af8ce00b001ef798cae03mr8797256pjd.8.1656877091303; Sun, 03 Jul 2022 12:38:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/30] recipetool/devtool: Fix python egg whitespace issues in PACKAGECONFIG Date: Sun, 3 Jul 2022 09:35:58 -1000 Message-Id: <5a1fd88439c28c473a1723a040d780f100d6295e.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167583 From: Thomas Roos Substitute expressions or whitespace from python egg requires.txt when generating PACKAGECONFIG Pysetuptools sees the uvicorn.egg-info/requires.txt as extra requirements. Recipetool parses this information to generate the PACKAGECONFIG. These extra requirements contain expressions and whitespace, which are not allowed in PACKGAGECONFIG. This patch substitute them by hyphens to make PACKAGECONFIG parsable and readable. Also adding an oe-selftest for this. [YOCTO #14446] Signed-off-by: Thomas Roos Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit a854d95a79e64f3f82abfa4cc1daec750abf4249) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/devtool.py | 15 ++++++++++++++- scripts/lib/recipetool/create_buildsys_python.py | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 3eea2b1a0e..ddf6c0c9f8 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -444,7 +444,7 @@ class DevtoolAddTests(DevtoolBase): checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver checkvars['SRC_URI'] = url self._test_recipe_contents(recipefile, checkvars, []) - + def test_devtool_add_fetch_git(self): tempdir = tempfile.mkdtemp(prefix='devtoolqa') self.track_for_cleanup(tempdir) @@ -544,6 +544,19 @@ class DevtoolAddTests(DevtoolBase): # Test devtool build result = runCmd('devtool build %s' % pn) + def test_devtool_add_python_egg_requires(self): + # Fetch source + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + testver = '0.14.0' + url = 'https://files.pythonhosted.org/packages/e9/9e/25d59f5043cf763833b2581c8027fa92342c4cf8ee523b498ecdf460c16d/uvicorn-%s.tar.gz' % testver + testrecipe = 'python3-uvicorn' + srcdir = os.path.join(tempdir, testrecipe) + # Test devtool add + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url)) + class DevtoolModifyTests(DevtoolBase): def test_devtool_modify(self): diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py index f4f51c88b4..5686a62d3f 100644 --- a/scripts/lib/recipetool/create_buildsys_python.py +++ b/scripts/lib/recipetool/create_buildsys_python.py @@ -209,6 +209,18 @@ class PythonRecipeHandler(RecipeHandler): continue if line.startswith('['): + # PACKAGECONFIG must not contain expressions or whitespace + line = line.replace(" ", "") + line = line.replace(':', "") + line = line.replace('.', "-dot-") + line = line.replace('"', "") + line = line.replace('<', "-smaller-") + line = line.replace('>', "-bigger-") + line = line.replace('_', "-") + line = line.replace('(', "") + line = line.replace(')', "") + line = line.replace('!', "-not-") + line = line.replace('=', "-equals-") current_feature = line[1:-1] elif current_feature: extras_req[current_feature].append(line) @@ -297,6 +309,7 @@ class PythonRecipeHandler(RecipeHandler): lines_after.append('# The following configs & dependencies are from setuptools extras_require.') lines_after.append('# These dependencies are optional, hence can be controlled via PACKAGECONFIG.') lines_after.append('# The upstream names may not correspond exactly to bitbake package names.') + lines_after.append('# The configs are might not correct, since PACKAGECONFIG does not support expressions as may used in requires.txt - they are just replaced by text.') lines_after.append('#') lines_after.append('# Uncomment this line to enable all the optional features.') lines_after.append('#PACKAGECONFIG ?= "{}"'.format(' '.join(k.lower() for k in extras_req))) From patchwork Sun Jul 3 19:35:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9797 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 D69D6C43334 for ; Sun, 3 Jul 2022 19:38:25 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web11.64028.1656877097474669626 for ; Sun, 03 Jul 2022 12:38:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=AXvN8z3n; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id q140so7118276pgq.6 for ; Sun, 03 Jul 2022 12:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=k0j0hLrKG/KqrchoANK5vdrf4MEcU6bX6vNp1f2QNZA=; b=AXvN8z3nDF1Swrg3j6beAU84cxofwTZ8flEuoSYUdfLYRgSFyBemgkMdbUPF7peVD3 +l/5uMLE69FiDpruLNtsjZV+5We3uJeBEDEVxRWwTxjKI6kLqhtsjEH6OsAtF2K182dA jHjLJr0YSdmilEj102vfxHRS6+EsvcEX0klCBC4GhObO7iKXiWkKvRSsV3MWO4bKHNDT nKtZC5SItyKWkBLqKMraJyzj4zAztbaFnbesqOZ8rTJnuV2kQb7y95Wr6hOFtvo7NubA DXHj0jr32vbZAdGcjh711OlFcKtMHWAEw6Pe20F03oBbzavErtDOLDXnhFezko8fNusg oqeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k0j0hLrKG/KqrchoANK5vdrf4MEcU6bX6vNp1f2QNZA=; b=raSam4dV9OTHV8ZVxn2tiKGjh85rriVBJXvILD6WfaHmchLegKczlwJjPlIsnQfSFM MG/sOeQwePcshipp4vTLf9ivG6mlrwSrZmGeCVbMtS8MAvlR/LSCLvjpU/mj/nD0VIkC Ljr6nD1C5CsLDClGnl8oemxRjOR5hNiCxVsSJQo6dfzWQgCZwQ1e8OoE865vHnLcHgGA oAvKCZiLoDUVyOLXkx3A3ypFz46idQG0BDpX+mEcZkEea4+BSz/7VUAqWmrqop+JghhG T2C90pCJeXe3P4LY6yfRaa0/X8AHoMFC6qydR7ZPAx6zZO6m5u6blbuJsczGISibO2TF 9ORg== X-Gm-Message-State: AJIora/e1RabevcD5TSoDuKMJ+XX+x8xVJsSETvk3U1xTqeC6BFu1Rck IqjoHzkDA+8P1P/s6YlU9f1l+P7w62lZcu9s X-Google-Smtp-Source: AGRyM1tJusJqK71/4/OmscBnXoL0PuyTZ6pLwRTubuQuKAiFXqUKe9IhEVQS3RdBkcpWDP2CiZFhTQ== X-Received: by 2002:a63:371a:0:b0:40c:9a2e:7799 with SMTP id e26-20020a63371a000000b0040c9a2e7799mr22882286pga.113.1656877096446; Sun, 03 Jul 2022 12:38:16 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/30] glibc-tests: not clear BBCLASSEXTEND Date: Sun, 3 Jul 2022 09:35:59 -1000 Message-Id: <1a6396c431a454a293be102c8c0e8b10f247404b.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167584 From: Kai Kang It clears BBCLASSEXTEND in glibc-tests recipe to remove 'nativesdk' which is set in glibc recipe. The side effect is that it removes "${MULTILIBS}" at same time if multilib enabled. Then there will no multilib version glibc-tests. So only remove 'nativesdk' from BBCLASSEXTEND rather than clear it. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit d15975441471c9367b6d8cfa094f093e80f910d4) Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-tests_2.35.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-tests_2.35.bb b/meta/recipes-core/glibc/glibc-tests_2.35.bb index 414f8660de..028e83e865 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.35.bb +++ b/meta/recipes-core/glibc/glibc-tests_2.35.bb @@ -18,7 +18,8 @@ python __anonymous() { d.setVar("PROVIDES", "${PN} ${PN}-ptest") d.setVar("RPROVIDES", "${PN} ${PN}-ptest") - d.setVar("BBCLASSEXTEND", "") + bbclassextend = d.getVar("BBCLASSEXTEND").replace("nativesdk", "").strip() + d.setVar("BBCLASSEXTEND", bbclassextend) d.setVar("RRECOMMENDS", "") d.setVar("SYSTEMD_SERVICE:nscd", "") d.setVar("SYSTEMD_PACKAGES", "") @@ -95,7 +96,7 @@ python populate_packages:prepend () { d.setVar('DEBIAN_NAMES', '') } -FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/glibc-tests/*" +FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/${PN}/*" EXCLUDE_FROM_SHLIBS = "1" From patchwork Sun Jul 3 19:36:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9796 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 DD5A1C433EF for ; Sun, 3 Jul 2022 19:38:25 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.64480.1656877103627791465 for ; Sun, 03 Jul 2022 12:38:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fsYU505O; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id o15so2886965pjh.1 for ; Sun, 03 Jul 2022 12:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=p2zaZHhjdcxI4HWxXzr/898/pTG28cWrsIldJKsfCuQ=; b=fsYU505OGDBoeiB9xCsOzBahcAvy4aryzA+o2Ad6z+uk4IP5WN/D7F1B//92r/XGw3 ztnpkvrOTiBQLA+epoSwP6JlvbEQAvjxZOfZw/rhwrTyHl4S/uthjAcXKMeLe3SjpKDr yVjA7oCDAj3BSbmMR6QOEWW2yxeJycp18GJrJl1DwIFC08OA6OPeIt1Hcg32smjwHC5k q/x65MTCuDgXjEd/QtEzpIVuTDBYKsM97EsD2bQesGokbs1MpY7LC8c5sfz5+U2chFpF ITnNgqV3aHWRPHfECOLKAxIRyKp+s7g/3SlrTAYo2CnDyg8GbxWbC8u4Rlhlj5qEvmdV gaww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p2zaZHhjdcxI4HWxXzr/898/pTG28cWrsIldJKsfCuQ=; b=hHmFY+VqAxsSiEPoSTVacBbsU9ZQVN0UO8rAUblYehIH7Ypd8gox1/Sf8tLUMdTAHQ UKsW9l100K8R6vtyGSsbIV98lrFi69rn5J+nfBWZRN4VUocbfNqJ7lTDRvIqHqkuGwWD Wn9cCpji4xsw6Xzpg9au0adnkCzaQZxkgsWRF7vZesmmSmAnPCkl1Ngc4aarwIKtx+IG RQejqZZwUa6jepvBMVdePHrGJGVblyd0/EULm+i9ThOF0AcirVx5DF9apD63jxKoUsXi YWbgNWy/CqCkfz0a75hCxXAE3rkyEohypV5ekeXMCLhdYm5FeDMd4s8c17Bb04fSP+Cn QXKA== X-Gm-Message-State: AJIora/O3JATaGgztObVuwmnZsF5e+WUDMuzlnD2d/2j7PSK/DQToF8A 5hOOeOJdrru2T25TDvz/JeI3lfwsrXLBxv7X X-Google-Smtp-Source: AGRyM1vT4p6rQVlzp7WX65PhwZwEQHyLgBeKeaxHwNIb4Vq5OYMNX+XIpStMS4OWzJcohAuvqfqVPw== X-Received: by 2002:a17:902:aa4b:b0:164:11ad:af0f with SMTP id c11-20020a170902aa4b00b0016411adaf0fmr32565865plr.54.1656877102443; Sun, 03 Jul 2022 12:38:22 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/30] curl: backport openssl fix CN check error code Date: Sun, 3 Jul 2022 09:36:00 -1000 Message-Id: <7a8d374a3d4bbef336be2b273afc00c93c637ae6.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167585 From: Jose Quaresma Fix out of memory [1] OpenSSL host verification + hostname in certificate CN only seems broken in 7.82.0 [1] https://github.com/curl/curl/issues/8559 Signed-off-by: Jose Quaresma Signed-off-by: Steve Sakoman --- ...0001-openssl-fix-CN-check-error-code.patch | 38 +++++++++++++++++++ meta/recipes-support/curl/curl_7.82.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-support/curl/curl/0001-openssl-fix-CN-check-error-code.patch diff --git a/meta/recipes-support/curl/curl/0001-openssl-fix-CN-check-error-code.patch b/meta/recipes-support/curl/curl/0001-openssl-fix-CN-check-error-code.patch new file mode 100644 index 0000000000..c0a2355e5b --- /dev/null +++ b/meta/recipes-support/curl/curl/0001-openssl-fix-CN-check-error-code.patch @@ -0,0 +1,38 @@ +From 0677924c6ec7e0d68964553fb760f6d407242c54 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 8 Mar 2022 13:38:13 +0100 +Subject: [PATCH] openssl: fix CN check error code + +Due to a missing 'else' this returns error too easily. + +Regressed in: d15692ebb + +Reported-by: Kristoffer Gleditsch +Fixes #8559 +Closes #8560 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/911714d617c106ed5d553bf003e34ec94ab6a136] + +Signed-off-by: Jose Quaresma + +--- + lib/vtls/openssl.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c +index 616a510..1bafe96 100644 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -1808,7 +1808,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, + memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen); + peer_CN[peerlen] = '\0'; + } +- result = CURLE_OUT_OF_MEMORY; ++ else ++ result = CURLE_OUT_OF_MEMORY; + } + } + else /* not a UTF8 name */ +-- +2.34.1 + diff --git a/meta/recipes-support/curl/curl_7.82.0.bb b/meta/recipes-support/curl/curl_7.82.0.bb index ba3fd11820..d5dfe62a39 100644 --- a/meta/recipes-support/curl/curl_7.82.0.bb +++ b/meta/recipes-support/curl/curl_7.82.0.bb @@ -23,6 +23,7 @@ SRC_URI = "https://curl.se/download/${BP}.tar.xz \ file://CVE-2022-27779.patch \ file://CVE-2022-27782-1.patch \ file://CVE-2022-27782-2.patch \ + file://0001-openssl-fix-CN-check-error-code.patch \ " SRC_URI[sha256sum] = "0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c" From patchwork Sun Jul 3 19:36:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9799 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 D928DC43334 for ; Sun, 3 Jul 2022 19:38:35 +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.web09.64622.1656877108539508379 for ; Sun, 03 Jul 2022 12:38:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2p8FeCWC; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 68so7105964pgb.10 for ; Sun, 03 Jul 2022 12:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=otVHgLLXy5MlcUvziQmxF7FORcDqPihk5lI2JDRPhR0=; b=2p8FeCWCsbQKSy7KNKdTpY2gjgksknEDRs2GnIctPLSjL4UyXZc0A55gDwcU1E8W80 Xb98NOLDBPvGEAdFuWrHB9vyTiXihUhERDw54Yabf2/iyjxwY2zEgF8nSJKsKnn4IOLi alA76s9tjdwMTRuM4NyihwN9jFM63wv3oGjLyx/w2pd35mAkvBiqGADwN+9oOJ83RTSK HF6fbrE6uk02jDNRkUxjjt8vBNBFSM5oQuWngS4rWUY5Bsn19PxC94uzxWSYYxSlvnBW aMvnO+wcYvy9ohEgRQVvOY23fA9l+wZh/gp4IW6OBXSaVfWRk5wEY/SMwtja1BUXpUJa LVBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=otVHgLLXy5MlcUvziQmxF7FORcDqPihk5lI2JDRPhR0=; b=VswZjp3JoMSr3U+NSQAvFJkMLSzK0HA1JfB73lFO48Wa9/BARxqzZsRdIXDk1Tt9r4 hzujl3rzfI3dfa8kFRbGEuHwW0Kd5wzA4JE3jEVKgTJJNN7q1f9zQBMrzm0IJJBL2IH/ 8s7uI4AoGWL/VApn3g4e+BZuSr7/95VcFGKI22urIJEJ/oUGA/XKNgOEijZrAAfTI1XD pmkLBxUP7bPI3v/rsJfEiD7tgVZ0bCx/RBP2bhxt7cQ/7k1vWPcuYgEkkZoe7kzNSgP1 4JIqSeFBZ415FAbAz6DwVliXBDawq8Q8a17PwCJ12wbp5OK5tMLGZjPpJV2QclnR6Xpl R2ZA== X-Gm-Message-State: AJIora/TRRPBtmQFE/iACY5ix4zGk3GghDQrT0/Ho6GGfNzZJYTxi41F SPykNWKsELG9zGE/LnMmVIhSP7YmAEdtCB/o X-Google-Smtp-Source: AGRyM1u6zr1A375w735wa6YlJKLlm5jGD2QFWK1MhG/e+HTPJ9yJYtDtTX7eoTZIXy//nuqHNWLnvg== X-Received: by 2002:aa7:8883:0:b0:525:6b0a:b23d with SMTP id z3-20020aa78883000000b005256b0ab23dmr31883718pfe.82.1656877107551; Sun, 03 Jul 2022 12:38:27 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/30] oeqa/runtime/scp: Disable scp test for dropbear Date: Sun, 3 Jul 2022 09:36:01 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167586 From: Richard Purdie Fedora is switching to use sftp as the backend for scp. This means the scp test fails on Fedora 36 hosts with a dropbear target as dropbear doesn't support sftp. This change is in the upstream openssh code, other distros have not yet changed the default but probably will follow. The easiest way to resolve test failures in dropbear images is to stop testing this against dropbear as it is no longer expected to work and will likely spread as the change filters through other distros. Signed-off-by: Richard Purdie (cherry picked from commit a71fc7d455400f406b0d607be712a1133fe91166) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/cases/scp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/scp.py b/meta/lib/oeqa/runtime/cases/scp.py index 3a5f292152..f2bbc947d6 100644 --- a/meta/lib/oeqa/runtime/cases/scp.py +++ b/meta/lib/oeqa/runtime/cases/scp.py @@ -23,7 +23,7 @@ class ScpTest(OERuntimeTestCase): os.remove(cls.tmp_path) @OETestDepends(['ssh.SSHTest.test_ssh']) - @OEHasPackage(['openssh-scp', 'dropbear']) + @OEHasPackage(['openssh-scp']) def test_scp_file(self): dst = '/tmp/test_scp_file' From patchwork Sun Jul 3 19:36:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9798 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 DE3A8CCA473 for ; Sun, 3 Jul 2022 19:38:35 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web12.64418.1656877115259480522 for ; Sun, 03 Jul 2022 12:38:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=OKvkDpri; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id fz10so1274423pjb.2 for ; Sun, 03 Jul 2022 12:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7+wL1YS650i1q3tYzZCzsd0XKhmwweqV0CvlMWpytL0=; b=OKvkDpriuyO8oxPuTwqaGnrDO7bGU20fLwfrKHDAp9ZiC9L0m27C2M9X9t50LiqyC4 s7G7AjpYOQH7sScXOAcufBPhJtk2IfPZKiDsTE2jUzCsyn7BUVwHLPXSC1fAxvyVmgMV TINPHZZW5PCMD33PwSDEN52WVJ3zJfKUNDt42Tmqtu9sIU0ss8bw3l5pVRkD6raO9WrZ lHvaZvwfOabho9XojpMKXCRFySOURkhO13me5zUqjrdheW5knmFoQoy9KVXCRG53juDy wIPPjH8LHPUNncdtYNiTt9vE0QJ3iDg8Cry0nzF3p6HpgWo2+GmPitqSUIVpPk/DFnap Bl7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7+wL1YS650i1q3tYzZCzsd0XKhmwweqV0CvlMWpytL0=; b=Wguo485sRcTqN2NUWMeor1ewuMr2bgYPjcva4z+9YN07l3N0pxKjB73v1xWRZEp7B5 c8wXdyZJlXWPQo40A4jfz7mLVR6kbHI2aYANmcTWdrIFT1xtO4FtWgbsL1743irRQpdI DqD0SY72LAO1l2Zi10gdMFsvxYRDfGtT1T9LTDmVpGkmtqmmUX/DYRLTWZswdLHDGXaT amXCFbeLZuRLedWcQ3T18wnQc8UOfpcAmlNFH0YtYmBUt3Acp1b7xCnPb8EtqVs+5PuW dpQHrWqTXu0/MeBfOAzBsCgshbdX8xvAA/yLL/rfvzOMdjErDX6xR+ijs3zTNcS5iVqn zA6w== X-Gm-Message-State: AJIora9t0crZEvbam/i9bfPPsNOO9+628fMgsVEMqjEMiAGF9Z2Vz1oN M9KqZDUOudqHMmLP6jYpTEgVxJn6eHT++IE3 X-Google-Smtp-Source: AGRyM1u17Xs3pV09Cki0D6AT7HL+OetuPAyYPyy35xW9oqcLIXvTExck0lMkxalTceQa9FAEKPwt7g== X-Received: by 2002:a17:902:f68a:b0:16b:a762:9735 with SMTP id l10-20020a170902f68a00b0016ba7629735mr22562637plg.23.1656877114259; Sun, 03 Jul 2022 12:38:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/30] packagegroup-core-ssh-dropbear: Add openssh-sftp-server recommendation Date: Sun, 3 Jul 2022 09:36:02 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167587 From: Richard Purdie Seems sad to have to do this but openssh is moving to use sftp instead of scp to move files. This means scp from Fedora 36 will no longer be able to move files to/from a dropbear based image. This breaks a number of our key QA tests and I suspect will cause users pain too. The sftp server from openssh is small (200kb uncompressed) and standalone so adding it to the packagegroup seems to be the best way to preserve user sanity. If people really don't want it, they can just use dropbear instead of the packageground. Signed-off-by: Richard Purdie (cherry picked from commit a98188e83b2c027d99cc38e3367e1ec2a98efbb0) Signed-off-by: Steve Sakoman --- .../recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 4f844ad925..d06c6a5609 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb @@ -4,3 +4,4 @@ PR = "r1" inherit packagegroup RDEPENDS:${PN} = "dropbear" +RRECOMMENDS:${PN} = "openssh-sftp-server" From patchwork Sun Jul 3 19:36:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9800 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 D9804C43334 for ; Sun, 3 Jul 2022 19:38:45 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web11.64035.1656877120499272683 for ; Sun, 03 Jul 2022 12:38:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Kyw4VEDv; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id 23so7110136pgc.8 for ; Sun, 03 Jul 2022 12:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fZ3dnj7svyLqhCRESYHvgOKNBzlEw0nVO4dwCWeYygk=; b=Kyw4VEDv4ygjHXd4kS0KGm5QLgZxlpsc4G9IZXk5rdOaapVNzdhjIllmyqlnNtDqX+ U/25KDfRsVAoyyDOaQMrajQ9AIS2ka9U/QXI5STLMOZtKD/5RUi1sjwsDbKlnW/stVr9 izi3TaGBOgtN4eHayrr0GeUVlxgDjSEa2CrOyGxnWmSo5LIu0T+bfqt7/0fTIczPb6Ad XZkCjh4C/HBQddhflQiRvGpeibxb9chnNZ6th1j5l5z5nbveK9IdNZJ95jcZevmErCvf ccJN99lfaMbq12HtgGA0+CKSLZRklpRKxMoO8nk38GtULjIGJ0FK4IIwm/hh+LfjvJEv kPpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fZ3dnj7svyLqhCRESYHvgOKNBzlEw0nVO4dwCWeYygk=; b=czzHYmYWK/SoLXbN86jmi34bylRazR86Wm1xTmHKKEpk/1ZdPL2OTTtfQX7PBmhEfj 5HX9I8QcSR6bSRCSy5umgRCJ1WBX1TtGYj7mPu1olJkKnxEXfSXgNAF3n/cjOAXHIv9F s5DuxNeiAACJE9fFkDYz/owUhjdj8pBlfkGeDDYpSyGxkv0tiT6eJmWYZ91M8bSKWMtN B9+tXPeMTQzU6UJKd5areCDXxlLpVMZeucPKFkxTeYYwk+bUN7wgYoac5du2mmyv+UNZ GhFp9aIByNn1ieYr62d4PXqk0avbJAEp51C6qI/ywHE3mEy6/Yio5Z3Y2KwYFjTYIGhr 4BYw== X-Gm-Message-State: AJIora9va+CPy+gQKkgNiS4L4jfCwnC1Algipdb0qWUBGrAVz9n1eVVu Thm721GzrGig0+/die+tkJ+zIKDHL075x/HQ X-Google-Smtp-Source: AGRyM1sKG8dWKfO2TbRxj5bjnBJiBhLrn2+yzirieCKuwUMGFGIVf50nlm3KPVKVitbLuWRYPBLzKQ== X-Received: by 2002:a63:af59:0:b0:40c:a49e:7104 with SMTP id s25-20020a63af59000000b0040ca49e7104mr22525175pgo.279.1656877119321; Sun, 03 Jul 2022 12:38:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 28/30] oe-selftest-image: Ensure the image has sftp as well as dropbear Date: Sun, 3 Jul 2022 09:36:03 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167588 From: Richard Purdie We need sftp so that scp works with recent openssh. Use the packagegroup instead of a direct dependency to ensure this. Signed-off-by: Richard Purdie (cherry picked from commit 2b76c8e5fc8802bbe54371119e6bf6312bf2a8ec) Signed-off-by: Steve Sakoman --- meta-selftest/recipes-test/images/oe-selftest-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-selftest/recipes-test/images/oe-selftest-image.bb b/meta-selftest/recipes-test/images/oe-selftest-image.bb index e295943ae5..317a0712aa 100644 --- a/meta-selftest/recipes-test/images/oe-selftest-image.bb +++ b/meta-selftest/recipes-test/images/oe-selftest-image.bb @@ -1,7 +1,7 @@ SUMMARY = "An image used during oe-selftest tests" # libudev is needed for deploy mdadm via devtool -IMAGE_INSTALL = "packagegroup-core-boot dropbear libudev" +IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-dropbear libudev" IMAGE_FEATURES = "debug-tweaks" IMAGE_LINGUAS = " " From patchwork Sun Jul 3 19:36:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9802 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 D95C7C433EF for ; Sun, 3 Jul 2022 19:38:55 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.64482.1656877123909976958 for ; Sun, 03 Jul 2022 12:38:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Q7p8/Hts; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id a15so646294pjs.0 for ; Sun, 03 Jul 2022 12:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zKH3jrxofuB7b9cJgCc3rnHoiLmsjFB7I2njRCoarls=; b=Q7p8/Hts+LCCI1SAVH4EGQYQYbG93fsN1Oj9ZdY13diqP8v3MhYTlQkMkyVzMhriNG l4G4MRYWOXIqD8Snk6gxk93FTXkceBVSvreWilgOvDj+BRXClII7nJKso1VzOX32Xdkj FEuVRYjp7rPdDyp7y9/ialKOBD+HruzR1xb8FL0xRM4pXzx8xVVY+PT98mnfz68DrdYP ms7PBvohpVC+Szo1abeh2jhNWJ1wo4I7KahmaUeJjXrwb5VZGjfM7kzYXbfajI7Jl65o tEPRcnvnnaoBg6RH36WBuKIzxGDe+6zXDZfGaKmO0XQBjnzZTDyvsGQetaJUU55CZMLp nfHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zKH3jrxofuB7b9cJgCc3rnHoiLmsjFB7I2njRCoarls=; b=tH7pOaO3W3DYuZoeOyMLCnZsofH1iQAzXa40J88aHqWwHVxFSBY3fiRGC95Fc12rok fepH87UfihXEVy/mlcBz+b8kWo8w66Q/esrM77x5wKZeUaeZPDe21zdtu5HQXc7kco28 j4iUCXtVXBs0iJ3Uo5ZbO/QYrbR5GYBihTvYO35eGCzaVGR0AsBiM6I/UG4QBsts2IKQ ocvkrAB7/Qh9XCq/2gXDayvoUD/zu4cGHZhUjR+PZTJ+VAGz8IFJ2MgW8Xd9BivvlNLP cn/vrQ0UaYeQ1u/nR85KjVcLvp9bFahsnl8xBQQldlRszL00e+syep1ql/HUFJl+4A3Z mMgg== X-Gm-Message-State: AJIora/+WcXSy5IHGexEWYnjQD/1Q+03bPBcaFTDwrBSGPFbmvVrNqmq XxJN7H4jUBKqvO3rBN56cYB2kNyqZfBSb5gx X-Google-Smtp-Source: AGRyM1s+U3p1RyOFkdiSxCoSSAIJVB4M8qYG0MSPzI68/JFxbDxdzTRDMdPbvVqPdWI0orGhTJ3cIw== X-Received: by 2002:a17:90b:4d07:b0:1ef:521c:f051 with SMTP id mw7-20020a17090b4d0700b001ef521cf051mr19057428pjb.164.1656877122966; Sun, 03 Jul 2022 12:38:42 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 29/30] openssh: break dependency on base package for -dev package Date: Sun, 3 Jul 2022 09:36:04 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167589 Otherwise the SDK fails to build as the main openssh and dropbear packages conflict with each other Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/openssh/openssh_8.9p1.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb index f306b1245a..a3a0016ce5 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb @@ -166,6 +166,11 @@ RRECOMMENDS:${PN}-sshd:append:class-target = "\ ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ " +# break dependency on base package for -dev package +# otherwise SDK fails to build as the main openssh and dropbear packages +# conflict with each other +RDEPENDS:${PN}-dev = "" + # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" From patchwork Sun Jul 3 19:36:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9801 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 DE058C43334 for ; Sun, 3 Jul 2022 19:38:55 +0000 (UTC) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web10.64486.1656877128364448258 for ; Sun, 03 Jul 2022 12:38:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=pzmb7eoS; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id s27so7090546pga.13 for ; Sun, 03 Jul 2022 12:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ed9jSZxexUINZfFX6d6aQHWqb8kYSOPvVfP43k8aJ1E=; b=pzmb7eoSfvsJZT6sIwzX21HlZMbTbfRXVq0WXSkOef8igoQe3SeY8m335szau0P0ox paN2ka2BsyNFGJTog2uGGZ8eVFcAje+UIoZblowO/2mq72bOppVpKYP1l1lb/bYG0jbZ fx9bnWJ2PxZkTr8aOZjvYX7tCWslK8zX22YJ9LxcZXbkSbdoYrtyMRXgb5tbsRlyjekt 68mSag0pIVHTQoH6gWX+B/FpkvmFu8LtU4vI3JU7BcFuw7ffE5ViGqnpP2xHolQF0ha0 1wWnjqqMSEYBryibgq/71qS4SLiEDiemxiPQCYapZDUHkmT09nGuHzH0MTI78ynmiNqF reBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ed9jSZxexUINZfFX6d6aQHWqb8kYSOPvVfP43k8aJ1E=; b=CXO4Nc+iWgVawd+VXhHR6jFHt8nxT/UvxmNddS0QqNrWHEy6MaHLxpp6wQGUW6iCN2 020LyUM1F+hKdcwc1eCkiDh05OVKjYC3KxQgPHLHzW2GKEXWG+rwobgIBzRlp8qKex9Z 9PAJ63NL07rJdd0v6KdJFjNzQGzJ8kEYz1rBgz4HY+Z4+fJIGGP54KXL7Ssq+JE5CqWh JQQFbvIzMu4T8oUT5X2vXslPM82h3kt7FkmDvGqeflDbQK0RqD0hxjv95l91uIQtuICT ROQJH5vplRMFRZ89v513yaCmnCm2DwFFCPeLJa01y1aweRYIiD7FTX+NYsUqsWwPGfMT m5hg== X-Gm-Message-State: AJIora+GjbNV3vJYtlL3K4Q7BJ4zXPsYWyfJAjA1ik88ry9wwIabFh3/ NwT5fCrBZ1mV2SF6j/LaPdX/OyjheZ0euqf1 X-Google-Smtp-Source: AGRyM1tC+VrJrWNRYoD6GlXFHpiQHhCuRkLzLsFva+X3rXfO3EjC/3HjIgeWFkpn4cClVNDTbOn6rA== X-Received: by 2002:aa7:86c9:0:b0:525:3d39:8d0f with SMTP id h9-20020aa786c9000000b005253d398d0fmr33048155pfo.54.1656877127177; Sun, 03 Jul 2022 12:38:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b00168aed83c63sm19441739pln.237.2022.07.03.12.38.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 12:38:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 30/30] dropbear: break dependency on base package for -dev package Date: Sun, 3 Jul 2022 09:36:05 -1000 Message-Id: <4667abcc925ae0c430cccb480ec530506f6201ae.1656876825.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 03 Jul 2022 19:38:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167590 Otherwise the SDK fails to build as the main openssh and dropbear packages conflict with each other Signed-off-by: Steve Sakoman --- meta/recipes-core/dropbear/dropbear.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 78f9f9adbd..2d6e64cf8d 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -12,6 +12,11 @@ DEPENDS = "zlib virtual/crypt" RPROVIDES:${PN} = "ssh sshd" RCONFLICTS:${PN} = "openssh-sshd openssh" +# break dependency on base package for -dev package +# otherwise SDK fails to build as the main openssh and dropbear packages +# conflict with each other +RDEPENDS:${PN}-dev = "" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \