From patchwork Fri Nov 4 03:00: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: 14769 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 CC095C4321E for ; Fri, 4 Nov 2022 03:01:27 +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.web11.7149.1667530881786464670 for ; Thu, 03 Nov 2022 20:01:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6d5jSurD; spf=softfail (domain: sakoman.com, ip: 209.85.215.171, mailfrom: steve@sakoman.com) Received: by mail-pg1-f171.google.com with SMTP id 64so3314891pgc.5 for ; Thu, 03 Nov 2022 20:01:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gsU1daWWAr33IRDtcnNuPrDZtQaTPyq7yROvMnDsBgE=; b=6d5jSurDvxIY2ebWf/l49dFuSrXGNBCo3u8bUZgMXraxw4nQADWwDMKr5MarT8cE0T rYWGJTqrDAxJpVfixXbMDeFecxZHPiZpS+1jIn3W3XN05JH/88MIqU/frKHQRPw++mV/ Itfgl23a/xfbs0o0B01Q5Aif/JLcd5NR+kJ7vCJEvKcYtl7/uaLRvjkHrD6BDDMiggql BBxsFsrBeuKBNoJMT26qMVho7hVw4UL3vxiz2xwAuuU8+eYij59GitcqPGQLWXleMZkq SlSP6ZOvi/8PMmPlO259kwrPJkuhz9dDx2gV1xGpyVdjPnl8eh2tP5Lucp6tvQVFmjh8 6g5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gsU1daWWAr33IRDtcnNuPrDZtQaTPyq7yROvMnDsBgE=; b=IaedmkEv5Miy+8mxQbpnBcBdNT3ndLKxyT3tJuDVKS5k9KEP56XXi1W0OlMCRkr1zG M842AGdc+MGbF2EfnNp2++sDjwMoQNl0ovWPQKqNfzWIcutrO1HdOaEZncjxO4UeF+lu adsGgLGzkvGJl2c2cYWZ9jYD6rREzr5uGwrBPNQbpg18tN9KSgAWmObjlYVvbiwia534 yM92hdBqZjJ9RKUif9S0NT1wGW/XM+oHrFwyKWUoc/+EzhEIsVswNC1CVkdGXLJeEt5c LEymIKkVCtB95lAZa5qh6IesCVPH7ZWAiXXZkMVYIc7FAvh3MirD0OULmmus8oeYphki 2JJg== X-Gm-Message-State: ACrzQf2NWNZS/mK87bG0kEBgrmdnKpJajF9SopsU1oWS3LC8tBfjlyFT l3rjX9vKKqU3UITQAwQPdqkhFT5nQAjVAvrP X-Google-Smtp-Source: AMsMyM7ZexXPKwBZmwnvY9GbKjxDm1fOz5S431tN7eo5v877xVFcOtl5H4dE4AqW3HeRPEWmk3ENJg== X-Received: by 2002:a05:6a00:23c9:b0:56c:9f62:3369 with SMTP id g9-20020a056a0023c900b0056c9f623369mr32704459pfc.22.1667530880734; Thu, 03 Nov 2022 20:01:20 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/31] openssl: export necessary env vars in SDK Date: Thu, 3 Nov 2022 17:00:36 -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 ; Fri, 04 Nov 2022 03:01:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172662 From: Chen Qi In current SDK, when running the following command in python shell, we get an error. $ python3 >>> from cryptography.hazmat.backends import openssl The error message is as below: cryptography.exceptions.InternalError: Unknown OpenSSL error. We could set OPENSSL_MODULES explicitly in nativesdk-openssl package so that when SDK is set up, it's in environment and we can get rid of the above error. Also, there are other env vars that need to be exported. And we export all of them to keep sync with openssl-native.bbclass. Signed-off-by: Chen Qi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit d6b15d1e70b99185cf245d829ada5b6fb99ec1af) Signed-off-by: Steve Sakoman (cherry picked from commit 69030b368773baae65d95e39d3587913b8401bc7) Signed-off-by: Steve Sakoman --- .../openssl/files/environment.d-openssl.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index b9cc24a7ac..516bbd1c56 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh @@ -1 +1,5 @@ export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" +export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" +export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/cert.pem" +export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" +export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" From patchwork Fri Nov 4 03:00: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: 14770 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 ADBB9C433FE for ; Fri, 4 Nov 2022 03:01:27 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web12.7127.1667530883773100432 for ; Thu, 03 Nov 2022 20:01:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fR1HGnHV; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id k15so3384385pfg.2 for ; Thu, 03 Nov 2022 20:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x24hCMCcucIw5sPlAWZ5PxMJ/RFs7nBss6CnYNustIk=; b=fR1HGnHVW3fIew9LqD94SoSlv0NahePQKlcL1wTskjxy236XaaNOugKErbTQVkqQtr mkMdmtaKN/o2LUFI3ymnflVgxm8xLjVjwJgrNra2ILlvcXUEd0IsrEFNAy+nE/VuQat1 VKpziPnBMSUtKN/+yMMy+GWZbneNpHWcLCH3CpqRAwoHjrQ2Kt1acL3PfSDBuyS3K1Ot CiiIyedp4oShaD4QIsFY7e+nrsTWiksETvz+XR2wMmE4slBTUzieeNmrR936dwH7ZLzv 9/6Q9x2ucm0OjFkJDrFDouDFolLpSnN7Kg/Xz1s1aFJ979G0wr4aFHRHop/gude+C4c3 mrZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x24hCMCcucIw5sPlAWZ5PxMJ/RFs7nBss6CnYNustIk=; b=K5QdfHfAkhnF4u119a1SYqnimf+W7/m/FCaA1NRcmAgyM5zK7Kmtb2U2sbr0qtFuZ9 IDF1YnatAv2+NH5bK/lwkIX4/hxI+nG4IJs3PdbtXLG2Hy8R9+91oLDvFY2xG8Kz7YCo 4pPRkogY63SWeKDqbjhSZE3udkkEoD/KXpin02cFO6wolqeI9vxnS/0Ve1Ftf92rLA4J xmcBkxOjeQ0r79uznWQ48MBm7c3WSCI59DGEl0GKuEG1NGIloAfRYXa9PhA2+m2ZxkRd AGx2AKZNq2nsYFBsRcS+yrbUdq40Kz7NeYdq4Z9WPMT5K6tatApVwvfuT9Po+EStSeT4 xo1A== X-Gm-Message-State: ACrzQf3ng+zWoJwsaSrWjiArqakzBVLH6lCr/n4KAGMuYaJjYVePJiYN PX26+Cc4+Ju4T5+FqOLwSr3uUw6XIo3vmVNd X-Google-Smtp-Source: AMsMyM6Fxs4hPesvzjsHeEpkPoICKz+QVDlzbet9dolsEAzkgGewzpaery/AM3FNggduEPSKe6kVaQ== X-Received: by 2002:a63:5205:0:b0:46f:6320:9016 with SMTP id g5-20020a635205000000b0046f63209016mr29136753pgb.437.1667530882804; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:22 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/31] openssl: Fix SSL_CERT_FILE to match ca-certs location Date: Thu, 3 Nov 2022 17:00:37 -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 ; Fri, 04 Nov 2022 03:01:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172663 From: Richard Purdie In OE-Core d6b15d1e70b99185cf245d829ada5b6fb99ec1af, "openssl: export necessary env vars in SDK", the value added for SSL_CERT_FILE was in conflict with the value used elsewhere, such as in buildtools. This makes them match and fixes buildtools testsdk failures. Signed-off-by: Richard Purdie (cherry picked from commit 7d383a7fc6da666c80f2fc037af5f49a3388eb2b) Signed-off-by: Steve Sakoman (cherry picked from commit a9a50f2216951e26b62ed2f86f341d9ad13acf48) Signed-off-by: Steve Sakoman --- .../recipes-connectivity/openssl/files/environment.d-openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index 516bbd1c56..6f23490c87 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh @@ -1,5 +1,5 @@ export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/cert.pem" +export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" From patchwork Fri Nov 4 03:00: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: 14768 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 AEC9BC4332F for ; Fri, 4 Nov 2022 03:01:27 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web09.7177.1667530885706557936 for ; Thu, 03 Nov 2022 20:01:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tqm8jKUR; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id j12so3718788plj.5 for ; Thu, 03 Nov 2022 20:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yLa2GHEWRItJ9WN63WYVy4qyN5YYFTQq2aok7q7RSO0=; b=tqm8jKUR0UMYE6trU4qc6s1WwwuwDo8qF/kNO+QHmXPnvgO1U8rb9ozMrDRdHZWFRK AZgeNRMhcw5RNjQmpjQT2KiRZhBbZ8v2XgXbJgDSDrUXes3+zQ+4jrMvg1ivisp4psXI XxPj6NLNMjZZ1I3ptoUKeEL6CYOF3LFkkyWiRI9DLbkKxSy5YLSAKZgvGhDM5sxx6SOj tMLkEtWcp0994OCkRW7luNQfeBEu1UjAKmTbLEYzHd4AzGnmNFV0jKCUSUt9FRUyFreO WgzrwaWnotIOmxihMDACalFeeCWUM6Wz9KuxL01307WojpAn+uDSHxZiihU9zBhSByXJ s/oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yLa2GHEWRItJ9WN63WYVy4qyN5YYFTQq2aok7q7RSO0=; b=dlzgh/Skbe7h0SBhI4DfppkSYQSAxPN429SqWhXKbABypulaxl+rhP9cCkDieNouyd X3bnI/5P5aBrTh3jcH2WwAj8ywXwYX9VUTeCAKMf9FpohBveQH+zc+mEQWiEMAtvm0Ex 06hSa9gDCpLnyfgpxlQfn+JSM3jOlxASjkk9oP/CXTkOE/q+aw8eteP9sX/9KRny5vi0 2nGzm2Jf44iRWAIQ7PMI6O0sEG2vNYrWeGhCKgAMewZ4pcbHltYXdT7AuBqtbpdlx792 u4bE/AOZnCCP3P4wHI6TbFTIbH5vC74N6adqoCkV9hU3zjC/dpcltwdZbAxe9DSythS+ N/8w== X-Gm-Message-State: ACrzQf1scWuL98HdVMvaDSH+mnZAymwBNMV8Qd9ANRb/QwXFv81O/YSN 4gfYL90Y2VUuC5qy0WLFh8zob3WIa5dxRmUA X-Google-Smtp-Source: AMsMyM705ss91gYdvZU5tCjAroP/W2LggzDzdNTNFNLj98NltRYT/K3okNymMpaHphIgUVvLsMWYCQ== X-Received: by 2002:a17:902:e952:b0:17c:7aaa:c679 with SMTP id b18-20020a170902e95200b0017c7aaac679mr33608353pll.74.1667530884790; Thu, 03 Nov 2022 20:01:24 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/31] openssl: CVE-2022-3358 Using a Custom Cipher with NID_undef may lead to NULL encryption Date: Thu, 3 Nov 2022 17:00:38 -1000 Message-Id: <0575f1d03e640a989b4e75b3ef18944de383187f.1667530733.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 ; Fri, 04 Nov 2022 03:01:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172664 From: Hitendra Prajapati Upstream-Status: Backport from https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=5485c56679d7c49b96e8fc8ca708b0b7e7c03c4b] Description: CVE-2022-3358 openssl: Using a Custom Cipher with NID_undef may lead to NULL encryption. Affects "openssl < 3.0.6" Signed-off-by: Hitendra Prajapati Signed-off-by: Alexandre Belloni (cherry picked from commit f98b2273c6f03f8f6029a7a409600ce290817e27) Signed-off-by: Steve Sakoman (cherry picked from commit 08b32d2b35c2ba63774d098af467d1c723b1b6e6) Signed-off-by: Steve Sakoman --- .../openssl/openssl/CVE-2022-3358.patch | 55 +++++++++++++++++++ .../openssl/openssl_3.0.5.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch new file mode 100644 index 0000000000..18b2a5a6b2 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch @@ -0,0 +1,55 @@ +From 56e1d693f0ec5550a8e3dd52d30e57a02f0287af Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Wed, 19 Oct 2022 11:08:23 +0530 +Subject: [PATCH] CVE-2022-3358 + +Upstream-Status: Backport [https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=5485c56679d7c49b96e8fc8ca708b0b7e7c03c4b] +CVE : CVE-2022-3358 +Signed-off-by: Hitendra Prajapati +--- + crypto/evp/digest.c | 4 +++- + crypto/evp/evp_enc.c | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c +index de9a1dc..e6e03ea 100644 +--- a/crypto/evp/digest.c ++++ b/crypto/evp/digest.c +@@ -225,7 +225,9 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type, + || tmpimpl != NULL + #endif + || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0 +- || type->origin == EVP_ORIG_METH) { ++ || (type != NULL && type->origin == EVP_ORIG_METH) ++ || (type == NULL && ctx->digest != NULL ++ && ctx->digest->origin == EVP_ORIG_METH)) { + if (ctx->digest == ctx->fetched_digest) + ctx->digest = NULL; + EVP_MD_free(ctx->fetched_digest); +diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c +index 19a07de..5df08bd 100644 +--- a/crypto/evp/evp_enc.c ++++ b/crypto/evp/evp_enc.c +@@ -131,7 +131,10 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, + #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE) + || tmpimpl != NULL + #endif +- || impl != NULL) { ++ || impl != NULL ++ || (cipher != NULL && cipher->origin == EVP_ORIG_METH) ++ || (cipher == NULL && ctx->cipher != NULL ++ && ctx->cipher->origin == EVP_ORIG_METH)) { + if (ctx->cipher == ctx->fetched_cipher) + ctx->cipher = NULL; + EVP_CIPHER_free(ctx->fetched_cipher); +@@ -147,7 +150,6 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, + ctx->cipher_data = NULL; + } + +- + /* Start of non-legacy code below */ + + /* Ensure a context left lying around from last time is cleared */ +-- +2.25.1 + diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.5.bb b/meta/recipes-connectivity/openssl/openssl_3.0.5.bb index e50ff7f8c5..ee051ee7d4 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.5.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.5.bb @@ -12,6 +12,7 @@ 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://CVE-2022-3358.patch \ " SRC_URI:append:class-nativesdk = " \ From patchwork Fri Nov 4 03:00: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: 14772 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 93808C4332F for ; Fri, 4 Nov 2022 03:01:37 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web08.7200.1667530887613624371 for ; Thu, 03 Nov 2022 20:01:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZkCKKfhx; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id k22so3377427pfd.3 for ; Thu, 03 Nov 2022 20:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QvwONl0CV6IjYQ1glesFcwjPAehE1C1MeBFcojwAFiU=; b=ZkCKKfhx+bHqFOeRfg+8sx+xp/zhLM0nLNbZeH40TfRu0vPnUkoKGgtdp7pNV7NIus ZTLJF43SD+ZkkhNeCzfHKIEWAlAT/FD5jm3jmkyRhrFe+AmNlJFtTn2X/j5dfK5hPd7r fEGCaDH5GoT8uYvFxe+AQQiKXH92HqIGMgfutmW4dUHSQdxzd94FDU9q+ruoveUQtEuP yav0cY3LbbYv4aZbryrGJ5mXQu5vN9sO/E/r8gi7f1Lgxia18OTCbeIb8LAFRcq6wsp4 8qiGEEadhgGWEKFP19vzLbAaqcPvohBn6kXvAQLOrEjg0f4lS10D0BGA+ty5VLaobakX CtFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QvwONl0CV6IjYQ1glesFcwjPAehE1C1MeBFcojwAFiU=; b=2vLuVJzyp3dnJye946RKKTptV4kC9qk3LD1f7qJszNGxgcLzrcz3kbOo4OucklFPlI id1RiGx+HTevRhIhpZP688X44YXsKjVfd+GrPCG5nwQb7JjEO+jVKlOnKO0oUkCmhweV 0Za4RjYT5YcwoKmxl62gy/T5eaznI4bKvEFmv5yHf2MEKawn1MRxSMQ9JqZ31ZHCEjDW 8uM3IpxJ++SregLnN5xbucSU1x9nNdY9YLXaZeXDIs0neicM4BbQE/KkpGHFJkdBOn9q zlJ/d1zeZ/Dq/aAN7S9FIxN6S+MXgEobvvEsHwlRV9B82OrZMv1nCG51pQFRldnOgiCb 64bQ== X-Gm-Message-State: ACrzQf0Rhyn6JG4WOUrGLHNIAeZabJqLrVF34AGxwYg21gLD7vQVShdC QYnSs9Cv2OQ0uTdzodsI2FgdR4ApSaL18EqK X-Google-Smtp-Source: AMsMyM5XUKVBOg+Bv1eXKArcVmF9EuRx+7WWgFuXk4bUAbF9Q1iNQEmvbAmPcWdDLkOwVfhMzrMxTQ== X-Received: by 2002:a62:174a:0:b0:56b:a319:76d5 with SMTP id 71-20020a62174a000000b0056ba31976d5mr33018361pfx.23.1667530886627; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/31] openssl: Upgrade 3.0.5 -> 3.0.7 Date: Thu, 3 Nov 2022 17:00:39 -1000 Message-Id: <4d18efb1dc0b0c959383028827a1cb14c6355ed1.1667530733.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 ; Fri, 04 Nov 2022 03:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172665 From: Ed Tanous OpenSSL 3.0.5 includes a HIGH level security vulnerability [1]. Upgrade the recipe to point to 3.0.7. CVE-2022-3358 is reported fixed in 3.0.6, so drop the patch for that as well. [1] https://www.openssl.org/news/vulnerabilities.html Fixes CVE-2022-3786 and CVE-2022-3602: X.509 Email Address Buffer Overflows https://www.openssl.org/blog/blog/2022/11/01/email-address-overflows/ Signed-off-by: Ed Tanous Signed-off-by: Richard Purdie (cherry picked from commit a69ea1f7db96ec8b853573bd581438edd42ad6e0) Signed-off-by: Steve Sakoman --- .../openssl/openssl/CVE-2022-3358.patch | 55 ------------------- .../{openssl_3.0.5.bb => openssl_3.0.7.bb} | 3 +- 2 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch rename meta/recipes-connectivity/openssl/{openssl_3.0.5.bb => openssl_3.0.7.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch deleted file mode 100644 index 18b2a5a6b2..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2022-3358.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 56e1d693f0ec5550a8e3dd52d30e57a02f0287af Mon Sep 17 00:00:00 2001 -From: Hitendra Prajapati -Date: Wed, 19 Oct 2022 11:08:23 +0530 -Subject: [PATCH] CVE-2022-3358 - -Upstream-Status: Backport [https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=5485c56679d7c49b96e8fc8ca708b0b7e7c03c4b] -CVE : CVE-2022-3358 -Signed-off-by: Hitendra Prajapati ---- - crypto/evp/digest.c | 4 +++- - crypto/evp/evp_enc.c | 6 ++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c -index de9a1dc..e6e03ea 100644 ---- a/crypto/evp/digest.c -+++ b/crypto/evp/digest.c -@@ -225,7 +225,9 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type, - || tmpimpl != NULL - #endif - || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0 -- || type->origin == EVP_ORIG_METH) { -+ || (type != NULL && type->origin == EVP_ORIG_METH) -+ || (type == NULL && ctx->digest != NULL -+ && ctx->digest->origin == EVP_ORIG_METH)) { - if (ctx->digest == ctx->fetched_digest) - ctx->digest = NULL; - EVP_MD_free(ctx->fetched_digest); -diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c -index 19a07de..5df08bd 100644 ---- a/crypto/evp/evp_enc.c -+++ b/crypto/evp/evp_enc.c -@@ -131,7 +131,10 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, - #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE) - || tmpimpl != NULL - #endif -- || impl != NULL) { -+ || impl != NULL -+ || (cipher != NULL && cipher->origin == EVP_ORIG_METH) -+ || (cipher == NULL && ctx->cipher != NULL -+ && ctx->cipher->origin == EVP_ORIG_METH)) { - if (ctx->cipher == ctx->fetched_cipher) - ctx->cipher = NULL; - EVP_CIPHER_free(ctx->fetched_cipher); -@@ -147,7 +150,6 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx, - ctx->cipher_data = NULL; - } - -- - /* Start of non-legacy code below */ - - /* Ensure a context left lying around from last time is cleared */ --- -2.25.1 - diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.5.bb b/meta/recipes-connectivity/openssl/openssl_3.0.7.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_3.0.5.bb rename to meta/recipes-connectivity/openssl/openssl_3.0.7.bb index ee051ee7d4..9ed5f11df0 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.0.5.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.0.7.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://CVE-2022-3358.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a" +SRC_URI[sha256sum] = "83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e" inherit lib_package multilib_header multilib_script ptest perlnative MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" From patchwork Fri Nov 4 03:00: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: 14773 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 A4BC3C4167B for ; Fri, 4 Nov 2022 03:01:37 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web09.7179.1667530889504812205 for ; Thu, 03 Nov 2022 20:01:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=eyKh6OX9; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id m6-20020a17090a5a4600b00212f8dffec9so3574150pji.0 for ; Thu, 03 Nov 2022 20:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cpwKWtfu1/bjsjMgyL0AsJAwhMYyzczHVmuYMLQadmM=; b=eyKh6OX9148Owuwe47dd5aRWMrxKifu/jjicohdTV/VPJfQTqu/rNzk+ur7/tF6urA x8beSSCVVIfva8aiub74odlgNIShjFzIyBmUoJDzmewiysdJOVZ4uIF3vaiyYaEZvCbq vLMssaF6dvNOY0vLcwtoNgCjCZL48tkiiRl+lj6OFmcQx/sidnzkIh6QudYD0vx5JWBj CzORCiWpChkty7Mv09ORrxq79yk9WYa7FiXtgT8hIHO077u/qwBF1WRDq5TkFVFWCOis UqA0NU34LAT27PXbqkpyLh4jy4lMDaXZlFITO7wBAuB27klfbWa3s46Mdfro5vFyQ34J nG8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpwKWtfu1/bjsjMgyL0AsJAwhMYyzczHVmuYMLQadmM=; b=W+BEb3TOYBntkIcAyKtKiyglVmcOe6q+bnyKLZjAzMnVqNMdTG6O8Rbm0JnZMxpkdg Urt9gmr+P4NsjvdTqVskVrqC9Ke91xMRpElJHX1jKWaELga6cS/wu6PtSPj2etNxGBav +CNwwlVOnELhQIaB2W9gs7h1ofEt6h7U87QNKCSAj2JtVrw1Dg4ssg+658uVheL6ZG0h KMB8X2lPyJ/lpyqrqX578rH48DuIedg+19PDpFnCF9nGDf8aFu8NUaDi/V+tIple+ooP hBtf9mD4p//EeejFt9PXFS2iygIumJCUDJSXoliUYXIJGIyllVAZoKPNLyaEh0aMfIsd NLtg== X-Gm-Message-State: ACrzQf0b8a1JGGGVYUAaljwBVz9cFbVn3/KHYqRsu8dlUuZuW1KfH36D sIZrmCjsyny/PymKkBfndChR2ENkFjCLVExT X-Google-Smtp-Source: AMsMyM48eWywPsOQVzVbTf9J/LRfoy+z53qgXlUTNrzONv4Tj1VKixCCQtiGYtT3kEKQeKYZjMFlWQ== X-Received: by 2002:a17:902:aa46:b0:186:e220:11d4 with SMTP id c6-20020a170902aa4600b00186e22011d4mr33416003plr.163.1667530888543; Thu, 03 Nov 2022 20:01:28 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/31] lighttpd: fix CVE-2022-41556 Date: Thu, 3 Nov 2022 17:00: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 ; Fri, 04 Nov 2022 03:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172666 From: Ross Burton Backport the fix from upstream to fix this CVE. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 59f69125fb00dc8fd335f32fe6898e7a480141e4) Signed-off-by: Steve Sakoman --- .../lighttpd/lighttpd/CVE-2022-41556.patch | 31 +++++++++++++++++++ .../lighttpd/lighttpd_1.4.66.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-extended/lighttpd/lighttpd/CVE-2022-41556.patch diff --git a/meta/recipes-extended/lighttpd/lighttpd/CVE-2022-41556.patch b/meta/recipes-extended/lighttpd/lighttpd/CVE-2022-41556.patch new file mode 100644 index 0000000000..284a5a3ea9 --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd/CVE-2022-41556.patch @@ -0,0 +1,31 @@ +CVE: CVE-2022-41556 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From b18de6f9264f914f7bf493abd3b6059343548e50 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Sun, 11 Sep 2022 22:31:34 -0400 +Subject: [PATCH] [core] handle RDHUP when collecting chunked body + +handle RDHUP as soon as RDHUP detected when collecting HTTP/1.1 chunked +request body (and when not streaming request body to backend) + +x-ref: + https://github.com/lighttpd/lighttpd1.4/pull/115 +--- + src/gw_backend.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gw_backend.c b/src/gw_backend.c +index df9d8217..5db56287 100644 +--- a/src/gw_backend.c ++++ b/src/gw_backend.c +@@ -2228,7 +2228,7 @@ handler_t gw_handle_subrequest(request_st * const r, void *p_d) { + * and module is flagged to stream request body to backend) */ + return (r->conf.stream_request_body & FDEVENT_STREAM_REQUEST) + ? http_response_reqbody_read_error(r, 411) +- : HANDLER_WAIT_FOR_EVENT; ++ : (rc == HANDLER_GO_ON) ? HANDLER_WAIT_FOR_EVENT : rc; + } + + if (hctx->wb_reqlen < -1 && r->reqbody_length >= 0) { diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.66.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.66.bb index 801162867c..78978105b2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.66.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.66.bb @@ -14,6 +14,7 @@ RRECOMMENDS:${PN} = "lighttpd-module-access \ lighttpd-module-accesslog" SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ + file://CVE-2022-41556.patch \ file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ From patchwork Fri Nov 4 03:00: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: 14775 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 A1099C43219 for ; Fri, 4 Nov 2022 03:01:37 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.7183.1667530892267218729 for ; Thu, 03 Nov 2022 20:01:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=68tU7nj5; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id io19so3709234plb.8 for ; Thu, 03 Nov 2022 20:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lK2wWhVafIP+jKKzktVO+iSt/Qx/vH13/5mUFvSJS74=; b=68tU7nj5+1TMCZfthSZIT1fyRO4ENkVbcdDkSsf+hx86iNdkt39v491vRa9nQgywqt PGc0L85smaziACIXrLZhbD2AvYyG29BlkD7hjV4bjln8a1LmoicKIVB6LRYswgNz8AkP AT0o5I3O7VN3RrecARHVz7PyJ3kO2PjgByhjSyTCx08jknmzhnQIz8Uw5qrVHDNlLr/y orB1R0XeMyxvSO9oTCak3JVdEx5X43wc2Xkl3aJKzRzirG94EGfNp5MOjaBqzDap7Zyy nDZre38ewwqRLCf11ZvndWRsbZ0m9XQPPgmYZTdHbOpVsxMJ9KhPJvY644aplA41+eDc w6DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lK2wWhVafIP+jKKzktVO+iSt/Qx/vH13/5mUFvSJS74=; b=A+3EYBLbnmn1lDqLW7YesUllcr+gAgOjloCt63qcHMiium8uLXG+CAanSVCpz356re R369ZXGzeVuGNPwDEUVSiO2MLVoYcO61gdTPBUlj+xCTe9YynnoeG5QzhMu4ZPNDg8SD tWo9zLYogqySXV2iNABvuO0EjiyZCyM3IC97IxpZ18GFzKQIRIDWtVvqLk2tWgn1xy93 LqJUMDaoHkOeVD0uwzGqYNOV2ZiU2+LYZMjCs6kTszMeqDof+WyW4vHbs/HWpqWcLjQ6 p3MgzMP/8dGkCrb2osu68PCw2B0CLtH8KPpQbYJtGPdfZ17m8+dH4A8W7fBar7pDa7y7 mZng== X-Gm-Message-State: ACrzQf0+01AKSfOOPXuKVLSasmyxiao7EVhQ3zykxazg+wIHoaRpi3ph h9u7IYCnxjLc1HlvJeKpi0it/J+6sql4QID8 X-Google-Smtp-Source: AMsMyM5xAwOdtUQvvK3z3t23O3k7d2hB3JKpoyjZMiyEorGN2LHneWdyJM5sJJG4R4XUCJ1pk/e1Yw== X-Received: by 2002:a17:90b:264e:b0:212:d06f:35ad with SMTP id pa14-20020a17090b264e00b00212d06f35admr35457685pjb.2.1667530890705; Thu, 03 Nov 2022 20:01:30 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/31] tiff: fix CVE-2022-2953 Date: Thu, 3 Nov 2022 17:00:41 -1000 Message-Id: <469ac1fc6f18f0db72a13bde2268ba54ae37da75.1667530733.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 ; Fri, 04 Nov 2022 03:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172667 From: Zheng Qiu While this does not happen with the tiff 4.3.0 release, it does happen with the series of patches we have, so backport the two simple changes that restrict the tiffcrop options to avoid the vulnerability. CVE-2022-2953.patch was taken from upstream, and a small typo was fixed for the CVE number. The other patch is included in tiff 4.4.0 but not 4.3.0, so add it as well. Signed-off-by: Randy MacLeod Signed-off-by: Zheng Qiu Signed-off-by: Steve Sakoman --- ...ue-330-and-some-more-from-320-to-349.patch | 609 ++++++++++++++++++ .../libtiff/tiff/CVE-2022-2953.patch | 87 +++ meta/recipes-multimedia/libtiff/tiff_4.3.0.bb | 2 + 3 files changed, 698 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2022-2953.patch diff --git a/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch b/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch new file mode 100644 index 0000000000..07acf5eb90 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch @@ -0,0 +1,609 @@ +From e319508023580e2f70e6e626f745b5b2a1707313 Mon Sep 17 00:00:00 2001 +From: Su Laus +Date: Tue, 10 May 2022 20:03:17 +0000 +Subject: [PATCH] tiffcrop: Fix issue #330 and some more from 320 to 349 +Upstream-Status: Backport +Signed-off-by: Zheng Qiu +--- + tools/tiffcrop.c | 282 +++++++++++++++++++++++++++++++++++------------ + 1 file changed, 210 insertions(+), 72 deletions(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index 77cf6ed1..791ec5e7 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -63,20 +63,24 @@ + * units when sectioning image into columns x rows + * using the -S cols:rows option. + * -X # Horizontal dimension of region to extract expressed in current +- * units ++ * units, relative to the specified origin reference 'edge' left (default for X) or right. + * -Y # Vertical dimension of region to extract expressed in current +- * units ++ * units, relative to the specified origin reference 'edge' top (default for Y) or bottom. + * -O orient Orientation for output image, portrait, landscape, auto + * -P page Page size for output image segments, eg letter, legal, tabloid, + * etc. + * -S cols:rows Divide the image into equal sized segments using cols across + * and rows down +- * -E t|l|r|b Edge to use as origin ++ * -E t|l|r|b Edge to use as origin (i.e. 'side' of the image not 'corner') ++ * top = width from left, zones from top to bottom (default) ++ * bottom = width from left, zones from bottom to top ++ * left = zones from left to right, length from top ++ * right = zones from right to left, length from top + * -m #,#,#,# Margins from edges for selection: top, left, bottom, right + * (commas separated) + * -Z #:#,#:# Zones of the image designated as zone X of Y, + * eg 1:3 would be first of three equal portions measured +- * from reference edge ++ * from reference edge (i.e. 'side' not corner) + * -N odd|even|#,#-#,#|last + * Select sequences and/or ranges of images within file + * to process. The words odd or even may be used to specify +@@ -103,10 +107,13 @@ + * selects which functions dump data, with higher numbers selecting + * lower level, scanline level routines. Debug reports a limited set + * of messages to monitor progress without enabling dump logs. ++ * ++ * Note: The (-X|-Y), -Z and -z options are mutually exclusive. ++ * In no case should the options be applied to a given selection successively. + */ + +-static char tiffcrop_version_id[] = "2.4.1"; +-static char tiffcrop_rev_date[] = "03-03-2010"; ++static char tiffcrop_version_id[] = "2.5"; ++static char tiffcrop_rev_date[] = "02-09-2022"; + + #include "tif_config.h" + #include "libport.h" +@@ -774,6 +781,9 @@ static const char usage_info[] = + " The four debug/dump options are independent, though it makes little sense to\n" + " specify a dump file without specifying a detail level.\n" + "\n" ++"Note: The (-X|-Y), -Z and -z options are mutually exclusive.\n" ++" In no case should the options be applied to a given selection successively.\n" ++"\n" + ; + + /* This function could be modified to pass starting sample offset +@@ -2121,6 +2131,15 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32 + /*NOTREACHED*/ + } + } ++ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z and -z are mutually exclusive) --*/ ++ char XY, Z, R; ++ XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); ++ Z = (crop_data->crop_mode & CROP_ZONES); ++ R = (crop_data->crop_mode & CROP_REGIONS); ++ if ((XY && Z) || (XY && R) || (Z && R)) { ++ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z and -z are mutually exclusive.->Exit"); ++ exit(EXIT_FAILURE); ++ } + } /* end process_command_opts */ + + /* Start a new output file if one has not been previously opened or +@@ -2746,7 +2765,7 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols, + tsample_t count, uint32_t start, uint32_t end) + { + int i, bytes_per_sample, sindex; +- uint32_t col, dst_rowsize, bit_offset; ++ uint32_t col, dst_rowsize, bit_offset, numcols; + uint32_t src_byte /*, src_bit */; + uint8_t *src = in; + uint8_t *dst = out; +@@ -2757,6 +2776,10 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamplesBytes", +@@ -2769,6 +2792,9 @@ extractContigSamplesBytes (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + dst_rowsize = (bps * (end - start) * count) / 8; + +@@ -2812,7 +2838,7 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols, + tsample_t count, uint32_t start, uint32_t end) + { + int ready_bits = 0, sindex = 0; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint8_t maskbits = 0, matchbits = 0; + uint8_t buff1 = 0, buff2 = 0; + uint8_t *src = in; +@@ -2824,6 +2850,10 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamples8bits", +@@ -2836,7 +2866,10 @@ extractContigSamples8bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } +- ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } ++ + ready_bits = 0; + maskbits = (uint8_t)-1 >> (8 - bps); + buff1 = buff2 = 0; +@@ -2889,7 +2922,7 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols, + tsample_t count, uint32_t start, uint32_t end) + { + int ready_bits = 0, sindex = 0; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint16_t maskbits = 0, matchbits = 0; + uint16_t buff1 = 0, buff2 = 0; + uint8_t bytebuff = 0; +@@ -2902,6 +2935,10 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamples16bits", +@@ -2914,6 +2951,9 @@ extractContigSamples16bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + ready_bits = 0; + maskbits = (uint16_t)-1 >> (16 - bps); +@@ -2978,7 +3018,7 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols, + tsample_t count, uint32_t start, uint32_t end) + { + int ready_bits = 0, sindex = 0; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint32_t maskbits = 0, matchbits = 0; + uint32_t buff1 = 0, buff2 = 0; + uint8_t bytebuff1 = 0, bytebuff2 = 0; +@@ -2991,6 +3031,10 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamples24bits", +@@ -3003,6 +3047,9 @@ extractContigSamples24bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + ready_bits = 0; + maskbits = (uint32_t)-1 >> (32 - bps); +@@ -3087,7 +3134,7 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols, + tsample_t count, uint32_t start, uint32_t end) + { + int ready_bits = 0, sindex = 0 /*, shift_width = 0 */; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint32_t longbuff1 = 0, longbuff2 = 0; + uint64_t maskbits = 0, matchbits = 0; + uint64_t buff1 = 0, buff2 = 0, buff3 = 0; +@@ -3102,6 +3149,10 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols, + } + + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamples32bits", +@@ -3114,6 +3165,9 @@ extractContigSamples32bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + /* shift_width = ((bps + 7) / 8) + 1; */ + ready_bits = 0; +@@ -3193,7 +3247,7 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols, + int shift) + { + int ready_bits = 0, sindex = 0; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint8_t maskbits = 0, matchbits = 0; + uint8_t buff1 = 0, buff2 = 0; + uint8_t *src = in; +@@ -3205,6 +3259,10 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamplesShifted8bits", +@@ -3217,6 +3275,9 @@ extractContigSamplesShifted8bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + ready_bits = shift; + maskbits = (uint8_t)-1 >> (8 - bps); +@@ -3273,7 +3334,7 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols, + int shift) + { + int ready_bits = 0, sindex = 0; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint16_t maskbits = 0, matchbits = 0; + uint16_t buff1 = 0, buff2 = 0; + uint8_t bytebuff = 0; +@@ -3286,6 +3347,10 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamplesShifted16bits", +@@ -3298,6 +3363,9 @@ extractContigSamplesShifted16bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + ready_bits = shift; + maskbits = (uint16_t)-1 >> (16 - bps); +@@ -3363,7 +3431,7 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols, + int shift) + { + int ready_bits = 0, sindex = 0; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint32_t maskbits = 0, matchbits = 0; + uint32_t buff1 = 0, buff2 = 0; + uint8_t bytebuff1 = 0, bytebuff2 = 0; +@@ -3376,6 +3444,16 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols, + return (1); + } + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ /*--- Remark, which is true for all those functions extractCongigSamplesXXX() -- ++ * The mitigation of the start/end test does not allways make sense, because the function is often called with e.g.: ++ * start = 31; end = 32; cols = 32 to extract the last column in a 32x32 sample image. ++ * If then, a worng parameter (e.g. cols = 10) is provided, the mitigated settings would be start=0; end=1. ++ * Therefore, an error message and no copy action might be the better reaction to wrong parameter configurations. ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamplesShifted24bits", +@@ -3388,6 +3466,9 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + ready_bits = shift; + maskbits = (uint32_t)-1 >> (32 - bps); +@@ -3449,7 +3530,7 @@ extractContigSamplesShifted24bits (uint8_t *in, uint8_t *out, uint32_t cols, + buff2 = (buff2 << 8); + bytebuff2 = bytebuff1; + ready_bits -= 8; +- } ++ } + + return (0); + } /* end extractContigSamplesShifted24bits */ +@@ -3461,7 +3542,7 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols, + int shift) + { + int ready_bits = 0, sindex = 0 /*, shift_width = 0 */; +- uint32_t col, src_byte, src_bit, bit_offset; ++ uint32_t col, src_byte, src_bit, bit_offset, numcols; + uint32_t longbuff1 = 0, longbuff2 = 0; + uint64_t maskbits = 0, matchbits = 0; + uint64_t buff1 = 0, buff2 = 0, buff3 = 0; +@@ -3476,6 +3557,10 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols, + } + + ++ /* Number of extracted columns shall be kept as (end-start + 1). Otherwise buffer-overflow might occur. ++ * 'start' and 'col' count from 0 to (cols-1) but 'end' is to be set one after the index of the last column to be copied! ++ */ ++ numcols = abs(end - start); + if ((start > end) || (start > cols)) + { + TIFFError ("extractContigSamplesShifted32bits", +@@ -3488,6 +3573,9 @@ extractContigSamplesShifted32bits (uint8_t *in, uint8_t *out, uint32_t cols, + "Invalid end column value %"PRIu32" ignored", end); + end = cols; + } ++ if (abs(end - start) > numcols) { ++ end = start + numcols; ++ } + + /* shift_width = ((bps + 7) / 8) + 1; */ + ready_bits = shift; +@@ -5429,7 +5517,7 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + { + struct offset offsets; + int i; +- int32_t test; ++ uint32_t uaux; + uint32_t seg, total, need_buff = 0; + uint32_t buffsize; + uint32_t zwidth, zlength; +@@ -5510,8 +5598,13 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + seg = crop->zonelist[j].position; + total = crop->zonelist[j].total; + +- /* check for not allowed zone cases like 0:0; 4:3; etc. and skip that input */ ++ /* check for not allowed zone cases like 0:0; 4:3; or negative ones etc. and skip that input */ ++ if (crop->zonelist[j].position < 0 || crop->zonelist[j].total < 0) { ++ TIFFError("getCropOffsets", "Negative crop zone values %d:%d are not allowed, thus skipped.", crop->zonelist[j].position, crop->zonelist[j].total); ++ continue; ++ } + if (seg == 0 || total == 0 || seg > total) { ++ TIFFError("getCropOffsets", "Crop zone %d:%d is out of specification, thus skipped.", seg, total); + continue; + } + +@@ -5524,17 +5617,23 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + + crop->regionlist[i].x1 = offsets.startx + + (uint32_t)(offsets.crop_width * 1.0 * (seg - 1) / total); +- test = (int32_t)offsets.startx + +- (int32_t)(offsets.crop_width * 1.0 * seg / total); +- if (test < 1 ) +- crop->regionlist[i].x2 = 0; +- else +- { +- if (test > (int32_t)(image->width - 1)) ++ /* FAULT: IMHO in the old code here, the calculation of x2 was based on wrong assumtions. The whole image was assumed and 'endy' and 'starty' are not respected anymore!*/ ++ /* NEW PROPOSED Code: Assumption: offsets are within image with top left corner as origin (0,0) and 'start' <= 'end'. */ ++ if (crop->regionlist[i].x1 > offsets.endx) { ++ crop->regionlist[i].x1 = offsets.endx; ++ } else if (crop->regionlist[i].x1 >= image->width) { ++ crop->regionlist[i].x1 = image->width - 1; ++ } ++ ++ crop->regionlist[i].x2 = offsets.startx + (uint32_t)(offsets.crop_width * 1.0 * seg / total); ++ if (crop->regionlist[i].x2 > 0) crop->regionlist[i].x2 = crop->regionlist[i].x2 - 1; ++ if (crop->regionlist[i].x2 < crop->regionlist[i].x1) { ++ crop->regionlist[i].x2 = crop->regionlist[i].x1; ++ } else if (crop->regionlist[i].x2 > offsets.endx) { ++ crop->regionlist[i].x2 = offsets.endx; ++ } else if (crop->regionlist[i].x2 >= image->width) { + crop->regionlist[i].x2 = image->width - 1; +- else +- crop->regionlist[i].x2 = test - 1; +- } ++ } + zwidth = crop->regionlist[i].x2 - crop->regionlist[i].x1 + 1; + + /* This is passed to extractCropZone or extractCompositeZones */ +@@ -5549,22 +5648,27 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + crop->regionlist[i].x1 = offsets.startx; + crop->regionlist[i].x2 = offsets.endx; + +- test = offsets.endy - (uint32_t)(offsets.crop_length * 1.0 * seg / total); +- if (test < 1 ) +- crop->regionlist[i].y1 = 0; +- else +- crop->regionlist[i].y1 = test + 1; ++ /* FAULT: IMHO in the old code here, the calculation of y1/y2 was based on wrong assumtions. The whole image was assumed and 'endy' and 'starty' are not respected anymore!*/ ++ /* NEW PROPOSED Code: Assumption: offsets are within image with top left corner as origin (0,0) and 'start' <= 'end'. */ ++ uaux = (uint32_t)(offsets.crop_length * 1.0 * seg / total); ++ if (uaux <= offsets.endy + 1) { ++ crop->regionlist[i].y1 = offsets.endy - uaux + 1; ++ } else { ++ crop->regionlist[i].y1 = 0; ++ } ++ if (crop->regionlist[i].y1 < offsets.starty) { ++ crop->regionlist[i].y1 = offsets.starty; ++ } + +- test = offsets.endy - (offsets.crop_length * 1.0 * (seg - 1) / total); +- if (test < 1 ) +- crop->regionlist[i].y2 = 0; +- else +- { +- if (test > (int32_t)(image->length - 1)) +- crop->regionlist[i].y2 = image->length - 1; +- else +- crop->regionlist[i].y2 = test; +- } ++ uaux = (uint32_t)(offsets.crop_length * 1.0 * (seg - 1) / total); ++ if (uaux <= offsets.endy) { ++ crop->regionlist[i].y2 = offsets.endy - uaux; ++ } else { ++ crop->regionlist[i].y2 = 0; ++ } ++ if (crop->regionlist[i].y2 < offsets.starty) { ++ crop->regionlist[i].y2 = offsets.starty; ++ } + zlength = crop->regionlist[i].y2 - crop->regionlist[i].y1 + 1; + + /* This is passed to extractCropZone or extractCompositeZones */ +@@ -5575,32 +5679,42 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + crop->combined_width = (uint32_t)zwidth; + break; + case EDGE_RIGHT: /* zones from right to left, length from top */ +- zlength = offsets.crop_length; +- crop->regionlist[i].y1 = offsets.starty; +- crop->regionlist[i].y2 = offsets.endy; +- +- crop->regionlist[i].x1 = offsets.startx + +- (uint32_t)(offsets.crop_width * (total - seg) * 1.0 / total); +- test = offsets.startx + +- (offsets.crop_width * (total - seg + 1) * 1.0 / total); +- if (test < 1 ) +- crop->regionlist[i].x2 = 0; +- else +- { +- if (test > (int32_t)(image->width - 1)) +- crop->regionlist[i].x2 = image->width - 1; +- else +- crop->regionlist[i].x2 = test - 1; +- } +- zwidth = crop->regionlist[i].x2 - crop->regionlist[i].x1 + 1; ++ zlength = offsets.crop_length; ++ crop->regionlist[i].y1 = offsets.starty; ++ crop->regionlist[i].y2 = offsets.endy; ++ ++ crop->regionlist[i].x1 = offsets.startx + ++ (uint32_t)(offsets.crop_width * (total - seg) * 1.0 / total); ++ /* FAULT: IMHO from here on, the calculation of y2 are based on wrong assumtions. The whole image is assumed and 'endy' and 'starty' are not respected anymore!*/ ++ /* NEW PROPOSED Code: Assumption: offsets are within image with top left corner as origin (0,0) and 'start' <= 'end'. */ ++ uaux = (uint32_t)(offsets.crop_width * 1.0 * seg / total); ++ if (uaux <= offsets.endx + 1) { ++ crop->regionlist[i].x1 = offsets.endx - uaux + 1; ++ } else { ++ crop->regionlist[i].x1 = 0; ++ } ++ if (crop->regionlist[i].x1 < offsets.startx) { ++ crop->regionlist[i].x1 = offsets.startx; ++ } + +- /* This is passed to extractCropZone or extractCompositeZones */ +- crop->combined_length = (uint32_t)zlength; +- if (crop->exp_mode == COMPOSITE_IMAGES) +- crop->combined_width += (uint32_t)zwidth; +- else +- crop->combined_width = (uint32_t)zwidth; +- break; ++ uaux = (uint32_t)(offsets.crop_width * 1.0 * (seg - 1) / total); ++ if (uaux <= offsets.endx) { ++ crop->regionlist[i].x2 = offsets.endx - uaux; ++ } else { ++ crop->regionlist[i].x2 = 0; ++ } ++ if (crop->regionlist[i].x2 < offsets.startx) { ++ crop->regionlist[i].x2 = offsets.startx; ++ } ++ zwidth = crop->regionlist[i].x2 - crop->regionlist[i].x1 + 1; ++ ++ /* This is passed to extractCropZone or extractCompositeZones */ ++ crop->combined_length = (uint32_t)zlength; ++ if (crop->exp_mode == COMPOSITE_IMAGES) ++ crop->combined_width += (uint32_t)zwidth; ++ else ++ crop->combined_width = (uint32_t)zwidth; ++ break; + case EDGE_TOP: /* width from left, zones from top to bottom */ + default: + zwidth = offsets.crop_width; +@@ -5608,6 +5722,14 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + crop->regionlist[i].x2 = offsets.endx; + + crop->regionlist[i].y1 = offsets.starty + (uint32_t)(offsets.crop_length * 1.0 * (seg - 1) / total); ++ if (crop->regionlist[i].y1 > offsets.endy) { ++ crop->regionlist[i].y1 = offsets.endy; ++ } else if (crop->regionlist[i].y1 >= image->length) { ++ crop->regionlist[i].y1 = image->length - 1; ++ } ++ ++ /* FAULT: IMHO from here on, the calculation of y2 are based on wrong assumtions. The whole image is assumed and 'endy' and 'starty' are not respected anymore!*/ ++ /* OLD Code: + test = offsets.starty + (uint32_t)(offsets.crop_length * 1.0 * seg / total); + if (test < 1 ) + crop->regionlist[i].y2 = 0; +@@ -5618,6 +5740,18 @@ getCropOffsets(struct image_data *image, struct crop_mask *crop, struct dump_opt + else + crop->regionlist[i].y2 = test - 1; + } ++ */ ++ /* NEW PROPOSED Code: Assumption: offsets are within image with top left corner as origin (0,0) and 'start' <= 'end'. */ ++ crop->regionlist[i].y2 = offsets.starty + (uint32_t)(offsets.crop_length * 1.0 * seg / total); ++ if (crop->regionlist[i].y2 > 0)crop->regionlist[i].y2 = crop->regionlist[i].y2 - 1; ++ if (crop->regionlist[i].y2 < crop->regionlist[i].y1) { ++ crop->regionlist[i].y2 = crop->regionlist[i].y1; ++ } else if (crop->regionlist[i].y2 > offsets.endy) { ++ crop->regionlist[i].y2 = offsets.endy; ++ } else if (crop->regionlist[i].y2 >= image->length) { ++ crop->regionlist[i].y2 = image->length - 1; ++ } ++ + zlength = crop->regionlist[i].y2 - crop->regionlist[i].y1 + 1; + + /* This is passed to extractCropZone or extractCompositeZones */ +@@ -7551,7 +7685,8 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, + total_width = total_length = 0; + for (i = 0; i < crop->selections; i++) + { +- cropsize = crop->bufftotal; ++ ++ cropsize = crop->bufftotal; + crop_buff = seg_buffs[i].buffer; + if (!crop_buff) + crop_buff = (unsigned char *)limitMalloc(cropsize); +@@ -7640,6 +7775,9 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, + + if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ + { ++ /* rotateImage() changes image->width, ->length, ->xres and ->yres, what it schouldn't do here, when more than one section is processed. ++ * ToDo: Therefore rotateImage() and its usage has to be reworked (e.g. like mirrorImage()) !! ++ */ + if (rotateImage(crop->rotation, image, &crop->regionlist[i].width, + &crop->regionlist[i].length, &crop_buff)) + { +@@ -7655,8 +7793,8 @@ processCropSelections(struct image_data *image, struct crop_mask *crop, + seg_buffs[i].size = (((crop->regionlist[i].width * image->bps + 7 ) / 8) + * image->spp) * crop->regionlist[i].length; + } +- } +- } ++ } /* for crop->selections loop */ ++ } /* Separated Images (else case) */ + return (0); + } /* end processCropSelections */ + +-- +2.33.0 + diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2022-2953.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2022-2953.patch new file mode 100644 index 0000000000..3a3a915688 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2022-2953.patch @@ -0,0 +1,87 @@ +CVE: CVE-2022-2953 +Upstream-Status: Backport +Signed-off-by: Ross Burton +Signed-off-by: Zheng Qiu + +From 8fe3735942ea1d90d8cef843b55b3efe8ab6feaf Mon Sep 17 00:00:00 2001 +From: Su_Laus +Date: Mon, 15 Aug 2022 22:11:03 +0200 +Subject: [PATCH] =?UTF-8?q?According=20to=20Richard=20Nolde=20https://gitl?= + =?UTF-8?q?ab.com/libtiff/libtiff/-/issues/401#note=5F877637400=20the=20ti?= + =?UTF-8?q?ffcrop=20option=20=E2=80=9E-S=E2=80=9C=20is=20also=20mutually?= + =?UTF-8?q?=20exclusive=20to=20the=20other=20crop=20options=20(-X|-Y),=20-?= + =?UTF-8?q?Z=20and=20-z.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is now checked and ends tiffcrop if those arguments are not mutually exclusive. + +This MR will fix the following tiffcrop issues: #349, #414, #422, #423, #424 +--- + tools/tiffcrop.c | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c +index 90286a5e..c3b758ec 100644 +--- a/tools/tiffcrop.c ++++ b/tools/tiffcrop.c +@@ -173,12 +173,12 @@ static char tiffcrop_rev_date[] = "02-09-2022"; + #define ROTATECW_270 32 + #define ROTATE_ANY (ROTATECW_90 | ROTATECW_180 | ROTATECW_270) + +-#define CROP_NONE 0 +-#define CROP_MARGINS 1 +-#define CROP_WIDTH 2 +-#define CROP_LENGTH 4 +-#define CROP_ZONES 8 +-#define CROP_REGIONS 16 ++#define CROP_NONE 0 /* "-S" -> Page_MODE_ROWSCOLS and page->rows/->cols != 0 */ ++#define CROP_MARGINS 1 /* "-m" */ ++#define CROP_WIDTH 2 /* "-X" */ ++#define CROP_LENGTH 4 /* "-Y" */ ++#define CROP_ZONES 8 /* "-Z" */ ++#define CROP_REGIONS 16 /* "-z" */ + #define CROP_ROTATE 32 + #define CROP_MIRROR 64 + #define CROP_INVERT 128 +@@ -316,7 +316,7 @@ struct crop_mask { + #define PAGE_MODE_RESOLUTION 1 + #define PAGE_MODE_PAPERSIZE 2 + #define PAGE_MODE_MARGINS 4 +-#define PAGE_MODE_ROWSCOLS 8 ++#define PAGE_MODE_ROWSCOLS 8 /* for -S option */ + + #define INVERT_DATA_ONLY 10 + #define INVERT_DATA_AND_TAG 11 +@@ -781,7 +781,7 @@ static const char usage_info[] = + " The four debug/dump options are independent, though it makes little sense to\n" + " specify a dump file without specifying a detail level.\n" + "\n" +-"Note: The (-X|-Y), -Z and -z options are mutually exclusive.\n" ++"Note: The (-X|-Y), -Z, -z and -S options are mutually exclusive.\n" + " In no case should the options be applied to a given selection successively.\n" + "\n" + ; +@@ -2131,13 +2131,14 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32 + /*NOTREACHED*/ + } + } +- /*-- Check for not allowed combinations (e.g. -X, -Y and -Z and -z are mutually exclusive) --*/ +- char XY, Z, R; ++ /*-- Check for not allowed combinations (e.g. -X, -Y and -Z, -z and -S are mutually exclusive) --*/ ++ char XY, Z, R, S; + XY = ((crop_data->crop_mode & CROP_WIDTH) || (crop_data->crop_mode & CROP_LENGTH)); + Z = (crop_data->crop_mode & CROP_ZONES); + R = (crop_data->crop_mode & CROP_REGIONS); +- if ((XY && Z) || (XY && R) || (Z && R)) { +- TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z and -z are mutually exclusive.->Exit"); ++ S = (page->mode & PAGE_MODE_ROWSCOLS); ++ if ((XY && Z) || (XY && R) || (XY && S) || (Z && R) || (Z && S) || (R && S)) { ++ TIFFError("tiffcrop input error", "The crop options(-X|-Y), -Z, -z and -S are mutually exclusive.->Exit"); + exit(EXIT_FAILURE); + } + } /* end process_command_opts */ +-- +2.34.1 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb index f84057c46b..29a2c38d8e 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.3.0.bb @@ -25,6 +25,8 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2022-2869.patch \ file://CVE-2022-2867.patch \ file://b258ed69a485a9cfb299d9f060eb2a46c54e5903.patch \ + file://0001-tiffcrop-Fix-issue-330-and-some-more-from-320-to-349.patch \ + file://CVE-2022-2953.patch \ " SRC_URI[sha256sum] = "0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8" From patchwork Fri Nov 4 03:00: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: 14771 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 9471DC43217 for ; Fri, 4 Nov 2022 03:01:37 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web08.7201.1667530893771453705 for ; Thu, 03 Nov 2022 20:01:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ZC/rAClo; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id c15-20020a17090a1d0f00b0021365864446so3530964pjd.4 for ; Thu, 03 Nov 2022 20:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=U+dH/LW/6s0NUg9udavZ6egZUS850Y5y36wQIqmVMqU=; b=ZC/rACloSskwS11zIL+2czS9npp1PlygHkqYlXRJ2+vM3OXrFcizdlfA9R98EzZ1UE eCIlUijHhbHN2Z2nlMnWBAiuzPTz2BLdkWR7/WLhDAKN5tjNp2dnKwaazY3kM0PKr6SW Mqbjuj2eIqgaoKrLaFbLJThlcaElIzVQipgk3509Drahqvz8AFNP4Wp2lzL4Tjj1Sxij a6wNH+kY2blwNzJ5mKnXg8ZRrf+QVI7hdCFT0sd25RFqMUK6Mi29u8wAI+09aPiGv87E wA0o3UeSx2mEczv/jSGjHv6yrF8XU25QXHXaB0aRBNZh9g28Wn3NMxlseG9CSVzQnY91 k8oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U+dH/LW/6s0NUg9udavZ6egZUS850Y5y36wQIqmVMqU=; b=TNVeyFm1Ur0S00MS+v9U/+1AJ+JKMw1bCP8L/JMnkhgpQCFqsRqAYvvigz5w46CrM0 2GtXu3STD5azmUNXNh5pvuGVozTUckD1w+C6Wn7qxKZgyjWMtF9ogNao2+332ytv80BE H4MZ4BoItLw3QYUmQEww8Mrjn0FEEdBnW0BfPUgg5Z6bwTOG3dfJRGt3XAqk3SFhT8ZF LmYP8HZsIybPvvrjjd9SsbKk92o7AIqpGoQnW6CrJ0MTtT9J/j7Ql7FJhvDpJm7Iz8JO 08W9lf2lgfW7f6nuo12qXvkLYDx5vTsDENKhbJlNAuTuH3sFi6Byz2oFHHRuY0WASx9K k+AA== X-Gm-Message-State: ACrzQf0VvnPZIc2DRr+T2RVgZkriFK8wgwyp0dvPnctmTVAbHqNwXCok Vw10z67L+PL7AYczPEOiX4Saz2r7dVsAu8f7 X-Google-Smtp-Source: AMsMyM6dSkcmnRJaVA1X4S7cPpPG/5VxCCeHQzDZGKaQntgwlWaV1OXDdZ9go20++ZdSx6UObVTdFA== X-Received: by 2002:a17:90a:bf11:b0:211:84c5:42d7 with SMTP id c17-20020a17090abf1100b0021184c542d7mr50679734pjs.122.1667530892807; Thu, 03 Nov 2022 20:01:32 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/31] expat: backport the fix for CVE-2022-43680 Date: Thu, 3 Nov 2022 17:00:42 -1000 Message-Id: <4368e86005ac07d63b835ea9808acbe6be5c2a8e.1667530733.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 ; Fri, 04 Nov 2022 03:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172668 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Steve Sakoman --- .../expat/expat/CVE-2022-43680.patch | 33 +++++++++++++++++++ meta/recipes-core/expat/expat_2.4.9.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2022-43680.patch diff --git a/meta/recipes-core/expat/expat/CVE-2022-43680.patch b/meta/recipes-core/expat/expat/CVE-2022-43680.patch new file mode 100644 index 0000000000..76c55edc76 --- /dev/null +++ b/meta/recipes-core/expat/expat/CVE-2022-43680.patch @@ -0,0 +1,33 @@ +CVE: CVE-2022-43680 +Upstream-Status: Backport [5290462a7ea1278a8d5c0d5b2860d4e244f997e4] +Signed-off-by: Ross Burton + +From 5290462a7ea1278a8d5c0d5b2860d4e244f997e4 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Tue, 20 Sep 2022 02:44:34 +0200 +Subject: [PATCH] lib: Fix overeager DTD destruction in + XML_ExternalEntityParserCreate + +--- + expat/lib/xmlparse.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/xmlparse.c b/lib/xmlparse.c +index aacd6e7fc..57bf103cc 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -1068,6 +1068,14 @@ parserCreate(const XML_Char *encodingName, + parserInit(parser, encodingName); + + if (encodingName && ! parser->m_protocolEncodingName) { ++ if (dtd) { ++ // We need to stop the upcoming call to XML_ParserFree from happily ++ // destroying parser->m_dtd because the DTD is shared with the parent ++ // parser and the only guard that keeps XML_ParserFree from destroying ++ // parser->m_dtd is parser->m_isParamEntity but it will be set to ++ // XML_TRUE only later in XML_ExternalEntityParserCreate (or not at all). ++ parser->m_dtd = NULL; ++ } + XML_ParserFree(parser); + return NULL; + } diff --git a/meta/recipes-core/expat/expat_2.4.9.bb b/meta/recipes-core/expat/expat_2.4.9.bb index cb007708c7..22f9845a99 100644 --- a/meta/recipes-core/expat/expat_2.4.9.bb +++ b/meta/recipes-core/expat/expat_2.4.9.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb" VERSION_TAG = "${@d.getVar('PV').replace('.', '_')}" SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TAG}/expat-${PV}.tar.bz2 \ + file://CVE-2022-43680.patch \ file://run-ptest \ " From patchwork Fri Nov 4 03:00: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: 14774 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 98977C433FE for ; Fri, 4 Nov 2022 03:01:37 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.7152.1667530895683981092 for ; Thu, 03 Nov 2022 20:01:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CvqyOAK6; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id d59-20020a17090a6f4100b00213202d77e1so7029538pjk.2 for ; Thu, 03 Nov 2022 20:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0a5g7JV+x/i2QWCnVkw0Yd8tNIC8Gi0+5nBPgJLqJlc=; b=CvqyOAK6lKJViAKHefLjyoBuW2Fr3lb2d5TA5ENEQiAlw++poKSnko1GeOHMusH3TC PJJEwHfuXYmiDJxg9Q6fuL9TIG77QZZ77yyD3Sgf6Hf52CvgocW3R+L6WNdvZD2pOD0d 3gc7Z01oh0oxrKds+VHN2AlhuKVWhJIqaFcgx65d9I8k+cOVJu6dz1OpsfHzyBhypr4L +SdyDl3yeoneCEhljJ1ePm0pUglAXJ8H/pXWbyWWxhcJq0L7VqoDKiFO/JW/ZmIDvZCo g83dHZvIkGueuewuHYAJlqYNony8IXbsi/iKnPNVULIOOUbPUWHa2AOK7++CvKGzhBxf UCEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0a5g7JV+x/i2QWCnVkw0Yd8tNIC8Gi0+5nBPgJLqJlc=; b=NxyDQBdpBzxBV4Dz+z6buhMuQTBuQMX+Va3J8yfRg2SiqLfhhDF87KCNobUbHxUlMg q//DuL+nkW7KuNEi9a1g9tP7/GnkacD9DtJXSnvt18x0VbjhB6z2CJ+GN++srXVx/G2y 3KAE0DKXC+2t0P1BRAgRibuoVxNrTRM0OSDksLnYonQDoubynWqJQAJEc5kZnpViwW9F YFjeewXHJ8beM+6+9PrZq+ngofb2Soqry+iOnY+jw12/vPabtQqzZCKLG8hVksJ/X5wX /6TxZaiDtbAgrOdIIKqQ6p1B6InW8XsNMy2nul59T332J34CIDC1V73PdBk43lDPEsT7 fk+g== X-Gm-Message-State: ACrzQf2fqgKgHytWcrggPVj8/yUGlXz3IVMuureqZ7DqZWxIQxkJZCh9 Ce76ANhHptp2Yns+nXnjVni8GehGlFNTpSro X-Google-Smtp-Source: AMsMyM5fGr4hqhXQEM6p+x4gCAYRewLu88jPYN47uHCfeqK128WxZ5S+gZ31eQGFr3NWe9zkDujb7A== X-Received: by 2002:a17:902:db12:b0:187:2596:8b0c with SMTP id m18-20020a170902db1200b0018725968b0cmr22854768plx.172.1667530894694; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/31] wayland: fix CVE-2021-3782 Date: Thu, 3 Nov 2022 17:00:43 -1000 Message-Id: <2abd43bc1f0d4ea77603920337bc53add4c42394.1667530733.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 ; Fri, 04 Nov 2022 03:01:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172669 From: Narpat Mali An internal reference count is held on the buffer pool, incremented every time a new buffer is created from the pool. The reference count is maintained as an int; on LP64 systems this can cause thereference count to overflow if the client creates a large number of wl_shm buffer objects, or if it can coerce the server to create a large number of external references to the buffer storage. With the reference count overflowing, a use-after-free can be constructed on the wl_shm_pool tracking structure, where values may be incremented or decremented; it may also be possible to construct a limited oracle to leak 4 bytes of server-side memory to the attacking client at a time. Reference: https://nvd.nist.gov/vuln/detail/CVE-2021-3782 Upstream patch: https://gitlab.freedesktop.org/wayland/wayland/-/commit/b19488c7154b902354cb26a27f11415d7799b0b2 Signed-off-by: Narpat Mali Signed-off-by: Steve Sakoman --- .../wayland/wayland/CVE-2021-3782.patch | 111 ++++++++++++++++++ .../wayland/wayland_1.20.0.bb | 2 + 2 files changed, 113 insertions(+) create mode 100644 meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch diff --git a/meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch b/meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch new file mode 100644 index 0000000000..df204508e9 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/CVE-2021-3782.patch @@ -0,0 +1,111 @@ +From 5eed6609619cc2e4eaa8618d11c15d442abf54be Mon Sep 17 00:00:00 2001 +From: Derek Foreman +Date: Fri, 28 Jan 2022 13:18:37 -0600 +Subject: [PATCH] util: Limit size of wl_map + +Since server IDs are basically indistinguishable from really big client +IDs at many points in the source, it's theoretically possible to overflow +a map and either overflow server IDs into the client ID space, or grow +client IDs into the server ID space. This would currently take a massive +amount of RAM, but the definition of massive changes yearly. + +Prevent this by placing a ridiculous but arbitrary upper bound on the +number of items we can put in a map: 0xF00000, somewhere over 15 million. +This should satisfy pathological clients without restriction, but stays +well clear of the 0xFF000000 transition point between server and client +IDs. It will still take an improbable amount of RAM to hit this, and a +client could still exhaust all RAM in this way, but our goal is to prevent +overflow and undefined behaviour. + +Fixes #224 + +Signed-off-by: Derek Foreman + +Upstream-Status: Backport +CVE: CVE-2021-3782 + +Reference to upstream patch: +https://gitlab.freedesktop.org/wayland/wayland/-/commit/b19488c7154b902354cb26a27f11415d7799b0b2 + +[DP: adjust context for wayland version 1.20.0] +Signed-off-by: Dragos-Marian Panait +--- + src/wayland-private.h | 1 + + src/wayland-util.c | 25 +++++++++++++++++++++++-- + 2 files changed, 24 insertions(+), 2 deletions(-) + +diff --git a/src/wayland-private.h b/src/wayland-private.h +index 9bf8cb7..35dc40e 100644 +--- a/src/wayland-private.h ++++ b/src/wayland-private.h +@@ -45,6 +45,7 @@ + #define WL_MAP_SERVER_SIDE 0 + #define WL_MAP_CLIENT_SIDE 1 + #define WL_SERVER_ID_START 0xff000000 ++#define WL_MAP_MAX_OBJECTS 0x00f00000 + #define WL_CLOSURE_MAX_ARGS 20 + + struct wl_object { +diff --git a/src/wayland-util.c b/src/wayland-util.c +index d5973bf..3e45d19 100644 +--- a/src/wayland-util.c ++++ b/src/wayland-util.c +@@ -195,6 +195,7 @@ wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data) + union map_entry *start, *entry; + struct wl_array *entries; + uint32_t base; ++ uint32_t count; + + if (map->side == WL_MAP_CLIENT_SIDE) { + entries = &map->client_entries; +@@ -215,10 +216,25 @@ wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data) + start = entries->data; + } + ++ /* wl_array only grows, so if we have too many objects at ++ * this point there's no way to clean up. We could be more ++ * pro-active about trying to avoid this allocation, but ++ * it doesn't really matter because at this point there is ++ * nothing to be done but disconnect the client and delete ++ * the whole array either way. ++ */ ++ count = entry - start; ++ if (count > WL_MAP_MAX_OBJECTS) { ++ /* entry->data is freshly malloced garbage, so we'd ++ * better make it a NULL so wl_map_for_each doesn't ++ * dereference it later. */ ++ entry->data = NULL; ++ return 0; ++ } + entry->data = data; + entry->next |= (flags & 0x1) << 1; + +- return (entry - start) + base; ++ return count + base; + } + + int +@@ -235,6 +251,9 @@ wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data) + i -= WL_SERVER_ID_START; + } + ++ if (i > WL_MAP_MAX_OBJECTS) ++ return -1; ++ + count = entries->size / sizeof *start; + if (count < i) + return -1; +@@ -269,8 +288,10 @@ wl_map_reserve_new(struct wl_map *map, uint32_t i) + i -= WL_SERVER_ID_START; + } + +- count = entries->size / sizeof *start; ++ if (i > WL_MAP_MAX_OBJECTS) ++ return -1; + ++ count = entries->size / sizeof *start; + if (count < i) + return -1; + +-- +2.37.3 diff --git a/meta/recipes-graphics/wayland/wayland_1.20.0.bb b/meta/recipes-graphics/wayland/wayland_1.20.0.bb index bd437767b2..9351d2ed6a 100644 --- a/meta/recipes-graphics/wayland/wayland_1.20.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.20.0.bb @@ -16,7 +16,9 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ + file://CVE-2021-3782.patch \ " + SRC_URI[sha256sum] = "b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" From patchwork Fri Nov 4 03:00: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: 14778 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 93691C4332F for ; Fri, 4 Nov 2022 03:01:47 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.7154.1667530897554732713 for ; Thu, 03 Nov 2022 20:01:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=eziO7kwJ; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so2172340pjs.4 for ; Thu, 03 Nov 2022 20:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=avRfzfGoY3xWHQKQqxv/iKpbN6t1uj4HSUfTwdG3NRo=; b=eziO7kwJuvwWHg/ncdVC7axZpB+NmrrmSrQilY5AxceRIa9SE4PbHve4cVjQwnRPeg 11mnFc0ufw6pQb+dphiTnw181qZXDwLvzb9Q4SJblF5G5VQg0CgyyEN0pCG4cN95GARc 8SnoGSSout62547lNaJYkVpPAKFHvm8Bcw0QtxWea1fnLROJqwsl4TAxJ1D4IRBTjR8k gmWV2Syq0A3W7tNGOBi7RWKTnW07x8VvFkzAt04wUoV5UZ+0UULCLgd6VBDHRBG3SXq2 9L4B3CIAxKJNe8YccYrtrMZI6WGIN7b7aHNYK0sMUugmCx1/aWpGy0iuanqcNgPHlh7Y TT0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=avRfzfGoY3xWHQKQqxv/iKpbN6t1uj4HSUfTwdG3NRo=; b=lFHR+v++3uJkX+T2ZxnXN2dPWjZkwLrk03nw3jvx/gYcWzZFUwpBICDyFxdgVRJ4dQ hRU9TpiAe8lBfilPz3Ogq8adgBt9RCPAUZz1IFKuFkbA655WpDQl/0db3OtlIPqDFX6A JP017B+LP22we4Z4a3G2yXBs29cvRDWN5L/e20AF3K0/EJDj9zirpmxhpcp2Suu66vnK 6qaB/23A6XYpeHMvoGek2YKn3whCRa75SwwVMhLrqAmZnN/3bhVLCLQ/u6aARLX3IOaU kgpzXUAfXWM7V38etnGQcuyzthd6BJnw3O1c5yB5dQzlQkujF0P/8xSz2gk0Acfe5/zM Ecjg== X-Gm-Message-State: ACrzQf1g10oisNO9e0TV0fYwKnLyiH7EloRmiLsq+jfkb2UV86eJe2t5 ZHXZ6B7zVy5NuUye5TTKhz+lPS4qxPJnoHmT X-Google-Smtp-Source: AMsMyM4YIC320U8+HBEpl4Ba/rZ2/tznnr6FGiuRoPJc5xg9Bhxrw5s04480Uxb4/L1qhQSBKHFGEA== X-Received: by 2002:a17:902:7485:b0:17d:5176:fe6e with SMTP id h5-20020a170902748500b0017d5176fe6emr33459612pll.147.1667530896596; Thu, 03 Nov 2022 20:01:36 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/31] cve-update-db-native: add timeout to urlopen() calls Date: Thu, 3 Nov 2022 17:00:44 -1000 Message-Id: <6725a95736d4c0976dad8e9ea860ddb1a4c8952a.1667530733.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 ; Fri, 04 Nov 2022 03:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172670 From: Frank de Brabander The urlopen() call can block indefinitely under some circumstances. This can result in the bitbake process to run endlessly because of the 'do_fetch' task of cve-update-bb-native to remain active. This adds a default timeout of 60 seconds to avoid this hang, while being large enough to minimize the risk of unwanted timeouts. Signed-off-by: Frank de Brabander Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit e5f6652854f544106b40d860de2946954de642f3) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-db-native.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 944243fce9..9b9dbbd75f 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -18,6 +18,9 @@ NVDCVE_URL ?= "https://nvd.nist.gov/feeds/json/cve/1.1/nvdcve-1.1-" # Use a negative value to skip the update CVE_DB_UPDATE_INTERVAL ?= "86400" +# Timeout for blocking socket operations, such as the connection attempt. +CVE_SOCKET_TIMEOUT ?= "60" + python () { if not bb.data.inherits_class("cve-check", d): raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") @@ -39,6 +42,8 @@ python do_fetch() { db_file = d.getVar("CVE_CHECK_DB_FILE") db_dir = os.path.dirname(db_file) + cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) + if os.path.exists("{0}-journal".format(db_file)): # If a journal is present the last update might have been interrupted. In that case, # just wipe any leftovers and force the DB to be recreated. @@ -79,7 +84,7 @@ python do_fetch() { # Retrieve meta last modified date try: - response = urllib.request.urlopen(meta_url) + response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout) except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') bb.warn("Failed to fetch CVE data (%s)" % e.reason) @@ -107,7 +112,7 @@ python do_fetch() { # Update db with current year json file try: - response = urllib.request.urlopen(json_url) + response = urllib.request.urlopen(json_url, timeout=cve_socket_timeout) if response: update_db(conn, gzip.decompress(response.read()).decode('utf-8')) conn.execute("insert or replace into META values (?, ?)", [year, last_modified]).close() From patchwork Fri Nov 4 03:00: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: 14779 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 9E1BDC4167D for ; Fri, 4 Nov 2022 03:01:47 +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.7130.1667530899541612988 for ; Thu, 03 Nov 2022 20:01:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=dhP+FoGk; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id c2so3697230plz.11 for ; Thu, 03 Nov 2022 20:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YbVhGprp3khcAl8xOfjZy6Nq/4dGS+7fASFCF1ggR0Y=; b=dhP+FoGkrTQApdXB6f+5ZaB8kDGfjYH4/o0v/VO0nLBGaOVl9GP1vDnRp1XC2CZpOx YiZ/Uh7VM7Sa+L4VLfTApDDWmh/hzFo38z9HuKiP9HV732CWpNrFzf4ovYfuGa5q0+n4 SBCcGFkRQv/GAvRZOmNJQVey+lW0OIvrlWH5eP706b0nN1xI0WV2/dseC0kBd5LzzWA5 0fjiwARQ3zdrfU21k3mP1v3TP07DpAeeS0FmGwjU7lmSa3wsNKioFgDqqkc01c6p+o4w rVQqvWxykSxDr8JWbWvi1LZFyVCQwn1D22XUuyTG8u1gJSPsEqXpEPE8ukUBSIYPJ6gN 4p8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YbVhGprp3khcAl8xOfjZy6Nq/4dGS+7fASFCF1ggR0Y=; b=WnhkH7oFsbu/Z7/sNvGt2BRsgoo17+3KqIza0vQ0zxtEnXqcz+wwp7B9943cfcv1jS OX3/Pj/Bx795GFDsIOBMyPhMMldESHYzudHYudvm66efkjJQtfMBfHju60pyOOGmr4Ck ivwNcHzQrf7yUJS6FFmb/OjO2OXfDoRDxe0vcYibwRXcVFSdQsmVjZSOi3a29qj7avwg pNVp3tT241H5uxri8xXH+33PuqPPYb/iFIXd+S+HJhVLs2TVq7mDLrEJwDPNRaV9c3Qo JkdAj583XYUZTS49KfPr96lOR7St22Kfn/LEOn7JKDJGLlbjOQknPAfDkjvndYznLwys hk8g== X-Gm-Message-State: ACrzQf3lDa/XLIZbgAuS2f7su560P2CTmeAfpiIz/m/3gsxmIe+D3Yc8 u/neIkCCcQQNx2XSZ7iv1TSFz4ULjON7d39L X-Google-Smtp-Source: AMsMyM5V91qnmoSxB60qtaoprzVUe6mYzSGDQiGOUkhrDPPNxH6Mvx8Ft8nrVXY59Z3Ojyrf4OQQRQ== X-Received: by 2002:a17:90b:4a42:b0:213:383f:cd21 with SMTP id lb2-20020a17090b4a4200b00213383fcd21mr50940767pjb.23.1667530898550; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/31] vim: Upgrade 9.0.0598 -> 9.0.0614 Date: Thu, 3 Nov 2022 17:00: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 ; Fri, 04 Nov 2022 03:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172671 From: Teoh Jay Shen Include fixes for CVE-2022-3352. Signed-off-by: Teoh Jay Shen Signed-off-by: Luca Ceresoli (cherry picked from commit 8aa707f80ae1cfe89d5e20ec1f1632a65149aed4) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index cbc370100b..0710f6afbf 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".0598" -SRCREV = "8279af514ca7e5fd3c31cf13b0864163d1a0bfeb" +PV .= ".0614" +SRCREV = "ef976323e770315b5fca544efb6b2faa25674d15" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Nov 4 03:00: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: 14780 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 9DE50C4167B for ; Fri, 4 Nov 2022 03:01:47 +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.web12.7131.1667530901419952956 for ; Thu, 03 Nov 2022 20:01:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=chYflXX5; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id v4-20020a17090a088400b00212cb0ed97eso3528273pjc.5 for ; Thu, 03 Nov 2022 20:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Q33k6dm08Pi7V2PEK5W3pUT7zfJnC05ua39Se6HIbu8=; b=chYflXX5c0lPxU6o5tp/F05g/QRXM72ZaYTfA1gRVRvNU7EEQCunBXnHFla+driLWu gplrVXM2f2Ihg0b2aBqoQlHSb+/Oj+9tNg5K6wmdXuhYyKlIRZ3l2QBayqXmsZJI8WAL OTlTzWksveT7zPHAaD2FQGxVx0cE2PVrtWRgYsqoeZbu5x/RrV9upNEvyBLDU+gLNZUF 6KRhM53kLtfiyWj8NW1YSg6JmvLcbUUZeW3LBbHjVjAFTN5Xpv59PcvvcGHSW+qhoD+6 6x0iz40YWBDBjB63Eei5IUSYBrcY4dd3j7AVaYKQN5EYbNGZD6qq+Md5usprtIuNVzd2 Ef5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q33k6dm08Pi7V2PEK5W3pUT7zfJnC05ua39Se6HIbu8=; b=VOhXi7xtX3y8c+nOfej0ekgUTpQdlGVYZe6fQZ8QvpYnYryJ0uwWalfX8UeFPJ7WpT OlBu9uCJzIaDlSgsjWP9aDp9KIcDVdTc15aY0IVZujG62fqfFAj86+6Njzyck/fQ3ZwM kNfFy05u3uJbgqOESMyg093NiZFImnuHGsC09fiS/0Xc8Ar8TfPVrmmmb5BleiW7tcIY qBk6Z15dYwG/25TstHz3aKfkiIcSrcmE6Fc3gZmspTsFeRHNN/UuXnUNdJjlt6Fe0GWT i2izv8E+OE/lq291zn9Odek9rmfoj0mZfksNATnWJriz9pwxRUjPqajKKrkLokIXqpEn Niqw== X-Gm-Message-State: ACrzQf0Pm1++S8UARXpIvrUS82wMR84eEdMOnFwJftbDiDR6Hv4r3XRJ 9oV8qZ4Zgjn4aaxiCzwj6Ur17x70HPLDGovt X-Google-Smtp-Source: AMsMyM4nRPQAZGrqEWqWQD8OpiPXuOi+U5Zdd7pDD+ooPIhXyw37+Xlo9NdSwsaLIEMr/25Z6i5DxQ== X-Received: by 2002:a17:902:ec8e:b0:187:1c64:7c32 with SMTP id x14-20020a170902ec8e00b001871c647c32mr25562200plg.24.1667530900575; Thu, 03 Nov 2022 20:01:40 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/31] vim: upgrade 9.0.0614 -> 9.0.0820 Date: Thu, 3 Nov 2022 17:00:46 -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 ; Fri, 04 Nov 2022 03:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172672 From: Tim Orling Includes fixes for CVE-2022-3705 https://nvd.nist.gov/vuln/detail/CVE-2022-3705 For a short list of important changes, see: https://www.arp242.net/vimlog/ Signed-off-by: Tim Orling Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f6d917bd0f8810b5ed8d403ad25d59cda2fc9574) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 0710f6afbf..298a111853 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".0614" -SRCREV = "ef976323e770315b5fca544efb6b2faa25674d15" +PV .= ".0820" +SRCREV = "03d6e6f42b0deeb02d52c8a48c14abe431370c1c" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Nov 4 03:00:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14781 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 9B4BAC43219 for ; Fri, 4 Nov 2022 03:01:47 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web08.7203.1667530903347625408 for ; Thu, 03 Nov 2022 20:01:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=e9DE7sXr; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id d13-20020a17090a3b0d00b00213519dfe4aso3550471pjc.2 for ; Thu, 03 Nov 2022 20:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dh7P+Kvs7DNNS+nsi7wNd6C96KTJW9bnqpNH2SKqyH0=; b=e9DE7sXrMdB3TAi6+v92sNGfx6PaxNCEqjX0kiU0IIFPodGh6yVd9efyz1anOhL+zO Vzqwqjqk3eS2jakuh1XNw8vYltAfExALvumdsr5P0BGF/F9Iywumq8FUk015ue1N1zFN NYjStHfsSjF0z1Pm6b1CGkW0Ts5+2anYV2gaz5SWD6sfEy6kM/nd4SGcg4OC+3zUL9uO 1JLQWLs8J4FNpSb345eePuhggyFV9y8w77y3p7mo3YC/7ubdBqTvx64F4MiZyAoAx7qv Olhom1Od7yxww9Dk5jVeLaoDsboJKPEWvIJ2YO6Yx98cBStn/nChttxe4tV0TayFizUF OpOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dh7P+Kvs7DNNS+nsi7wNd6C96KTJW9bnqpNH2SKqyH0=; b=ypMKeoNUcckNWpUd6+Rt7sAl8ITle/C/vIYWUwsuJgkd4wMSv/o3tXynmghpFuin9U J4C90M0DiaQge591VPLZpL++49y1CATVZgzkQ9zX/gBE/BuCeyiK7t3D/M3Dpji2i5Pk SlLJjPVjWAfh1zXaEgSOR7w6YbXR2aGaWeJRi43B3x2/vso3bUqtJlYfqZt1Js1vxwCV pBsbjBG2PPtJEzuwb2bImNT16O2Ipi9M0+55jv1IbCz5Guxr/kf51NbTCzNsy+DjIa1C YQzIH2nfv20fZ3Ehc9HTk1/SUoTlWhL2mRcXw0f3U1hlWt6kGKua+fRxqbUhAC14oGwm 5tvA== X-Gm-Message-State: ACrzQf3dPL9aZROb8jaNjjHK50etkIG5F5HW1DvRVfoq7xvQ5OgxNfMo OJo4os6ByJk/bszu2VL8FFMFIaoBOgs5Uab9 X-Google-Smtp-Source: AMsMyM7wlLcJrf+9QPhV1wKhcARhzUyZt36aVem0GA3MqQ7pV1YoCCJ3jqHPLPV72XIruyoRv4gmww== X-Received: by 2002:a17:90a:cb8b:b0:211:7744:d155 with SMTP id a11-20020a17090acb8b00b002117744d155mr50843867pju.187.1667530902448; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/31] ifupdown: upgrade 0.8.37 -> 0.8.39 Date: Thu, 3 Nov 2022 17:00:47 -1000 Message-Id: <3dbfce9557e40c9a630337c9bf2ec129c02ed386.1667530733.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 ; Fri, 04 Nov 2022 03:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172673 From: wangmy Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit f0462e3336c7134aeeb2684692732c187971b330) Signed-off-by: Steve Sakoman --- .../ifupdown/{ifupdown_0.8.37.bb => ifupdown_0.8.39.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/ifupdown/{ifupdown_0.8.37.bb => ifupdown_0.8.39.bb} (97%) diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.37.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb similarity index 97% rename from meta/recipes-core/ifupdown/ifupdown_0.8.37.bb rename to meta/recipes-core/ifupdown/ifupdown_0.8.39.bb index 57d4152a39..7096bc94d7 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.37.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb @@ -16,7 +16,7 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=mast file://0001-ifupdown-skip-wrong-test-case.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " -SRCREV = "2b4138f36ce3ba37186aa01b502273e0c39ab518" +SRCREV = "be91dd267b4a8db502a6bbf5758563f7048b8078" S = "${WORKDIR}/git" From patchwork Fri Nov 4 03:00: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: 14776 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 8EE10C433FE for ; Fri, 4 Nov 2022 03:01:47 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web08.7204.1667530905248326411 for ; Thu, 03 Nov 2022 20:01:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SUb/8Gj5; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id 128so3323402pga.1 for ; Thu, 03 Nov 2022 20:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6q9xUFV0mSUDXrbIQfReNmIVVL6FKmKyRRynJJmhbLE=; b=SUb/8Gj5wkVGxwbjPuy/ey5yboUY0DjMhlbDacVvsHmhrq22kfoW9XUoNM1DehGN/R +dOHrAQc2hbaw4Za3jAn7Ow/+bJieBrZxff/K80n+nho959nrF4sQ5+6s7y9LBxxjjgZ 2af81sVrWZ9GRrl41Z566Uvdaicsf/H4s/RfBSEpY6KO8H12FPIZKAAcmNUC31nNEmfd f41A6Xe8keG7FR5iPa4d2XHeF1PD4SloIDrhGIcz+doP7CE9r/eLBolfuDQYS2MZ8UT8 RZFKyE6NPirGeEbBz2ZcGbqc0MyCuIv0lDZ6yJ9ihOxiNIg/iui++NHCKD6iztSQN5iA q2oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6q9xUFV0mSUDXrbIQfReNmIVVL6FKmKyRRynJJmhbLE=; b=MdLFyBhZkqDzITIvJtAGfZ+d8mOF0YTM9I1EXt2yJ9P7zRUW7q7yYrVfXUfVObVxUO YLxax56nHPgCSOx+zL5s7D0sqcU5IHIyO17gSwZm8/b4lEHEJJr5pcEyCDrTwiJ0Tt7s 3pkhJleyZNUsF4i01UW19rpUbQNc8NnjAZEOnSlAdk2QEXMDENNp00VPkZyT9MdNigqy UZ7C3xFJRM0aqaEcG8lMdcq9+CVGKY1qyKYssCgV3ID3eSogCTdJucfxTWVRWOOQS74Y 0Hj6O7Hw5cLN/L633Tn/ZIDKwSderKQNuZFoX9MDR5cFzBs9IFM0+HBnb/LoHQWZ4l4R k7zA== X-Gm-Message-State: ACrzQf3n20fWX5NjyXg5Lz/+hLkvxCBoEVdzlFx5oCouAz407nqQXMCp ExQbI8N69cAhsTVdJ7zOqPCDgMwWRL+d7zU8 X-Google-Smtp-Source: AMsMyM6tQ9aKyMYcnCJRLXHQZUR4Lb64pTkfKEH1C8PJrMu71dLoKG+wb8JH5pcv0zEtD4EMDm94cg== X-Received: by 2002:a63:464d:0:b0:441:5968:cd0e with SMTP id v13-20020a63464d000000b004415968cd0emr29760130pgk.595.1667530904259; Thu, 03 Nov 2022 20:01:44 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/31] scripts/oe-check-sstate: cleanup Date: Thu, 3 Nov 2022 17:00:48 -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 ; Fri, 04 Nov 2022 03:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172674 From: Ross Burton The scriptutils import isn't used, there's no need to run bitbake in a shell environment, and invoke bitbake as a list instead of a string. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 663aa284adf312eb5c8a471e5dbff2634e87897d) Signed-off-by: Steve Sakoman --- scripts/oe-check-sstate | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/oe-check-sstate b/scripts/oe-check-sstate index f4cc5869de..7f9f835da4 100755 --- a/scripts/oe-check-sstate +++ b/scripts/oe-check-sstate @@ -18,7 +18,6 @@ import re scripts_path = os.path.dirname(os.path.realpath(__file__)) lib_path = scripts_path + '/lib' sys.path = sys.path + [lib_path] -import scriptutils import scriptpath scriptpath.add_bitbake_lib_path() import argparse_oe @@ -51,11 +50,8 @@ def check(args): env['TMPDIR:forcevariable'] = tmpdir try: - output = subprocess.check_output( - 'bitbake -n %s' % ' '.join(args.target), - stderr=subprocess.STDOUT, - env=env, - shell=True) + cmd = ['bitbake', '--dry-run'] + args.target + output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, env=env) task_re = re.compile('NOTE: Running setscene task [0-9]+ of [0-9]+ \(([^)]+)\)') tasks = [] From patchwork Fri Nov 4 03:00: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: 14777 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 93835C43217 for ; Fri, 4 Nov 2022 03:01:47 +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.7183.1667530907099797209 for ; Thu, 03 Nov 2022 20:01:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=l1w/cBjO; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id gw22so3403426pjb.3 for ; Thu, 03 Nov 2022 20:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oTQr5umrNnr+M0hqjAL3yxgvB5FgDq8KzdyLKf6dxb8=; b=l1w/cBjOvowZi0z6EAN4A+lz4kUOLMIg8HtwUMUJkJrCo9A+glqdiAB5uco5CFMEVf 8I1GyirmWVQn7J3m36eskGvl1kQzTEMLZR62U2y8vIL/kOF826cgefTLQH/Wbiw2xein meSut+ZDCeLBqugvUBVFf7rsDoREzB+aVcDk2OIxJkp92e7S8A/PVM2DxH41RGzIFpCy PtLo7mM01Gfs1yZ8JcuQ8Dp8i2JtDUzQLLF6iCqvbirwJDalb4Es8uBnX6pvVVHNRu4T NI02GE2R9I61yKtP6jEaegBW4S7xpy0hyNC9aluC/Vf0scvIeJl17BVyYi/S8hwKKYz/ vnNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oTQr5umrNnr+M0hqjAL3yxgvB5FgDq8KzdyLKf6dxb8=; b=vTAacg5ybj3mhJpbvLc90Isr/kfUPl9XUz60Oo10UYGM+GErz/j8A/ZUScLcV5rK/4 SSjd4YaNrbHqoomoWkkdFIITRYhtiU0J+zrAdhMtUHRJs0RTXTE5Pydeg9hv7e/q/F7M XU9L4T89FFFsTV8+uQUnIGx4KANhy4UZESpfgMriYFfkMC68qOLDBLAV0o5a4MVF/aCn oBRFDQ62Bt9HJ7ATJHYQqRqTEQn94iAhOc0nSm9WbahMFDUkl3q0t5g+dCmd/+5jFEPA y1wGS5GiCmh15mG5PBXerqYwlD3GsYUjrh6VFwvIBNLtRh6XwJ4mfg7hVaXAoEYPT/5L DkUw== X-Gm-Message-State: ACrzQf2oXqH46Q2J8tgdWKAiItDdmqYeKSUAA91kBMQm7U/iewRqxSmM 9qYX8WY8DCgq0x06w6fiD5Wq5zBUOKZz1bGc X-Google-Smtp-Source: AMsMyM4IhKMzzRZbgPq+3BRare3cqb6oFjcWABgtYYl8OAYYYPjg2M3N4FIj5SmISkSbRSCaa/bL0g== X-Received: by 2002:a17:90a:1a44:b0:215:d520:f5a1 with SMTP id 4-20020a17090a1a4400b00215d520f5a1mr10096109pjl.182.1667530906169; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/31] scripts/oe-check-sstate: force build to run for all targets, specifically populate_sysroot Date: Thu, 3 Nov 2022 17:00:49 -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 ; Fri, 04 Nov 2022 03:01:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172675 From: Ross Burton Since the commit "populate_sdk_base/images: Drop use of 'meta' class and hence do_build dependencies"[1], builds of images or SDKs don't recursively depend on the top-level do_build target. This is typically a good thing: images just depend on the packages themselves and those dependencies already exist, but they don't need each recipes sysroot to be populated. However, eSDK generation is partly done via the script oe-check-sstate, which does a 'dry-run' build of the target and collates all of the sstate that is used. With this commit the sstate that is used is a fraction of what would be needed in the SDK, specifically there are no sysroots populated during the build, so there are no sysroots in the SDK. This is obviously a problem, as the entire point of an eSDK is to contain a sysroot. Resolve this problem by forcing bitbake to run the build task for all targets, so that all potentially needed sstate is collated. [YOCTO #14626] [1] https://github.com/openembedded/openembedded-core/commit/41d7f1aa2cc9ef5dba4db38435402d4c9c0a63e1 Tested-by: Andrej Valek Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 1b62344f919b5122f048b6409d09386d7d6dd3cd) Signed-off-by: Steve Sakoman --- scripts/oe-check-sstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-check-sstate b/scripts/oe-check-sstate index 7f9f835da4..4187e77458 100755 --- a/scripts/oe-check-sstate +++ b/scripts/oe-check-sstate @@ -50,7 +50,7 @@ def check(args): env['TMPDIR:forcevariable'] = tmpdir try: - cmd = ['bitbake', '--dry-run'] + args.target + cmd = ['bitbake', '--dry-run', '--runall=build'] + args.target output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, env=env) task_re = re.compile('NOTE: Running setscene task [0-9]+ of [0-9]+ \(([^)]+)\)') From patchwork Fri Nov 4 03:00: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: 14782 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 8F030C433FE for ; Fri, 4 Nov 2022 03:01:57 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web09.7184.1667530909029209279 for ; Thu, 03 Nov 2022 20:01:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=12l9VNaP; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id y4so3729596plb.2 for ; Thu, 03 Nov 2022 20:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=13mMlarCT89+FXhdb3+Pczr3UqiMcXQnbGhONwD72Jc=; b=12l9VNaPM3PWqPpH2baXX8gqQjmhiCzDsn7tJNWYaFWouDXzNnD6/1TUcUhNpmCbbJ uHB4Ku1i/2BKVFA4+qaXvaS4cWT17yYnGehzDAMIA7K3fhqVSSuf1/eIHF98iMfttgS5 UoPUWucQYEbouUi+VqoOZmfN+AjXXByqGVHqOwC80s/TzXK6xof1DccX62EppPaZTSkB vOq1vDOMnrGRlz8lSMFSEPvt/wTtk1kJ0L96oGl29ebzxcS8HUW9PmsfC1J99C+1JbNc F37wMbkXhntZjSl5ZjzJWl1GfKN/J6nRd4nuRazbb2EH5fFXsRaCnJgzSlGBx+Fhl489 BUsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=13mMlarCT89+FXhdb3+Pczr3UqiMcXQnbGhONwD72Jc=; b=H9ZHlEKJtqaFZyUe1crQKAKenSLDO08JEsZpTUzBTw86SFb22BSf3C8NoYW7BGdd9y o/OppxwsusoABXfI4cwoBVCuTEaMN/FJ8RunTYYAGhggo+G+roifmtwahwvf4wYoBZlW 6k6TqJtPop8DRWOoE+YYqW60ybEAqA6SfcG662t6eiQWQJ08304H6M77wJ77zAOYswDb 7cjQreRDqjs1ddZG/4WoimZPQwIdYubxCaOb6iHOfJ4LRsD1WRnv+w6VujT87utB74Pl 97vIr0xMVJlpqeYbfSjzBZOeNKWuJ7BzJ9t4O3NDjlhtJeHS4aPLX68UKkWV6Ci7gEhd X5QQ== X-Gm-Message-State: ACrzQf3PxIjWxnOqazNiXbX4Px0sYcVSxGBZAaFmQUu/be0qVx5t0867 jh0qCbA5EGaH+Aoe6RIpxQnIwFpW+m+ZZpxS X-Google-Smtp-Source: AMsMyM7oeABxsjgqvsnX/v1p/AwvusjqtghLkut6HTAFnClB3iTVN5RSEJiHQaaF23MSQxtO3jhy7g== X-Received: by 2002:a17:90a:f507:b0:211:e623:da5b with SMTP id cs7-20020a17090af50700b00211e623da5bmr52630250pjb.37.1667530908106; Thu, 03 Nov 2022 20:01:48 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/31] psplash: add psplash-default in rdepends Date: Thu, 3 Nov 2022 17:00:50 -1000 Message-Id: <358a9528a633de9e0e89225fd935b2a7dacf1652.1667530733.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 ; Fri, 04 Nov 2022 03:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172676 From: Thomas Perrot Otherwise when the installation of recommended packages is prevented (NO_RECOMMENDATIONS = "1"), then splash screen will not be cast. Signed-off-by: Thomas Perrot Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2a0928532b8303858980d6df6271669dbb69e224) Signed-off-by: Steve Sakoman --- meta/recipes-core/psplash/psplash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index edc0ac1d89..9532ed1534 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -58,7 +58,7 @@ python __anonymous() { d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % p) d.appendVar("RDEPENDS:%s" % ep, " %s" % pn) if p == "psplash-default": - d.appendVar("RRECOMMENDS:%s" % pn, " %s" % ep) + d.appendVar("RDEPENDS:%s" % pn, " %s" % ep) } S = "${WORKDIR}/git" From patchwork Fri Nov 4 03:00: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: 14786 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 BE4D4C43219 for ; Fri, 4 Nov 2022 03:01:57 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.7190.1667530910969347622 for ; Thu, 03 Nov 2022 20:01:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gFNUpbLj; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id f5-20020a17090a4a8500b002131bb59d61so6665817pjh.1 for ; Thu, 03 Nov 2022 20:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ySZ833MMlgVqGc6WNu6YL2ro9jlPh9nmk3gNMclbV7Q=; b=gFNUpbLjyZOEEAi5An4B+Oi9d7Ag7z13osItxmwRqY61W4hAv4uNGiT7zY/OcxqB2w tQV3tnanbllxrDy6o7g5FSKohxKG5cyS26axzv6jGIMQCJGaFuAfNiiqvIV3BB6egCKz YHdRZLoYHSaRv/PsR8ebAjU49Hbifs5x+9rNlG02M5z2txTEnzhHa91n4F5/fldBEOtt REwXr6P7DrXAPJxSTBF14bI0bSAdMfKfC9i3uJWHnmuioJbzk1aLNInlntTtIPUMiSw/ DOwRQhreOl/bhn+jij5d77x+TMweFn3dh2JutldhtwyQlJeYbLZXIYJ1NgKqepXMfmP6 CQgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ySZ833MMlgVqGc6WNu6YL2ro9jlPh9nmk3gNMclbV7Q=; b=eYGkVvLWPlanb4B13oUec8Xb3tKWVILL31JG9YiDvC/yCD4UPISGXbv6lU997IYmc3 tYRTiEif+HBgIW3sUeFN8qQ4Y5xxBJZXOIJ8Uvt2M3rAW4KHpqDe9WGkRuWR/L5yEg+i AqPhCvCWdIVVAaM49CTPli63F9jluvSClunYogQ9NgRllZSZvrA1vRU/Qsrc7c7KNqSd Nrmub+XuR8rNeLJ4PktZV23eN8cHsPXRjbpYueq0ilJAkghjyeK7v4Xz7QbRPnuBthgT 5vpcbaW514bueP6IQPCLCy9A0RSzKmL7NvJThHXreMbNYxmP8DwvEvrGpHJMevI8Xt1d oqDA== X-Gm-Message-State: ACrzQf1Nma8+gsx9NELOEwYzURfziY0FhZaqk3lkMBj5U4v/SasIJ2G1 djwqsr9iyF7uFVzFAn2WdJiZZ+DyAsJ27DIu X-Google-Smtp-Source: AMsMyM7Rj/1MoPTnP1y6xUQqMp1Zr1l9sIJToW1q0HfCOHpkWDUTh885xd9W8bbrCFHOEFf8PTnK/A== X-Received: by 2002:a17:90a:1657:b0:213:7c4d:768a with SMTP id x23-20020a17090a165700b002137c4d768amr43505787pje.199.1667530910045; Thu, 03 Nov 2022 20:01:50 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/31] opkg-utils: use a git clone, not a dynamic snapshot Date: Thu, 3 Nov 2022 17:00:51 -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 ; Fri, 04 Nov 2022 03:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172677 From: Ross Burton opkg-utils fetches using a cgit snapshot of a tag, which is not reproducible as the tag could move, not reliable as a future dynamic snapshot could have a different checksum, and a waste of CPU load as these tarballs are built on demand. Switch opkg-utils to use a proper git clone of the relevant SHA. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit dafd2631a20ffd94e6f21c46938a010e92b57da4) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb index e72c171b92..b27e3ded33 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb @@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" -SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ +SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ file://0001-update-alternatives-correctly-match-priority.patch \ " -UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" +SRCREV = "9239541f14a2529b9d01c0a253ab11afa2822dab" -SRC_URI[sha256sum] = "55733c0f8ffde2bb4f9593cfd66a1f68e6a2f814e8e62f6fd78472911c818c32" +S = "${WORKDIR}/git" TARGET_CC_ARCH += "${LDFLAGS}" From patchwork Fri Nov 4 03:00: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: 14784 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 9AFDDC4321E for ; Fri, 4 Nov 2022 03:01:57 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web09.7185.1667530912783221368 for ; Thu, 03 Nov 2022 20:01:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iQ89r2bg; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id g24so3729966plq.3 for ; Thu, 03 Nov 2022 20:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DmNAz8zOH9ZD78RDX5/Pfwxdn7HuUdEuDtsNpv040QI=; b=iQ89r2bgusUcPD05WtwIOT1MIgSW5ZBud2YTTaP034lmOQIQlV/BvkzQ5kmTEyhZDC E4g3uWtjqLD5t5RpeKulcPQOHAaPRcN0CfnvHtsn4UwHr+KNscS/bgzjH0zrosg7zm3n xMfOqEDZck11JkcduCgkrBWDr6DXrvVUPteQ3AyYQxirM0zIKQRKoxEC7eNwVcZsqzZ+ IHrA5x2e6JKkjuaDjSAq2Wt9UssQdyD72C4WFwtK2Cngk1qmHbCCerFJoTwm4WOu/SSA 0F2fmXzNSrlVIyYyooec88Bl2iGRBFdvH77K096zILVXTgrDbKci4EjH7kyxLPE/DSsJ PafA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DmNAz8zOH9ZD78RDX5/Pfwxdn7HuUdEuDtsNpv040QI=; b=zBHtukE6NatOGudttgKNt1ygTZPVYX0TN4suaeHQXR7c/XwOMVSmgQR6QzphfjbbFZ OMwuffyil9ayr7dqdCpOLsosja7GjPF6qbUCb4k5oSG20g0mmwQy/hACqK5zTd4a+lo4 0AHrdy7tt78NQZ20080JPT65DQ3WwpvZxYcUmZgruyTKmjKI/Dd7+C+xU3jEzl7VJotm Wieh+xobf9H6vr3dRZFe8XU0IU54M8Nmu06hfRoybZbAkGrr064byzEJ3LIwPmChSYHb u7ba0uruhTP+2T5WqMRHJ5silvILM21djTuaIeRRT8/teraOJVKIUHAfLPZSJPD7NjfE pcUg== X-Gm-Message-State: ACrzQf1Voz6cqIzZ8fv9+iJ49GeuXJuemQg8WsRyB9/1tF7wMmYqh/RH ZR2Rw1ccuiPmPY7Q84ndaBfsEHR6OwyPAq57 X-Google-Smtp-Source: AMsMyM7o3eNvzXvOyZeQ+mO1dfx816OOAljEoGaxIgnnh3o6NPpAAfRvCbP5h7a861TrIs7rf6vS4Q== X-Received: by 2002:a17:90b:3b88:b0:213:1849:ea33 with SMTP id pc8-20020a17090b3b8800b002131849ea33mr52582251pjb.78.1667530911903; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/31] insane.bbclass: Allow hashlib version that only accepts on parameter Date: Thu, 3 Nov 2022 17:00:52 -1000 Message-Id: <4b847bc337fe9e800168851e7fedf8d8972d40c5.1667530733.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 ; Fri, 04 Nov 2022 03:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172678 From: Mark Hatle Some versions of hashlib don't appear to implement the second FIPS related argument. Detect this and support both versions. Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2bbabed51e3aca138486d3feef640f5d3249be40) Signed-off-by: Steve Sakoman --- meta/classes/insane.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 0d93d50e58..dfda70bad6 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -552,7 +552,10 @@ python populate_lic_qa_checksum() { import hashlib lineno = 0 license = [] - m = hashlib.new('MD5', usedforsecurity=False) + try: + m = hashlib.new('MD5', usedforsecurity=False) + except TypeError: + m = hashlib.new('MD5') for line in f: lineno += 1 if (lineno >= beginline): From patchwork Fri Nov 4 03:00: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: 14785 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 979FEC4332F for ; Fri, 4 Nov 2022 03:01:57 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.7183.1667530892267218729 for ; Thu, 03 Nov 2022 20:01:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3b9tDV1k; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id io19so3709862plb.8 for ; Thu, 03 Nov 2022 20:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YIy+fVNOZRPSX2QTvqZvgM0UAdmsrNPVaF33Vsu7dtM=; b=3b9tDV1kyybT/sIJhDq5HKCughkuN+OXBMSMAAa44YYy5CipiDsxS+I8AHBx8p6xnD HhsL4NkFAO7NdMn+XrnJUop/g7/9WQVLZGcMrKGEOlyrgFx/+WYdYLB9mK5XyrQUK5Ey d5DoqPmgM1ZCkAJmC0tRYSHM/WyOO+qyB78nKIqgFtljGyMMoAXOVNlbKVaIw60A86f9 nxK3h4B5yABngS3xGEWrNyTKzBJ0U2jNyveSLRQQNFiWXoZqdzgvI4vTUGkaxunLbmZ6 eHicnyUG+lFlJe0FWidoKgfBp0YNNdPe0GbKi15Y6iSkny8xWmzg/dxH/jekFWM0cQTm /8QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YIy+fVNOZRPSX2QTvqZvgM0UAdmsrNPVaF33Vsu7dtM=; b=wNthNPlVD7il8LJGYxla4wQj2SRKwro96NdbWCAB4xlfNVR/odz1Cj00GanGRbFu+0 U2MXzcWFgePJB2RU1yvcXuIGowK2YcVRPZfpz3VbyHgEUrM3ZUP+BLpKW5mcEX47lg4T XVpOMGR7zRu9LpJTbJYYqJGKoD8lNKPP1HsmkqzfF5RZuX7rNF62OvWXfnRQTxIo95rD m0BoMbXKjFpL66zsHz9XR4c/t3V5aH/kKrxkGjXDGaIiZ2DerOLRlKzjy5HDQUCNTbwU 2P7SN/PH9kPcDUWCK+4J3wBYCQzSCvokcKfKsETexa07Bs0wxEuv0628wXxhrykLPe82 nW/w== X-Gm-Message-State: ACrzQf0bY1rVUyucGecud8BYq8rd0xLfOkVjKSOBcwxOkQ+9SG1wqhjv 3/fAY/rBB28pJZqwSh24RtI25/qcLhFwpc66 X-Google-Smtp-Source: AMsMyM7f7EkHbiNxtDuinqWNJ7ju62PsYL09xYUwk7TZjSns2pZ0YJBPHTArCycDToFvvHsV8mti8g== X-Received: by 2002:a17:90a:458b:b0:215:e103:e943 with SMTP id v11-20020a17090a458b00b00215e103e943mr7121609pjg.146.1667530913898; Thu, 03 Nov 2022 20:01:53 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/31] oe/packagemanager/rpm: don't leak file objects Date: Thu, 3 Nov 2022 17:00:53 -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 ; Fri, 04 Nov 2022 03:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172679 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 28706c27680745c9f8df27713ce63ef5d611138c) Signed-off-by: Steve Sakoman --- meta/lib/oe/package_manager/rpm/__init__.py | 33 +++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py index b392581069..97ef387f3b 100644 --- a/meta/lib/oe/package_manager/rpm/__init__.py +++ b/meta/lib/oe/package_manager/rpm/__init__.py @@ -96,11 +96,15 @@ class RpmPM(PackageManager): archs = ["sdk_provides_dummy_target"] + archs confdir = "%s/%s" %(self.target_rootfs, "etc/dnf/vars/") bb.utils.mkdirhier(confdir) - open(confdir + "arch", 'w').write(":".join(archs)) + with open(confdir + "arch", 'w') as f: + f.write(":".join(archs)) + distro_codename = self.d.getVar('DISTRO_CODENAME') - open(confdir + "releasever", 'w').write(distro_codename if distro_codename is not None else '') + with open(confdir + "releasever", 'w') as f: + f.write(distro_codename if distro_codename is not None else '') - open(oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), 'w').write("") + with open(oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), 'w') as f: + f.write("") def _configure_rpm(self): @@ -110,14 +114,17 @@ class RpmPM(PackageManager): platformconfdir = "%s/%s" %(self.target_rootfs, "etc/rpm/") rpmrcconfdir = "%s/%s" %(self.target_rootfs, "etc/") bb.utils.mkdirhier(platformconfdir) - open(platformconfdir + "platform", 'w').write("%s-pc-linux" % self.primary_arch) + with open(platformconfdir + "platform", 'w') as f: + f.write("%s-pc-linux" % self.primary_arch) with open(rpmrcconfdir + "rpmrc", 'w') as f: f.write("arch_compat: %s: %s\n" % (self.primary_arch, self.archs if len(self.archs) > 0 else self.primary_arch)) f.write("buildarch_compat: %s: noarch\n" % self.primary_arch) - open(platformconfdir + "macros", 'w').write("%_transaction_color 7\n") + with open(platformconfdir + "macros", 'w') as f: + f.write("%_transaction_color 7\n") if self.d.getVar('RPM_PREFER_ELF_ARCH'): - open(platformconfdir + "macros", 'a').write("%%_prefer_color %s" % (self.d.getVar('RPM_PREFER_ELF_ARCH'))) + with open(platformconfdir + "macros", 'a') as f: + f.write("%%_prefer_color %s" % (self.d.getVar('RPM_PREFER_ELF_ARCH'))) if self.d.getVar('RPM_SIGN_PACKAGES') == '1': signer = get_signer(self.d, self.d.getVar('RPM_GPG_BACKEND')) @@ -164,13 +171,13 @@ class RpmPM(PackageManager): repo_uri = uri + "/" + arch repo_id = "oe-remote-repo" + "-".join(urlparse(repo_uri).path.split("/")) repo_name = "OE Remote Repo:" + " ".join(urlparse(repo_uri).path.split("/")) - open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_base + ".repo"), 'a').write( - "[%s]\nname=%s\nbaseurl=%s\n%s\n" % (repo_id, repo_name, repo_uri, gpg_opts)) + with open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_base + ".repo"), 'a') as f: + f.write("[%s]\nname=%s\nbaseurl=%s\n%s\n" % (repo_id, repo_name, repo_uri, gpg_opts)) else: repo_name = "OE Remote Repo:" + " ".join(urlparse(uri).path.split("/")) repo_uri = uri - open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_base + ".repo"), 'w').write( - "[%s]\nname=%s\nbaseurl=%s\n%s" % (repo_base, repo_name, repo_uri, gpg_opts)) + with open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_base + ".repo"), 'w') as f: + f.write("[%s]\nname=%s\nbaseurl=%s\n%s" % (repo_base, repo_name, repo_uri, gpg_opts)) def _prepare_pkg_transaction(self): os.environ['D'] = self.target_rootfs @@ -329,7 +336,8 @@ class RpmPM(PackageManager): return e.output.decode("utf-8") def dump_install_solution(self, pkgs): - open(self.solution_manifest, 'w').write(" ".join(pkgs)) + with open(self.solution_manifest, 'w') as f: + f.write(" ".join(pkgs)) return pkgs def load_old_install_solution(self): @@ -363,7 +371,8 @@ class RpmPM(PackageManager): bb.utils.mkdirhier(target_path) num = self._script_num_prefix(target_path) saved_script_name = oe.path.join(target_path, "%d-%s" % (num, pkg)) - open(saved_script_name, 'w').write(output) + with open(saved_script_name, 'w') as f: + f.write(output) os.chmod(saved_script_name, 0o755) def _handle_intercept_failure(self, registered_pkgs): From patchwork Fri Nov 4 03:00: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: 14783 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 97AACC43217 for ; Fri, 4 Nov 2022 03:01:57 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web10.7193.1667530916922620662 for ; Thu, 03 Nov 2022 20:01:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gOLqB0tu; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id h14so3397375pjv.4 for ; Thu, 03 Nov 2022 20:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6A5BhTI29zIvXWvcPgzOQ7MwB1c65Ylqr5S89UZVcoY=; b=gOLqB0tuRxr65++/rE9sBKjtw/MF9XzUWXFyA6KsSMZMIV2ZdrrWi+rIKY9veV+/Oq iUOiXqGkkHpaT7AjwhAMxUoDFH444Afoif72G/tZ3thOJrsvovWNtCM7ft2hgXwIvTB+ Ljh+vji2eIBqaiYNIRfxbUM5LvLO2wNxm94XdBYb96MK505v4s8iIYfpWx3r/i6/3vNV KMJuX+TCnr+OdD/s80L9TqoXeg9avk8v9sIdp1fp/e8kLy3M22xSaFSTUdqW3dhEIQrR L/Kw92Y/DT4DLwghjO5TIcbr+Dh4yAxuKaAE5rq0m28/nxSIIfS42NK8tIIBaPuO3yDd agSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6A5BhTI29zIvXWvcPgzOQ7MwB1c65Ylqr5S89UZVcoY=; b=Q1PlpmmVflOK2A0jHjBX+PDtiJZzprQEZajsk7JUsAb42sM7fqvVB40lblFj1a7tNz Wvimb2xdRXXYYY7HHiE4OQkF4sfgia2lWY5ylqAaUE3Lg1tbU2zbu2NlamFVHHpbFdsk J4C6zeC64wW45pC/PbEBpfMkcPxEzyQXzazf+LdoEOQClu0rb5CNqfhTWJ2z2ijtixk7 oNmC0YwNHFCRrPdqTS0TXN8BZb6ywQr8gTeH6uBCQCSkNG7zqQyT2RmJthH1yoIRNaj0 TS0tz/GAYQZ9GTh9sLIkCU7UhcoQ6kECBpO+lkkD317fouFnoGK2p/BkuHk8hMaiErqu MeNg== X-Gm-Message-State: ACrzQf2Ikv4x2hc3CEBMDZxorbFaPXzu0DlXQQtauyaO8rTXTyjfZICZ eZ6sB0fhQHI6253eVsNjigQMTF57SoHbNun0 X-Google-Smtp-Source: AMsMyM48yUIVUAakAuiZbtTXwiCGyIwdMa+xd6Lg3Vpk6suot0ewPqDIxQkJUNpUxGcdTRtng7Y09w== X-Received: by 2002:a17:903:11c7:b0:178:af17:e93e with SMTP id q7-20020a17090311c700b00178af17e93emr32925279plh.78.1667530916000; Thu, 03 Nov 2022 20:01: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/31] u-boot: Remove duplicate inherit of cml1 Date: Thu, 3 Nov 2022 17:00: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 ; Fri, 04 Nov 2022 03:01:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172680 From: Alex Kiernan Splitting u-boot-configure.inc out of the base left duplicate cml1.bbclass in the base include. Fixes: fc9a17ad386c ("u-boot: Split do_configure logic into separate file") Signed-off-by: Alex Kiernan Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 286f91f7659307bcdf0ba541b8d6b56db5604ceb) Signed-off-by: Steve Sakoman --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f022aed732..b2f33e3826 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}" -inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch +inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch DEPENDS += "swig-native" From patchwork Fri Nov 4 03:00: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: 14788 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 919CDC43217 for ; Fri, 4 Nov 2022 03:02:07 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web10.7194.1667530918792572195 for ; Thu, 03 Nov 2022 20:01:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iTTpzjgA; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id e129so3300534pgc.9 for ; Thu, 03 Nov 2022 20:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0Yn+A3ocZCkSSiNfExAD1/bKvrcPRtn7JeuuGGphWhc=; b=iTTpzjgAEEb9foE0LRWcem1xkfYMLUiyG3u4SXHsLCY1GtuO0CsvG63lp5vh61mmwC BzUcqeyEBfC3KDiHiSL95OXy3Yv5QfI6Jbo6PGAZmR8O//f5kEdHia2Ds2RaD3JskAjf ylSaxf90rug9hAjeTZwYdTYhYHJK3zPe+th7Qi4RJ2SeBFEvde+TWkrM2TfTa4H356xF 7LvfdzHr/OzVA8i6fkSCCPBuD5J94LlrYUQlxE5IpQRdUyS+5b/UwtJeQGxAIiOzuLL7 iZE9teOxVWnyNFDTSLuzCEYDHS8InS1hWwhuJL1+2J8WRx3CZVq0PnEHDouPSGSZMKiS ZEWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Yn+A3ocZCkSSiNfExAD1/bKvrcPRtn7JeuuGGphWhc=; b=kgL4wUvFMlgbmGhvoXDtOqpQ5sPawjeJCUZ0jlzSKz3CFyyVsXyZfsLQXjZCMsXFlz oIubwuaODC2MfdsRevL17xobZ8uyCy7FoB/6DlanZFnfA4DVh6iGxnofOzp3PF8+RehW ngNgkfvc5LchcbgyxKtK+6CG+umVUMOqMD9xTIIDHwKUIOJ9mssfW7MBv2wlicPVUEO1 woRveT9ueRNAOCtOdCTm22moPTOeAOecSzeYen00i21ATQ37TVqZU9U/yD/1AQbsJKYe p3q23POxcmVtSdVeoJe0csY/0fUt535YckdZwIUS4jBIqzRst1auj58AqYbuupI/Sv8U aHXA== X-Gm-Message-State: ACrzQf1qgLA58D/35gJPapyX5pVeEckWnQP4mWUR5DyvO4EiH4jGjzZo ccLms9nOh6uPzKE2RrqKfWreOISo8E8pF+Mq X-Google-Smtp-Source: AMsMyM6UmbHdNI+DM2fb7x1+1klrUAgG/oEJW1iXes03CqimTYrOh9Tl4g/G6IPq6z5ibEuRfo1VZQ== X-Received: by 2002:a65:6bca:0:b0:46f:5de2:30d4 with SMTP id e10-20020a656bca000000b0046f5de230d4mr28976182pgw.323.1667530917955; Thu, 03 Nov 2022 20:01:57 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/31] bluez5: add dbus to RDEPENDS Date: Thu, 3 Nov 2022 17:00:55 -1000 Message-Id: <93c8639bfe47242760b8b8a760e7cff360dd9001.1667530733.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 ; Fri, 04 Nov 2022 03:02:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172681 From: Bartosz Golaszewski Unless we're using systemd, dbus is not pulled into the system automatically. Bluez5 will not work without dbus so add it to RDEPENDS explicitly. Signed-off-by: Bartosz Golaszewski Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 377ef7009a8638efe688b6b61f67ae399eb1f23d) Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 79d4645ca8..f07e318897 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" DEPENDS = "dbus glib-2.0" +RDEPENDS:${PN} += "dbus" PROVIDES += "bluez-hcidump" RPROVIDES:${PN} += "bluez-hcidump" From patchwork Fri Nov 4 03:00: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: 14790 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 9EACEC4167B for ; Fri, 4 Nov 2022 03:02:07 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web12.7134.1667530920860211456 for ; Thu, 03 Nov 2022 20:02:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1OcsI/E9; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id b5so3308078pgb.6 for ; Thu, 03 Nov 2022 20:02:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dE8+V/o7V2iglwJ0ZEZBMWOR9YJvU/y95VmbSc3miBM=; b=1OcsI/E9CHylgOdC8s4sn8YZvnaTKNzrBEYagv9BCWLO+wIp2sP9Spw1n+HVXoLWBj ebBpOU1eeoZdPTP6n9OVqBJK2YuNFiNWQ3D4sdlYdifunGF4BweRu5oSyb7K5R3DprNb NUMk7Q4NbIvp18TEyTXdhZkjetW7CnUrp+czs/b8CY30exHDClqoP1JzZ0jX6fDybQsf stYFNaMgnnGxistDf2xftUvvnN4fpFe9EXQQDev7FUdD5u/jOaPd+5NPJESs1QtwyAiF z+rkl91zsRGydl+LTlroas+YOAiKPgWqu/izrzZ+6UO2SR33jtzf6TsWlV+uKBlA3zd4 bQ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dE8+V/o7V2iglwJ0ZEZBMWOR9YJvU/y95VmbSc3miBM=; b=eyyARoty4mxl2bJKStYYETjQb+paoVjVZuL0FdQOivKXcx2ek81/NzN3Iv84i7xayn M1tyvV0x2WY2KvCskm6Abz2bktzhQNUdn5xqThQSM5tOIy+WZDDQRFzqeBBoW9cBzfzP GM5g4u6kVaBnI3UvyxNpBRop9+62UNkpWR7yK3Zc+v+TumZid2vaUgHdb5RIFT3HJBCX ezAQv21Q5m4au3571XukCG+/uGTwecUAV3CBDv6HLL6q+1SP/joFXryfXtUMhbm+1JUr jKvuw1/khJR0s2SqWEMAuH02ohWLuBT4L8dM0pdUOtNnG3oLulBDLOwadw+MXfq4JAGb 1OjA== X-Gm-Message-State: ACrzQf0c9sZh2L44CR/ahCDjZ1JmtYBDBNfPB4BDhnaBf1pTejBJz9vy nOvULHmhoHWVDZaEl1Z31912uZLBo7/t+MP2 X-Google-Smtp-Source: AMsMyM4zRjwq4g/K8yjekyrVFKgxDkbwoU8eCI5YEK6qlEk5WjktUCc4U4SIKBjwBAWeFv+1UgHcZw== X-Received: by 2002:a63:c04f:0:b0:46f:9f4a:593 with SMTP id z15-20020a63c04f000000b0046f9f4a0593mr23615268pgi.482.1667530919867; Thu, 03 Nov 2022 20:01:59 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.01.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:01:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/31] glib-2.0: fix rare GFileInfo test case failure Date: Thu, 3 Nov 2022 17:00: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 ; Fri, 04 Nov 2022 03:02:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172682 From: Ross Burton If a access or creation timestamp has 0 microseconds, then the test fails as it doesn't expect this to be a valid value. Expand a previous fix for modification times to cover these timestamps too. [ YOCTO #14373 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 15715e6ad81c97cd50e288f3745615eb19be90d1) Signed-off-by: Steve Sakoman --- ...-info-don-t-assume-million-in-one-ev.patch | 51 +++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch new file mode 100644 index 0000000000..c33fa88a76 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch @@ -0,0 +1,51 @@ +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2990] +Signed-off-by: Ross Burton + +From 14838522a706ebdcc3cdab661d4c368099fe3a4e Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 6 Jul 2021 19:26:03 +0100 +Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events + don't happen + +The access and creation time tests create a file, gets the time in +seconds, then gets the time in microseconds and assumes that the +difference between the two has to be above 0. + +As rare as this may be, it can happen: + +$ stat g-file-info-test-50A450 -c %y +2021-07-06 18:24:56.000000767 +0100 + +Change the test to simply assert that the difference not negative to +handle this case. + +This is the same fix as 289f8b, but that was just modification time. +--- + gio/tests/g-file-info.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c +index 59411c3a8..a213e4b92 100644 +--- a/gio/tests/g-file-info.c ++++ b/gio/tests/g-file-info.c +@@ -239,7 +239,7 @@ test_g_file_info_access_time (void) + g_assert_nonnull (dt_usecs); + + ts = g_date_time_difference (dt_usecs, dt); +- g_assert_cmpint (ts, >, 0); ++ g_assert_cmpint (ts, >=, 0); + g_assert_cmpint (ts, <, G_USEC_PER_SEC); + + /* Try round-tripping the access time. */ +@@ -316,7 +316,7 @@ test_g_file_info_creation_time (void) + g_assert_nonnull (dt_usecs); + + ts = g_date_time_difference (dt_usecs, dt); +- g_assert_cmpint (ts, >, 0); ++ g_assert_cmpint (ts, >=, 0); + g_assert_cmpint (ts, <, G_USEC_PER_SEC); + + /* Try round-tripping the creation time. */ +-- +2.34.1 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb index dd1ea508d2..b5ab6502a3 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ + file://0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" From patchwork Fri Nov 4 03:00: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: 14789 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 9AF0DC4321E for ; Fri, 4 Nov 2022 03:02:07 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.7162.1667530922595474511 for ; Thu, 03 Nov 2022 20:02:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=o1TEW57S; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id j12so3719803plj.5 for ; Thu, 03 Nov 2022 20:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PEZUUwQqgf+Fh8ZnHR6RTi7BS7g+CUvUW/UT9/rpC6c=; b=o1TEW57Sqm2hgi881EbwhCc2BSsGawd4o8Xgj/ISZhDbqrDlF/V5G0tzKDcyYb89+r 8X16RcvowGlZpEkPnsfDpfYn01MjJlS6y9oBYqhgo4Oa/wMpfkSdfnBrn/HoQeO3t6m0 Fayj56F0kFNycSP52zArXCbSV9/+h7TeCCG9mSV30+5JuQZKXKV/sI3qZisv3Yodqics ZpUgnPiUoxLQHpNgyQWVfuPs+UDINpkYw9dlNH3d8/n7G52ScI12dwQg63Z5cbjQj4WQ LNsNOLOfmcjX+wrgirwR5VQhlOLbwVUW5LdumlOOCVD9UrGWK/7tj1rM8xoutV8TFGvb Yp+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PEZUUwQqgf+Fh8ZnHR6RTi7BS7g+CUvUW/UT9/rpC6c=; b=A6BeKkRe2gO4NIThWq7TQb0Iymx9WA8ONVA6w/nhtqGHObCFS7gVgloXPpE7GsS63q 01u+ESB8koJdYOyNH8w4gGtCNzQuEnwLtkayME0xgTV8w2jFCBn+On1AlHPAofwkLav4 9ve3l7wO0gCvxgl+E4STMUjmpatULswp+3IxATMmoqjOTKAoMg0bmNnyZ43UuMnmsRmk 7mwL7+lGmY3yIec5oB3Y3ptET0aGY7x3Q094FazmigIOIiFZ+KTiYacd2otGKlAKNJvC N0ZR6Et66Jxn3BESQx2yOkP8UiYK7KwJ4+Oha5aG6XAjZtIQAPf0TAMZgTvyLBupBLjS Ii2w== X-Gm-Message-State: ACrzQf16qKLhnA2bJoN6jDi4nDT7zsc/RzaGwS8LxXEKm2IFa3IZUlra 6Jm+ZWGlDsTTrCEnKHpNAmU/UGvPbwCr+LuT X-Google-Smtp-Source: AMsMyM6x15mZCafpZfZyByLtaTaph7TPwTDuhUF3qgSvQt/8U67QA8rgVHNSi2G4d28LJ5B315PZUA== X-Received: by 2002:a17:90b:3b44:b0:213:34f7:facb with SMTP id ot4-20020a17090b3b4400b0021334f7facbmr52350829pjb.150.1667530921680; Thu, 03 Nov 2022 20:02: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/31] gnutls: Unified package names to lower-case Date: Thu, 3 Nov 2022 17:00: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 ; Fri, 04 Nov 2022 03:02:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172683 From: Keiya Nobuta create-spdx can't detect the license properly if the case doesn't match, so fix it. Signed-off-by: Keiya Nobuta Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 9c87828493784d996910d742006268a626ef0130) Signed-off-by: Steve Sakoman --- meta/recipes-support/gnutls/gnutls_3.7.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.7.4.bb b/meta/recipes-support/gnutls/gnutls_3.7.4.bb index 94e7f0d58e..fb06337efb 100644 --- a/meta/recipes-support/gnutls/gnutls_3.7.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.7.4.bb @@ -8,7 +8,7 @@ LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" LICENSE:${PN} = "LGPL-2.1-or-later" LICENSE:${PN}-xx = "LGPL-2.1-or-later" LICENSE:${PN}-bin = "GPL-3.0-or-later" -LICENSE:${PN}-OpenSSL = "GPL-3.0-or-later" +LICENSE:${PN}-openssl = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ From patchwork Fri Nov 4 03:00: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: 14787 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 91A0FC43219 for ; Fri, 4 Nov 2022 03:02:07 +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.web10.7197.1667530925117850979 for ; Thu, 03 Nov 2022 20:02:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Pl277rBH; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id l6so3433007pjj.0 for ; Thu, 03 Nov 2022 20:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A5c5QSo5R805eSJQxUUx6hmvmgmfAiDeBBj/XT2Qw1g=; b=Pl277rBHxuM0zYrQB4wVcWdlTzDwjUQhXp1erRDhyUQuGIzo42azBsoDwv+OQLQoS3 29+6L8ULD/UveuquSp6bNwgAKJtuGkIpsBxi4oVM9+MdninwoOfhKGTOh0E29EZbQ9oG 07mb0Q3ou6BbOkINZPUnPXHbhrYWFCGdMpFeSz/xpCH/Qu00JcZi7nvPM50gv6FgVJlp 5PJXsvdfXkJ5wg9D1nl1lM/W3XcpxSxckwTiajN1xECFYseZU0S2DaV7gp05x8vXgSHY BatyazY8YP3qH3r0l5Wb0QvBGwPUZyI/Qs3L/kzHNHwaUCCRQ6XKkKoTEXEuQNJyky9b tbUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A5c5QSo5R805eSJQxUUx6hmvmgmfAiDeBBj/XT2Qw1g=; b=OAjtXcl2N+zRPWsHBhJ5ns5og5UdlCK9yJP7M02rfGdKNtNtVw9U7po9VUAi0lwOYn aKqG0ht5r8hKF5CEK8zLjEzXUdtmI++lPxjdQrvJiUXNI8fSUphQ4ouIN6CmBuq90IDe hjEfCvGdVYqx+i/jmH9vTlof8r12lTVJHL6N6Apx2FY3AebSdDVdAYRtNPJDUaCVG+/4 qHXBb2PXdz+jB/dypgC4CFTXD17jMOZVuJtJB0esv8bVb94aeZyjyjFrfQ+tzUkFByyz 2kRA354dMY2uJTLLRPLN8XUbFngSdEPq3/y1p8Me0iTvQ7HjCX9kw36IkNhKfvEPCmbm PZKQ== X-Gm-Message-State: ACrzQf3pLPQ1Qt6cX7KOpmBC5yLzFnxUeVH9OczawJpJ3uMO80dgBj8L pQrMBeiCGGm0uZ6kOWjpCAtavQfsW4C315M3 X-Google-Smtp-Source: AMsMyM4/CtfNFin+vbdHQ206xlevBHBmOJwmQPDzKy1v+y2VySI4BqaKZV8xSC9kAYfNYqgsJOfORQ== X-Received: by 2002:a17:90a:8504:b0:212:c1f4:ddf1 with SMTP id l4-20020a17090a850400b00212c1f4ddf1mr35107083pjn.224.1667530924241; Thu, 03 Nov 2022 20:02:04 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/31] meson: make wrapper options sub-command specific Date: Thu, 3 Nov 2022 17:00:58 -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 ; Fri, 04 Nov 2022 03:02:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172684 From: Liam Beguin The meson-wrapper adds setup options to facilitate cross-compilation. The current options are exclusive to the setup sub-command and might cause issues with other sub-commands. Update the wrapper to make options sub-command specific. Signed-off-by: Liam Beguin Signed-off-by: Alexandre Belloni (cherry picked from commit 7bcda141f2019862b4fb5d8dec7956cd8344b420) Signed-off-by: Steve Sakoman --- .../meson/meson/meson-wrapper | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index 8fafaad975..b65ba8e803 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper @@ -5,7 +5,7 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then fi if [ -z "$SSL_CERT_DIR" ]; then - export SSL_CERT_DIR="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/" + export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/etc/ssl/certs/" fi # If these are set to a cross-compile path, meson will get confused and try to @@ -13,7 +13,20 @@ fi # config is already in meson.cross. unset CC CXX CPP LD AR NM STRIP +for arg in "$@"; do + case "$arg" in + -*) continue ;; + *) SUBCMD="$arg"; break ;; + esac +done + +if [ "$SUBCMD" = "setup" ] || [ -d "$SUBCMD" ]; then + MESON_SUB_OPTS=" \ + --cross-file="$OECORE_NATIVE_SYSROOT/usr/share/meson/${TARGET_PREFIX}meson.cross" \ + --native-file="$OECORE_NATIVE_SYSROOT/usr/share/meson/meson.native" \ + " +fi + exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ - --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \ - --native-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/meson.native" \ - "$@" + "$@" \ + $MESON_SUB_OPTS From patchwork Fri Nov 4 03:00: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: 14791 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 8E44DC4332F for ; Fri, 4 Nov 2022 03:02:07 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web09.7190.1667530927001650130 for ; Thu, 03 Nov 2022 20:02:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wGagDgTK; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id b21so3711744plc.9 for ; Thu, 03 Nov 2022 20:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Yl66SfF/cusOOkVDLRMtzjsJYtFh0mbZVVr2mJE2QZo=; b=wGagDgTKQ8p0bQ7yD5NsVCk6Gjq25DkQPedjFJV3s3YumPE0AXlb7YMhJ5vfp7MSHz 0ArM5fHv4VztbZ2On3An9GfFvPVSPG1HrFXB8Q4+j7S9L+KKphVD8xq848HUJoYF8v8x O5ZBEUrQ0ftYUjhjRb0xrYlO8I/+Cb3X/QmVz5w5Y2/Z8Dmqdo5W6J5dnEIDQGCrved1 kXXZWjVLoKEoWoYivJ5pdJjtx7Ep773weXsC8IYhMl6HYglWEx2LRq2D9xdfpt0Vy6x/ O/unW9rDKxApi7JK/j2FGBzMsOxAAt1C5dSd6L65jfZk58Q3OH8Apnpb2SkYOa5uyZ9i 4BWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Yl66SfF/cusOOkVDLRMtzjsJYtFh0mbZVVr2mJE2QZo=; b=01q4UmkRqGWi1JgwAx+EAmpnOKaXfOVBfqeUvXjrBtOp0gMRKmZatQmszFw9l6UZ+M +7++BQJ9c40L3X+7eORGBdkIhaivHVCjJHNE3XYC2nrgbSa/gMjIf3hJMjqpEZrXDVk0 4tLO7f+ocfbYLLwBVKu08f7u49jKqj3MsxoNki/boBLfCM5diJiVX7cT3sgHQ1cHvvB4 dITmg0pQS1GeBts4wAXyp9pJ2WvwM+N7tVx0tARvJS2ECcPPAZLqT4b3T5NBtuSVCVZB ThPV0kTqMwZwSVtTODqEfuGaPJakIg0cbYiDZgfsWbe5Tq57qXlYSxQVGsSCrGJ+0rKY yVkQ== X-Gm-Message-State: ACrzQf3ZF0NnggxIgG36a+uW7vTKcf3BzR86jZaKLAYCB3pMHkf2dxlW ANCXkIK3CtBCOcYDPOUzoOCB9iNnYidICSJJ X-Google-Smtp-Source: AMsMyM4j278p6Sdo4ErZiPJLdd+nCqLLsSWCoX/tqDJAxS6+R0CKnrg3AAiVNmrNMOuF1I6MKY/LNQ== X-Received: by 2002:a17:90b:384e:b0:213:7c41:1018 with SMTP id nl14-20020a17090b384e00b002137c411018mr35121716pjb.63.1667530926041; Thu, 03 Nov 2022 20:02: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:05 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/31] buildtools-tarball: export certificates to python and curl Date: Thu, 3 Nov 2022 17:00:59 -1000 Message-Id: <8785d335b1964909c139f1085d34bb19ed7666f7.1667530733.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 ; Fri, 04 Nov 2022 03:02:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172685 From: Jan-Simon Moeller The custom path of the ca-certificates.crt within the buildtools-tarball requires more environment variables to be exported. Namely REQUESTS_CA_BUNDLE for the python requests library and CURL_CA_BUNDLE for curl. Signed-off-by: Jan-Simon Moeller Signed-off-by: Luca Ceresoli (cherry picked from commit 5c249db9de8ad8cfe0996ff4fee4c575a5ff1e34) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 6b59e4934d..de399173ba 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -72,6 +72,8 @@ create_sdk_files:append () { if [ -e "${SDK_OUTPUT}${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt" ]; then echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script + echo 'export REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script + echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script fi toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} From patchwork Fri Nov 4 03:01: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: 14792 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 94203C4332F for ; Fri, 4 Nov 2022 03:02:17 +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.7163.1667530928800680102 for ; Thu, 03 Nov 2022 20:02:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=5cuj79qd; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id z5-20020a17090a8b8500b00210a3a2364fso6921222pjn.0 for ; Thu, 03 Nov 2022 20:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=d0K/JRd95ut1+dPVeYrDT2lGvuKp57vnidpoEFF4wcU=; b=5cuj79qdSuQUJIW2OxnvHvWPP8/7JaHI0TgeNxqQ4ED51cn2kKayVwBQfpj8s6SQX8 Tqyly1GokKpK5cEiL5Lww/bZMK2Q0oKHyoJTZTiSIiaeDkTPyCir/WP9KdeoNmEpH+eq 1k+9ssw/mW75bpQexkWLdWMeXMSqNARGG8GOAxpk4TYblkWGgWRpVPVuIZaekODWcm28 wXTyW9aQJBdhs0EMhGsMWz756olt8UxvXrA2gUKMxcJeXM7EnQtfZKbo6tVOKN0ioVnf +3TWADqWtmMxhMl0bjwzLpW0c98ExIfqLRzvrHuLKhcCsg1kF/SgffFas3uTc3RAbUg1 H55g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d0K/JRd95ut1+dPVeYrDT2lGvuKp57vnidpoEFF4wcU=; b=EStkhnjabI3VSUDhltFWA4LUXzIdviW7xNAkMDQ7SUkYBQf0EBCG4dAo/NwhZa1MoA Vx8LlENZTd67oFvtO4NER7pbWC9aHsPOlDh8Q+3NBvx/DBRPGYrVEzdIPGesSa682Cpx IujkfOLrQaJ+GOhA0f5kWJJMGake7jClhdqu+elBXq9qgvpbMv5Jhmyv9MIOwFHY8foH 6ulWQGElWq8y19EMhckwCqKTsakn45ZVkk7fYaEN3sfX18y19z8xxbDuPhenJA9IDnM3 4hkzdf2dj5GTFwGRDkjIsvBP0m8I7iHRaS+e84knBRvpxZDms1Y8bX6TIcF0XjyO3YRZ Nx4Q== X-Gm-Message-State: ACrzQf2rO00YCQkv/sWLyvLa9lBDUdXJKKkGKouGOVX7RfF9yrOCtVTw Ba7JLY3Q9Gngf55OGoOUqCkVePF+30d+Pejb X-Google-Smtp-Source: AMsMyM7mTiWfno5bLpnJkelPNrP/isN9jrJdbnPbwKEaKH9QqUCrnc0RO8pEac3D+VWoCvUeL/EjxQ== X-Received: by 2002:a17:90b:30c1:b0:213:a155:949c with SMTP id hi1-20020a17090b30c100b00213a155949cmr35074782pjb.76.1667530927882; Thu, 03 Nov 2022 20:02:07 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/31] qemu-native: Add PACKAGECONFIG option for jack Date: Thu, 3 Nov 2022 17:01:00 -1000 Message-Id: <105dc8fa3773f6efebb9e4f3cba37e49b58a0de6.1667530733.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 ; Fri, 04 Nov 2022 03:02:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172686 From: Jeremy Puhlman With libjack-devel or jack-audio-connection-kit-devel, qemu-native detects the library/header and tries to build with it. Since its missing from the sysroot, it fails to build. -O2 -fPIE -D_REENTRANT -Wno-undef -MD -MQ libcommon.fa.p/audio_jackaudio.c.o -MF libcommon.fa.p/audio_jackaudio.c.o.d -o libcommon.fa.p/audio_jackaudio.c.o -c ../qemu-6.2.0/audio/jackaudio.c | ../qemu-6.2.0/audio/jackaudio.c:34:10: fatal error: jack/jack.h: No such file or directory | 34 | #include | | ^~~~~~~~~~~~~ | compilation terminated. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Alexandre Belloni (cherry picked from commit 27260be388f7f9f324ff405e7d8e254925b4ae90) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 14feb4f1e0..19431ee6dd 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -261,6 +261,7 @@ PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma" PACKAGECONFIG[vde] = "--enable-vde,--disable-vde" PACKAGECONFIG[slirp] = "--enable-slirp=internal,--disable-slirp" PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," INSANE_SKIP:${PN} = "arch" From patchwork Fri Nov 4 03:01: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: 14796 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 A0BE3C4167B for ; Fri, 4 Nov 2022 03:02:17 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.7164.1667530930715216319 for ; Thu, 03 Nov 2022 20:02:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wOpBJkbH; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id k7so3718127pll.6 for ; Thu, 03 Nov 2022 20:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fnX+zrvFDLh+INMVPnYX+SB6DdwMqtXkgwC7wt+VCUU=; b=wOpBJkbHIf0Vg1eLyDHZkdKcuAJ6X8z4L1N+uEbU7C8WpIsBStrJti4gu6cU/LECVJ Z9B/TWTDb7lCQaoD1upIYqDKWxBIjmNxN6PfdbIsXaQJBJ8AHpItZOJvs8Bs5KKOT3Sk 2YdIX8yLJZMP8YqkGyCEJyPARYt03i97N/kzBRIyhzEV3aiTJvYv2whgCtOYeYB5z+5z dC7V42qVODBNCZBMb4EafFEbFyYMiOzqarvP9+0cWYKbrhB5/qMoWUqss9uQxYLgQ1zR iSXnw9mmo5kOR/HUpbNYZX8Z+941AfEX/tewAcyYTWHYANzSTz78OAxUT2BounAdt63Z 0WRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fnX+zrvFDLh+INMVPnYX+SB6DdwMqtXkgwC7wt+VCUU=; b=j8cmYeszNAYt4OENMoeumjVUKWfznBS2MoblVIyi4LVlIDmxKJB5Ag42sACCADi9p1 6zH4T0mNIkaLa4V4NTnAzJ7Mj08Y0RS4JYbSApGFNbfSy0S+gjK9nX5sx9Qhav5rMOox 7owsZuUDmv5DC0PpI9JpPuuAYY8URa9yyInLSNVIIcE//qYBo9uwb76KoT3W8LxF490/ GQY5b00TcqYcKaRQnQai9qPhoYIX6RDWv/OKBR1JMig0u0v2d7BPC+rGok7XHAM6/4py yDv2VQSqxZdztYujLipGu324Oa4LZR+Z9YLLNSWDFafrXzK5GKEFKuiSUv8NtjtKH0GZ AEmg== X-Gm-Message-State: ACrzQf27n3PwvAJFgueXI/7CPqcuiyOt5RtdQLbtDBI1QcfoDuEbXOhg j7k8/roQ0mIQK8LHSeCD7BhgC9KbBcUE6Lbf X-Google-Smtp-Source: AMsMyM5+k/E9s1J+FrzaM2VWG+yJ0PEJff7S6CHSYmKUUqo06n9Mwfwd21yS+FWcBnel5WAsoTafmA== X-Received: by 2002:a17:90a:8b93:b0:20a:bd84:5182 with SMTP id z19-20020a17090a8b9300b0020abd845182mr53510092pjn.161.1667530929627; Thu, 03 Nov 2022 20:02:09 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/31] runqemu: Do not perturb script environment Date: Thu, 3 Nov 2022 17:01:01 -1000 Message-Id: <5979bef7ef1822304b21e53471746600b15e7d70.1667530733.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 ; Fri, 04 Nov 2022 03:02:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172687 From: Joshua Watt Instead of changing the script environment to affect the child processes, make a copy of the environment with modifications and pass that to subprocess. Specifically, when dri rendering is enabled, LD_PRELOAD was being passed to all processes created by the script which resulted in other commands (e.g. stty) exiting with a failure like: /bin/sh: symbol lookup error: sysroots-uninative/x86_64-linux/lib/librt.so.1: undefined symbol: __libc_unwind_link_get, version GLIBC_PRIVATE Making a copy of the environment fixes this because the LD_PRELOAD is now only passed to qemu itself. Signed-off-by: Joshua Watt Signed-off-by: Alexandre Belloni (cherry picked from commit 2232599d330bd5f2a9e206b490196569ad855de8) Signed-off-by: Steve Sakoman --- scripts/runqemu | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 1525081ad5..1d63281382 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -210,6 +210,7 @@ class BaseConfig(object): self.mac_tap = "52:54:00:12:34:" self.mac_slirp = "52:54:00:12:35:" # pid of the actual qemu process + self.qemu_environ = os.environ.copy() self.qemupid = None # avoid cleanup twice self.cleaned = False @@ -449,18 +450,19 @@ class BaseConfig(object): # As runqemu can be run within bitbake (when using testimage, for example), # we need to ensure that we run host pkg-config, and that it does not # get mis-directed to native build paths set by bitbake. + env = os.environ.copy() try: - del os.environ['PKG_CONFIG_PATH'] - del os.environ['PKG_CONFIG_DIR'] - del os.environ['PKG_CONFIG_LIBDIR'] - del os.environ['PKG_CONFIG_SYSROOT_DIR'] + del env['PKG_CONFIG_PATH'] + del env['PKG_CONFIG_DIR'] + del env['PKG_CONFIG_LIBDIR'] + del env['PKG_CONFIG_SYSROOT_DIR'] except KeyError: pass try: - dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) + dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True, env=env) except subprocess.CalledProcessError as e: raise RunQemuError("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") - os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip() + self.qemu_environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip() # This preloads uninative libc pieces and therefore ensures that RPATH/RUNPATH # in host mesa drivers doesn't trick uninative into loading host libc. @@ -468,7 +470,7 @@ class BaseConfig(object): uninative_path = os.path.dirname(self.get("UNINATIVE_LOADER")) if os.path.exists(uninative_path): preload_paths = [os.path.join(uninative_path, i) for i in preload_items] - os.environ['LD_PRELOAD'] = " ".join(preload_paths) + self.qemu_environ['LD_PRELOAD'] = " ".join(preload_paths) def check_args(self): for debug in ("-d", "--debug"): @@ -482,8 +484,8 @@ class BaseConfig(object): sys.argv.remove(quiet) if 'gl' not in sys.argv[1:] and 'gl-es' not in sys.argv[1:]: - os.environ['SDL_RENDER_DRIVER'] = 'software' - os.environ['SDL_FRAMEBUFFER_ACCELERATION'] = 'false' + self.qemu_environ['SDL_RENDER_DRIVER'] = 'software' + self.qemu_environ['SDL_FRAMEBUFFER_ACCELERATION'] = 'false' unknown_arg = "" for arg in sys.argv[1:]: @@ -1369,7 +1371,7 @@ class BaseConfig(object): # need our font setup and show-cusor below so we need to see what qemu --help says # is supported so we can pass our correct config in. if not self.nographic and not self.sdl and not self.gtk and not self.publicvnc and not self.egl_headless == True: - output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True) + output = subprocess.check_output([self.qemu_bin, "--help"], universal_newlines=True, env=self.qemu_environ) if "-display gtk" in output: self.gtk = True elif "-display sdl" in output: @@ -1393,7 +1395,7 @@ class BaseConfig(object): if self.sdl == True: self.qemu_opt += 'sdl,' elif self.gtk == True: - os.environ['FONTCONFIG_PATH'] = '/etc/fonts' + self.qemu_environ['FONTCONFIG_PATH'] = '/etc/fonts' self.qemu_opt += 'gtk,' if self.gl == True: @@ -1509,7 +1511,7 @@ class BaseConfig(object): if len(self.portlocks): for descriptor in self.portlocks.values(): pass_fds.append(descriptor.fileno()) - process = subprocess.Popen(cmds, stderr=subprocess.PIPE, pass_fds=pass_fds) + process = subprocess.Popen(cmds, stderr=subprocess.PIPE, pass_fds=pass_fds, env=self.qemu_environ) self.qemupid = process.pid retcode = process.wait() if retcode: From patchwork Fri Nov 4 03:01: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: 14794 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 A0722C43219 for ; Fri, 4 Nov 2022 03:02:17 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web12.7137.1667530932474349484 for ; Thu, 03 Nov 2022 20:02:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=GkqZ3aHD; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id g129so3301216pgc.7 for ; Thu, 03 Nov 2022 20:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UzjnBIpXMH9mCcaD11XUV2ZBCzRgM0GYqdTxHBduhp4=; b=GkqZ3aHDmasqCxB6qhhnGLJc8Yg/xqx7mRqhytEsw8AfvQYN6noDhOrgBV10q6XD6h OAJKKVYddM/IK2Cn85bqsCBVp0u9Ae7ZLywKyUmbaB5jqaSOs0gPye5gYlbzejM6A1Et No14TFGaZygzoSezU+rLye9Cz9v0shQmaZ6RsdWsEYCvzt55fc55qJ5er/ye18JF3ln/ 0Ys/Mw/uKte2A8KALYQyaXam9OOALOKXpqqT6tsY791YDUiAlm4MWR+pvka1v7dIZRbX 6i3u9mrTzZXU8q+Xm946q0ONKANiO0z+nDYA8NGAJ4x1ACuKLaRhMWkaFdAruboiwgUj tAhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UzjnBIpXMH9mCcaD11XUV2ZBCzRgM0GYqdTxHBduhp4=; b=sf9fL/b9KHdE0l8ntatgy/3Jdljd1GGiUu+Xt34gKfhKvhC9hEcSNX72HGOypkx3JN 2trJ1sY8vMN5N7rsNzfsm1ddnKyeWplSL3NQ+1lLRL+/APp4CBOux8CNUPYsXVsBguq2 pqvXelTl9E0i1MTRLV9Qb7IaWlDlmgHjW+PqD3Nt8SfGPQcjIdRwAP0dH/unERQKFC9u EeWQSOv7OsVRlxLvB2xxOdo/U2Thc3YhH3cz5dkDvVhgXWRs2M2jEKrLL473zFx4SRk5 yvG1ZHehVb3qvXS/tpu6PuPq9dewyJ4fVlFeWVi//EXyVlyy7IIYRlAmiTMlJE13XkXW noDA== X-Gm-Message-State: ACrzQf1kFSXM/6MASU7hJjdUDjqzcy1g8VL2qAlvIz9IM6SkdJP6n7SS e9bsZeSMPT4KdOXlx5AK5r0LeiDuejvpTQIj X-Google-Smtp-Source: AMsMyM66vHbWnLm69u7C+Z/JfkWwQV0FDogIEshiWPGXCujZvRGixKbkyiXzzxAAoEBNBbE7JDh58g== X-Received: by 2002:a62:d412:0:b0:56c:6f25:8b12 with SMTP id a18-20020a62d412000000b0056c6f258b12mr33254124pfh.60.1667530931576; Thu, 03 Nov 2022 20:02: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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 27/31] runqemu: Fix gl-es argument from causing other arguments to be ignored Date: Thu, 3 Nov 2022 17:01:02 -1000 Message-Id: <5b6418afb2b9a227a42e533a5002bb9b6d27bfd2.1667530733.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 ; Fri, 04 Nov 2022 03:02:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172688 From: Joshua Watt The code to parse arguments was inadvertently skipping all arguments in the elif block after gl-es if it was specified on the command line. Signed-off-by: Joshua Watt Signed-off-by: Alexandre Belloni (cherry picked from commit 718bb8d56f6a24c86e67830a7d13af54df2ebb4e) Signed-off-by: Steve Sakoman (cherry picked from commit dd1dcfada1fa46ecb8227c2852769b35026875d3) Signed-off-by: Steve Sakoman --- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index 1d63281382..0cce8bb96a 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -499,7 +499,7 @@ class BaseConfig(object): self.gtk = True elif arg == 'gl': self.gl = True - elif 'gl-es' in sys.argv[1:]: + elif arg == 'gl-es': self.gl_es = True elif arg == 'egl-headless': self.egl_headless = True From patchwork Fri Nov 4 03:01: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: 14795 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 9546BC433FE for ; Fri, 4 Nov 2022 03:02:17 +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.web08.7211.1667530934500900760 for ; Thu, 03 Nov 2022 20:02:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ciIm4F9d; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id m6-20020a17090a5a4600b00212f8dffec9so3575380pji.0 for ; Thu, 03 Nov 2022 20:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b+7pJqKi9FxDcEIQNXNV8Tu3H005mF/Qs0Zf6tYW04c=; b=ciIm4F9dLtWPZCHKKWq0i1zXeeN8MH86tvV3pofrBdsNNWkzIq3AjyPaiO8JCtQnl5 wwecH8nzjb6PKXODL3kZI7m16K1BK70Yys/+YPPWR589NuHASH6pc7wUSyEzFBOqYH3S QwUdK4R3RVAtAA1uqM8BExmAX8ksbr/EDRzq9qydR5xf/kDGnqvRoodSuwifJLAsKkIh zRkapxHbaXaMGhP2pdwgHmYJ3UOC7Pb7veNO+e9CO36Cre8O7veOrts0PXuD+4wbPdli u8OX9o6ra7XypJ85+15lfgpEcQrmXVx8ejHoVxpk+Fm4k3lu1vbN601ExdL4d73FZ2Ac MUhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b+7pJqKi9FxDcEIQNXNV8Tu3H005mF/Qs0Zf6tYW04c=; b=WPJEHTeh1wjPiFdT9ukeN4h8YibrkP71I5pEvsC744rpjDjJhZImKwDt9q7Esg2BML Zb9XT4OHcGkoyjEQPupNLUhVDh2GubJB6Jljjhb69HrjsLM1yqxW9ARl4gR2FvFbgDwD aJThDPIdB6EMrQcKsMqCgLgPkUYf8VNVov6sXtljGMzH0K/t/8OON+5q1w5pBZK4xrhg WjL/wEwdSns4YFt+0kzBoGKkea5JqauMaHA9tmu3AzffoRnUnqE3paqUTc5qsqP8py5v pj+f+u+rQhbLKHTABXeHsz58gSkUQ52UAhGhdQku8sP61vYDKCH9sys6CqLhjiOlVtvO QjcQ== X-Gm-Message-State: ACrzQf3IsAWW2jpM+JmXQYsJCS7G9f1P+u5m4jLCHKK9gq0qIhM1b15v cZgVeOO5AGFHyWusdHYX9XAlhqu5tdRgiYoG X-Google-Smtp-Source: AMsMyM50+9fwD8wiIVVVzbcJSFLR9MNZmJWFsPSRv33PJxs5E0b5mALAGStLP9ZGo4P5e2zMUDKKNQ== X-Received: by 2002:a17:902:e882:b0:186:a3ba:8780 with SMTP id w2-20020a170902e88200b00186a3ba8780mr33550100plg.114.1667530933538; Thu, 03 Nov 2022 20:02:13 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 28/31] overlayfs: Allow not used mount points Date: Thu, 3 Nov 2022 17:01: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 ; Fri, 04 Nov 2022 03:02:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172689 From: Vyacheslav Yurkov When machine configuration defines a mount point, which is not used in any recipe, allow to fall through and only report a note in the logs. This can be expected behavior, when a mount point is defined for several machines, but not used in all of them Signed-off-by: Vyacheslav Yurkov Signed-off-by: Luca Ceresoli (cherry picked from commit a9c604b5e0d943b5b5f7c8bdd5be730c2abcf866) Signed-off-by: Steve Sakoman (cherry picked from commit c7c6b273656a3e2b8b959004b996e56d4086ce5e) Signed-off-by: Steve Sakoman --- meta/classes/overlayfs.bbclass | 6 +++++- meta/lib/oe/overlayfs.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/classes/overlayfs.bbclass b/meta/classes/overlayfs.bbclass index f7069edd41..c3564b6ec1 100644 --- a/meta/classes/overlayfs.bbclass +++ b/meta/classes/overlayfs.bbclass @@ -96,7 +96,11 @@ python do_create_overlayfs_units() { overlayMountPoints = d.getVarFlags("OVERLAYFS_MOUNT_POINT") for mountPoint in overlayMountPoints: bb.debug(1, "Process variable flag %s" % mountPoint) - for lower in d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint).split(): + lowerList = d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint) + if not lowerList: + bb.note("No mount points defined for %s flag, skipping" % (mountPoint)) + continue + for lower in lowerList.split(): bb.debug(1, "Prepare mount unit for %s with data mount point %s" % (lower, d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint))) prepareUnits(d.getVarFlag('OVERLAYFS_MOUNT_POINT', mountPoint), lower) diff --git a/meta/lib/oe/overlayfs.py b/meta/lib/oe/overlayfs.py index b5d5e88e80..590c0de58a 100644 --- a/meta/lib/oe/overlayfs.py +++ b/meta/lib/oe/overlayfs.py @@ -38,7 +38,11 @@ def unitFileList(d): bb.fatal("Missing required mount point for OVERLAYFS_MOUNT_POINT[%s] in your MACHINE configuration" % mountPoint) for mountPoint in overlayMountPoints: - for path in d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint).split(): + mountPointList = d.getVarFlag('OVERLAYFS_WRITABLE_PATHS', mountPoint) + if not mountPointList: + bb.debug(1, "No mount points defined for %s flag, don't add to file list", mountPoint) + continue + for path in mountPointList.split(): fileList.append(mountUnitName(path)) fileList.append(helperUnitName(path)) From patchwork Fri Nov 4 03:01:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14793 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 94236C43217 for ; Fri, 4 Nov 2022 03:02:17 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web09.7190.1667530927001650130 for ; Thu, 03 Nov 2022 20:02:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fIT6gT/M; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id b21so3711988plc.9 for ; Thu, 03 Nov 2022 20:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WyzL3XWs6T77rLBRvWIeQXVa5/ctXm1vnX8C5fNOgSE=; b=fIT6gT/Mo7zOhb6+yTHZhjcRM7rzMkMJZ/sk4uAWnYMgOA/NcOPHhUoMetmssbTSxQ 8BLDd8WcTRpMkRaTuUwi7F26oTfwwpt/ce0cN6usLreE2abTNCJQ2op1PvYwf98HgMEH +mECcIs67I+JgWO4oUmX8Kkb8Xcx+8bHEnSI4c7gp4/mPkPl/AskIXkg/zmM42xCUH0U uQgiB53j1JIwqomDOebuqmuKBfcmkKLRgBJUevxZx3GuaUZLeHOykCcIWkuztOFWPoDs PHnToDNrE8PUUP4/iFuqsa+tqI3sK2Jlmt8ocWqXT1XE/kqBbay1oPV8+b6P4WTNa0sH 50xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WyzL3XWs6T77rLBRvWIeQXVa5/ctXm1vnX8C5fNOgSE=; b=3X3pq1fwXPJ3J6SJ36+EklEKbthjVl6qUbLssEHfh/eT8EUpxhKAHvghIn0LUb1Y6d bsXtkiq0QrbPWBZPS8Tg5ncd8Ft1zXIIh3WI5K2A73NqK1dHQ94XdN556oohxFD7793a PNaIAmfO0c7+tfKL/R0qV/YaZZA8lyYLkG/xFJz4pJtmV3+n/SkHRPPuIMX2ScshZPNZ z0lKmGdHwMFQ+cWc21isON8dmwYGFfSgVEpijuhs5fg4ptHVEfT9xT52iIxVGh4xGIhB MjhwMr3HQ99aPyma0nEYimDIQZURGQ1aGA8bWuDS+J6HCSFBWXWngjSTrIon5EiXV0Kq rtqg== X-Gm-Message-State: ACrzQf0WoOCuaz1ePzlnwX4CBubdfMsm0TdJ1P6F38WDddv1uy6cbocs IeFYIbA96py+ijThyHOKesSTLx54wnN3Zyqr X-Google-Smtp-Source: AMsMyM4a/PIMXcWEOFlx2CW+zvMM9qDQa98h1gyc8c4ZaSVwCPM6CfcYodRatQ8X+/EAOJHMSldASQ== X-Received: by 2002:a17:903:2348:b0:186:970e:739e with SMTP id c8-20020a170903234800b00186970e739emr33850219plh.115.1667530935369; Thu, 03 Nov 2022 20:02:15 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 29/31] cmake-native: Fix host tool contamination (Bug: 14951) Date: Thu, 3 Nov 2022 17:01:04 -1000 Message-Id: <1fdb3f36e9ac0e5335650eb5286169e943a402cd.1667530733.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 ; Fri, 04 Nov 2022 03:02:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172690 From: Bernhard Rosenkränzer Trying to build cmake-native on a host system where curl was built with cmake (resulting in CURLConfig.cmake and friends, which do not use the same naming schemes expected by cmake-native's build process, being installed to a system wide cmake directory like /usr/lib64/cmake/CURL) results in undefined references to all libcurl symbols. The problem is that cmake-native sees and uses the system wide /usr/lib64/cmake/CURL/CURLConfig.cmake, which defines CURL::libcurl and CURL::curl as opposed to setting ${CURL_LIBRARIES} as expected by cmake-native. find_package(CURL) (cmake-native's CMakeLists.txt, line 478) succeeds, but incorrectly uses the system wide CURLConfig.cmake, resulting CMAKE_CURL_LIBRARIES to be set to an empty string (cmake-native's CMakeLists.txt, line 484), causing the cmake-native build to miss -lcurl. The simplest fix is to let cmake know the right value for CURL_LIBRARIES. Making it -lcurl should always work with libcurl-native in recipe-sysroot-native. Signed-off-by: Bernhard Rosenkränzer Signed-off-by: Steve Sakoman --- meta/recipes-devtools/cmake/cmake-native_3.22.3.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb index ee1f7761c4..45ea78ae00 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb @@ -32,6 +32,7 @@ CMAKE_EXTRACONF = "\ -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=0 \ -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ -DHAVE_SYS_ACL_H=0 \ + -DCURL_LIBRARIES=-lcurl \ " do_configure () { From patchwork Fri Nov 4 03:01: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: 14798 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 93DF8C4332F for ; Fri, 4 Nov 2022 03:02:27 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web12.7140.1667530938497442460 for ; Thu, 03 Nov 2022 20:02:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TpRzXaoV; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id b11so3411499pjp.2 for ; Thu, 03 Nov 2022 20:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v+ZzJl/nLBtkRuvpLOs5Vv+hL0fkEfFMhLJUOcxsC20=; b=TpRzXaoVYbR1rPdvNRqyHQFhObQDseBR+ssL+8Mp+XjgaO650GeYJIk42FeSKVwMeE iVeuiq+3/ampLq7VcX+zkxtaW67PkzivPDzjoesqOhZooYRwO+osiWgs2nuNT9rhsytL wUi9nMMs2ArdNXYmitbv5G9TdD1RO0VvEzHI4bSnRRrEWORfFgifrXMjakDJra1dGQ5p u2K0/138Mz5B4RyTwkO8s2Y4XJCm/PyFppZnG48aPeqFBLZMURMUJlIPus8BpMPOrPA/ 1bgLXC5sHxeaEqmYtA1OkKzo1vcPFLTypVWW7oR/lEEqKnDU9nvjp1NHGFnQmebpBAsl q9gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v+ZzJl/nLBtkRuvpLOs5Vv+hL0fkEfFMhLJUOcxsC20=; b=VFfBr9ksdc1Ph9e59+TfMRpdmL0aklBWDIPTuviy8bcX6+SE8URLLZx+NFkHBRj8+C /rnCb0+q3FEJKn9Btn5TzOBv7KgcHz/UXi3Phz4/bHzHy3G2fvamx2+dVOPXhqW0DKKV Pv5gnvlzCXTpuuP9LCAslBTEIQz6UrWRW69pzyLMfgWN+nYdNcXYWCKh+FSxD+EaFbtN Z/6lBgp3kOKLr7Ig+qsscIu0bqB9BYuUbz9oUIGW5yYXmaETp/m/5oj95eoKmMkcXmpZ /PhHYlWdqGhNligvEH8jVPHdQx/gT90xgeh8tuhRh0I9KxHZ+i2jdh78DLKEqQa0RdAz 1Ctw== X-Gm-Message-State: ACrzQf0KB/Yvmo5QBNKLJwswNBSqI87s68SriQbuA2WacS+I67LBFv2W JSHwvLtO1t/tFfT+JOds3+FBwf0i8vUYZlUC X-Google-Smtp-Source: AMsMyM5QaFYEtui0z8R3/GFNZjKaKgEQ9HIPk9EJfUa4cFFFbD/E5fHdlVcE/Epx2U24VhoHm1YiRQ== X-Received: by 2002:a17:902:ef43:b0:186:99be:2ee9 with SMTP id e3-20020a170902ef4300b0018699be2ee9mr33296319plx.148.1667530937516; Thu, 03 Nov 2022 20:02:17 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 30/31] ltp: backport clock_gettime04 fix from upstream Date: Thu, 3 Nov 2022 17:01:05 -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 ; Fri, 04 Nov 2022 03:02:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172691 From: Xiangyu Chen This is to get rid of the intermittent failures in clock_gettime04, which are likely caused by different clock tick rates on platforms. Here give two thresholds (in milliseconds) for comparison, one for COARSE clock and one for the rest. Signed-off-by: Xiangyu Chen Signed-off-by: Steve Sakoman --- ...set-threshold-based-on-the-clock-res.patch | 89 +++++++++++++++++++ meta/recipes-extended/ltp/ltp_20220121.bb | 1 + 2 files changed, 90 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-clock_gettime04-set-threshold-based-on-the-clock-res.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-clock_gettime04-set-threshold-based-on-the-clock-res.patch b/meta/recipes-extended/ltp/ltp/0001-clock_gettime04-set-threshold-based-on-the-clock-res.patch new file mode 100644 index 0000000000..b4879221ad --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-clock_gettime04-set-threshold-based-on-the-clock-res.patch @@ -0,0 +1,89 @@ +From 9851deb86ef257a98d7433280161d8ca685aa669 Mon Sep 17 00:00:00 2001 +From: Li Wang +Date: Tue, 29 Mar 2022 13:03:51 +0800 +Subject: [PATCH] clock_gettime04: set threshold based on the clock resolution + +This is to get rid of the intermittent failures in clock_gettime04, +which are likely caused by different clock tick rates on platforms. +Here give two thresholds (in milliseconds) for comparison, one for +COARSE clock and one for the rest. + +Error log: + clock_gettime04.c:163: TFAIL: CLOCK_REALTIME_COARSE(syscall with old kernel spec): + Difference between successive readings greater than 5 ms (1): 10 + clock_gettime04.c:163: TFAIL: CLOCK_MONOTONIC_COARSE(vDSO with old kernel spec): + Difference between successive readings greater than 5 ms (2): 10 + +From Waiman Long: + That failure happens for CLOCK_REALTIME_COARSE which is a faster but less + precise version of CLOCK_REALTIME. The time resolution is actually a clock + tick. Since arm64 has a HZ rate of 100. That means each tick is 10ms. So a + CLOCK_REALTIME_COARSE threshold of 5ms is probably not enough. I would say + in the case of CLOCK_REALTIME_COARSE, we have to increase the threshold based + on the clock tick rate of the system. This is more a test failure than is + an inherent problem in the kernel. + +Fixes #898 + +Upstream-Status: Backport +[https://github.com/linux-test-project/ltp/commit/9851deb86ef257a98d7433280161d8ca685aa669] + +Reported-by: Eirik Fuller +Signed-off-by: Li Wang +Cc: Waiman Long +Cc: Viresh Kumar +Reviewed-by: Cyril Hrubis +Acked-by: Waiman Long +Signed-off-by: Xiangyu Chen +--- + .../syscalls/clock_gettime/clock_gettime04.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c b/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c +index a8d2c5b38..c279da79e 100644 +--- a/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c ++++ b/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c +@@ -35,7 +35,7 @@ clockid_t clks[] = { + }; + + static gettime_t ptr_vdso_gettime, ptr_vdso_gettime64; +-static long long delta = 5; ++static long long delta, precise_delta, coarse_delta; + + static inline int do_vdso_gettime(gettime_t vdso, clockid_t clk_id, void *ts) + { +@@ -92,9 +92,18 @@ static struct time64_variants variants[] = { + + static void setup(void) + { ++ struct timespec res; ++ ++ clock_getres(CLOCK_REALTIME, &res); ++ precise_delta = 5 + res.tv_nsec / 1000000; ++ ++ clock_getres(CLOCK_REALTIME_COARSE, &res); ++ coarse_delta = 5 + res.tv_nsec / 1000000; ++ + if (tst_is_virt(VIRT_ANY)) { + tst_res(TINFO, "Running in a virtual machine, multiply the delta by 10."); +- delta *= 10; ++ precise_delta *= 10; ++ coarse_delta *= 10; + } + + find_clock_gettime_vdso(&ptr_vdso_gettime, &ptr_vdso_gettime64); +@@ -108,6 +117,11 @@ static void run(unsigned int i) + int count = 10000, ret; + unsigned int j; + ++ if (clks[i] == CLOCK_REALTIME_COARSE || clks[i] == CLOCK_MONOTONIC_COARSE) ++ delta = coarse_delta; ++ else ++ delta = precise_delta; ++ + do { + for (j = 0; j < ARRAY_SIZE(variants); j++) { + /* Refresh time in start */ +-- +2.34.1 + diff --git a/meta/recipes-extended/ltp/ltp_20220121.bb b/meta/recipes-extended/ltp/ltp_20220121.bb index 4ae54492f3..51e8db4f1e 100644 --- a/meta/recipes-extended/ltp/ltp_20220121.bb +++ b/meta/recipes-extended/ltp/ltp_20220121.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \ file://disable_hanging_tests.patch \ file://0001-syscalls-pread02-extend-buffer-to-avoid-glibc-overflow-detection.patch \ + file://0001-clock_gettime04-set-threshold-based-on-the-clock-res.patch \ " S = "${WORKDIR}/git" From patchwork Fri Nov 4 03:01:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14797 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 8ECCFC433FE for ; Fri, 4 Nov 2022 03:02:27 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.7165.1667530940730045689 for ; Thu, 03 Nov 2022 20:02:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=St0BUojs; spf=softfail (domain: sakoman.com, ip: 209.85.214.180, mailfrom: steve@sakoman.com) Received: by mail-pl1-f180.google.com with SMTP id p21so3714254plr.7 for ; Thu, 03 Nov 2022 20:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5NLe73IpHA6NEoBmtccxcvFYg8IY0zMdsuPrGt4C8Ug=; b=St0BUojsu6S2/HboQPsRC/HMKVVDVQd/nRTjLK1DieC+Fp4rC7O4KbFV4uLvCv1zeR qAJge4YQ222uA9mVCKULcXcGalITShvLRD1KiabaSMPPl8/e6rbcGMXbs6afRUIS8r9H +EkW6Yez1qsof45WexrNpm9EiJmPzKt4zh/5m/qaw7HQZKlW5oozmdIbidcGu6AL/TcS PKczfgLuqUlyKIzRt+NxnX+e+vCpuEstzzlNUC8ZgQcL9BNBZzJADI7HOlSiTxJhr2We mn7Or9Lvs0ULgy2gEqZsgnsT+FKkseIDt3GcXLvtYxhqFfyErEik9DlZIj8RynW3GEiK /bww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5NLe73IpHA6NEoBmtccxcvFYg8IY0zMdsuPrGt4C8Ug=; b=zpM6T/ykMZ/5pnsH/lW5KfDAs4eXK0x0Uqd9xiSg3ZSTm9T0QWzfZh+Xh3KS3rO+cz lpN0syYGdPKHa0ALhoOnbAmU1Ww+HiLkhYjkXfon0GEVOvoh1Zae2SbPdqCNrc1ZmACB 8iHLtyx7aOCHc/1yo4w16z0SL/Yrt7umVNve/x44Y+w9nogCcf6jwKbUsMFIXjVwzctd ADuJufyg5km1OdS5lh5MBEkz9MmntY4snqn+cHCEJl+eqftiswSSo7n4Tggad0GU+2fy WTMWrplNsvt3xUdWWII2Gq2nH14e7Su/y0pj5FyB5+IP9d8U2mtKyfgbHC+pRVrfH9Xa /rTA== X-Gm-Message-State: ACrzQf02a+bEvAKlDJ6zts96Y0tbQMtb4ThwJz2JhFkTlXNEepjG+kKW SGdkyWUUNSeeXB/iiyf9yGuCS4TuVUfIHf85 X-Google-Smtp-Source: AMsMyM6a5NSHnVK0/tupxWFr/6q40yLNxZx3zMlbRmLOPwluMcLmQT3rdtLc9RS0HHu5AybjYoPxYA== X-Received: by 2002:a17:90a:5308:b0:20b:1eae:c94e with SMTP id x8-20020a17090a530800b0020b1eaec94emr17358247pjh.88.1667530939732; Thu, 03 Nov 2022 20:02:19 -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 r7-20020a17090a454700b0020b7de675a4sm667902pjm.41.2022.11.03.20.02.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 20:02:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 31/31] perf: Depend on native setuptools3 Date: Thu, 3 Nov 2022 17:01:06 -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 ; Fri, 04 Nov 2022 03:02:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/172692 From: Khem Raj perf has need for python setuptools when scripting is enabled from 6.0.0 onwards it seems to throw an explicit error Signed-off-by: Khem Raj Cc: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit da3d00178809bbf7cc453401e0c5937796ebc2c1) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/perf/perf.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 772bc2dea1..a4ce3169d3 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -13,7 +13,7 @@ PR = "r9" PACKAGECONFIG ??= "scripting tui libunwind" PACKAGECONFIG[dwarf] = ",NO_DWARF=1" -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3" +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native" # gui support was added with kernel 3.6.35 # since 3.10 libnewt was replaced by slang # to cover a wide range of kernel we add both dependencies