From patchwork Sat Feb 19 18:23:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 3833 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 42296C433EF for ; Sat, 19 Feb 2022 18:23:23 +0000 (UTC) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.groups.io with SMTP id smtpd.web08.12788.1645295001876660285 for ; Sat, 19 Feb 2022 10:23:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=c8gTXTt+; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.54, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f54.google.com with SMTP id m126-20020a1ca384000000b0037bb8e379feso10848732wme.5 for ; Sat, 19 Feb 2022 10:23:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Kr7qBj6XjW3XxTA0k4pPsCVNHFkOvE667ASSfHeZkvk=; b=c8gTXTt+axLedQwZQJ9p0bBuKdohF74a5kyEtC1m7M/m0BdECsD4xOU1D8nv/BJ7d+ QDzX2nAT3nzFtHKgYn7m2ygOICuaQOE07buVM3K6fhyyuikrE1Y9vjg0E5ey4Ek+2FUz VokbyBN/obUM2thDSQTejrIj+FjMgaqEu3Ti4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Kr7qBj6XjW3XxTA0k4pPsCVNHFkOvE667ASSfHeZkvk=; b=4yjY1nb6bl/z6xInW4BtB5PLVibixnoNBfsY1BNT36Q6vhzWw7AHC8wJIZqEFc3zvH P8TSew6TpfJGlOJdxwcVUfyA9v5I67gvOVu7oUiFWjNO7TCePRXxs8sY0y9AGbCy+r6H 1cVB0pwANuPvwqEiYvgVRxxMUdgo9JknRmcgeMaB7/oNl7oLg5mu8Ue6CofoCBZZXKME Sc8CfjxUbgka3h4S2mgLzJ8y60gmCzbPf6o6ZKHwuyTV8Yzz+mLbLg5WY96tBCrDuHo8 2AbqQqerS58yLb1m9o6Mk1kzje3nPCm3EE4ZzFCh/vlLenuLBqJtTAneekaSI6MsvIda Ioqw== X-Gm-Message-State: AOAM532i8HP5TRpc9hZDY81KHU0j0tAs8Y1Kya1JVoLSn7t/EuoRF+hK Mitb3egXy7WviqHxAEnG+2aFqy2koT6wGeFA X-Google-Smtp-Source: ABdhPJzKJvXxTg193AClBf3Yr63nL3Ta+FTLqEb/gWRyQ1leJ1Qjf22vmQKWm0dEpHmGPnxClpOb3A== X-Received: by 2002:a05:600c:3505:b0:37b:bf81:97d8 with SMTP id h5-20020a05600c350500b0037bbf8197d8mr12150669wmq.30.1645294999687; Sat, 19 Feb 2022 10:23:19 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:bf04:d486:cfa0:deab]) by smtp.gmail.com with ESMTPSA id f6sm26152921wrv.116.2022.02.19.10.23.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 10:23:19 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] sstate: Setup fetcher environment in advance Date: Sat, 19 Feb 2022 18:23:15 +0000 Message-Id: <20220219182317.3083591-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 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 ; Sat, 19 Feb 2022 18:23:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161962 The threading code here can race as the fetcher changes the environment which is shared between the threads. By setting it up in advance, it isn't changed and therefore no longer races. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 2e1d9428c27..787172b408d 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -1022,15 +1022,18 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, msg = "Checking sstate mirror object availability" bb.event.fire(bb.event.ProcessStarted(msg, len(tasklist)), d) - bb.event.enable_threadlock() - pool = oe.utils.ThreadedPool(nproc, len(tasklist), - worker_init=checkstatus_init, worker_end=checkstatus_end, - name="sstate_checkhashes-") - for t in tasklist: - pool.add_task(checkstatus, t) - pool.start() - pool.wait_completion() - bb.event.disable_threadlock() + # Have to setup the fetcher environment here rather than in each thread as it would race + fetcherenv = bb.fetch2.get_fetcher_environment(d) + with bb.utils.environment(**fetcherenv): + bb.event.enable_threadlock() + pool = oe.utils.ThreadedPool(nproc, len(tasklist), + worker_init=checkstatus_init, worker_end=checkstatus_end, + name="sstate_checkhashes-") + for t in tasklist: + pool.add_task(checkstatus, t) + pool.start() + pool.wait_completion() + bb.event.disable_threadlock() if progress: bb.event.fire(bb.event.ProcessFinished(msg), d) From patchwork Sat Feb 19 18:23:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 3834 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 1B338C433F5 for ; Sat, 19 Feb 2022 18:23:24 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web11.13029.1645295002248206896 for ; Sat, 19 Feb 2022 10:23:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=FL6LBlk8; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.50, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f50.google.com with SMTP id d27so19913695wrb.5 for ; Sat, 19 Feb 2022 10:23:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7tQyz+RO3AMSgTAtb87CjNo2nylNen2LLT7Aye3MRl8=; b=FL6LBlk8Ccu7ZVU/kt0zK+nSIDoxWYCfnCKJrAPnVpFKmNGRFIVds2AH1o+wurVvL4 0Qjuoh/7jTvVdSwmjs8T2oGE1OVN6ZXL0TwMEbESBbviaIL8AldDdUWkF1WnFokGMQNC djR6WRrmK54By6nSIWeVCevhRTRiOCq592fF4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7tQyz+RO3AMSgTAtb87CjNo2nylNen2LLT7Aye3MRl8=; b=tQ0M7WkC6A4+cdWRa0WEER8YZrijv6iAjQwPJdpoZp4Zo4rsjGV1MT2hDT46yXBLfy yvWDh9O280iXrF5kqJKV1EylamE8DZUA6CcXOSvAbyJOhuoOlIIiCrIZyGHCA4Azgjx2 UtcAchBNkON2TZQ+VmR74fuuEOM2RQ4YPcM46qHUiuKj3ZbNfPm761hm4Dq2dcBdtNxY V1BI3ZW9/AI3D4TrvasSUpQyxv2MTdxq6ogPMIozn0zxx3vQZ6xsCG+diHEruA3yyF+u z6cUPvWivr17Dmha7PddGPCFHLVflKJeNWsRjW1EWMHut2yNfKdPRCxWVUBZaPrAOikF 75UA== X-Gm-Message-State: AOAM533sLpsmyJqucARicrd9j7cTpI4iNg+4kgsRxTrrXFYuHq2cDqrS CnFvL+rWnbz67ZDIHdGQ+FYPQsu1NLDsw92G X-Google-Smtp-Source: ABdhPJxL2QUStjxP5jGQLm7BMCbTfvNtR9NsQt3QwGut8w3XmhFAQtq3DffyOOq77n352xAM7xFHTg== X-Received: by 2002:a5d:4989:0:b0:1e3:1d25:528 with SMTP id r9-20020a5d4989000000b001e31d250528mr10072712wrq.472.1645295000385; Sat, 19 Feb 2022 10:23:20 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:bf04:d486:cfa0:deab]) by smtp.gmail.com with ESMTPSA id f6sm26152921wrv.116.2022.02.19.10.23.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 10:23:20 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] expat: Upgrade 2.4.4 -> 2.4.5 Date: Sat, 19 Feb 2022 18:23:16 +0000 Message-Id: <20220219182317.3083591-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219182317.3083591-1-richard.purdie@linuxfoundation.org> References: <20220219182317.3083591-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 19 Feb 2022 18:23:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161963 This is a security fix release containing fixes for CVE-2022-25235, CVE-2022-25236, CVE-2022-25313, CVE-2022-25314 and CVE-2022-25315. Signed-off-by: Richard Purdie --- meta/recipes-core/expat/{expat_2.4.4.bb => expat_2.4.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/expat/{expat_2.4.4.bb => expat_2.4.5.bb} (91%) diff --git a/meta/recipes-core/expat/expat_2.4.4.bb b/meta/recipes-core/expat/expat_2.4.5.bb similarity index 91% rename from meta/recipes-core/expat/expat_2.4.4.bb rename to meta/recipes-core/expat/expat_2.4.5.bb index 14080220d2c..83ba3a23291 100644 --- a/meta/recipes-core/expat/expat_2.4.4.bb +++ b/meta/recipes-core/expat/expat_2.4.5.bb @@ -14,7 +14,7 @@ SRC_URI = "https://github.com/libexpat/libexpat/releases/download/R_${VERSION_TA UPSTREAM_CHECK_URI = "https://github.com/libexpat/libexpat/releases/" -SRC_URI[sha256sum] = "14c58c2a0b5b8b31836514dfab41bd191836db7aa7b84ae5c47bc0327a20d64a" +SRC_URI[sha256sum] = "fbb430f964c7a2db2626452b6769e6a8d5d23593a453ccbc21701b74deabedff" EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" From patchwork Sat Feb 19 18:23:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 3835 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 1C788C4332F for ; Sat, 19 Feb 2022 18:23:24 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.13062.1645295003030085311 for ; Sat, 19 Feb 2022 10:23:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=aGoqSaul; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.53, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f53.google.com with SMTP id c192so7168090wma.4 for ; Sat, 19 Feb 2022 10:23:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VY2ywFVpn0p4hChq/A4cpxGbB6BEf1JSYxOWGPmRUV0=; b=aGoqSaulVNd/UHmmEXZEK3Slp3v9/ZWXcjaVkm4a6bckt3of3YnDHOBHwTvQdI1n9X IrbaEdYy8v1XN+k2CxVf4I6LmCmrmB66jhpWOPLkUTas9GdPTY6cKSGz3qOewqJhTErU 023kmKamNGLN5ixYkoGd3+Xv6gN5+wXoFg1+I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VY2ywFVpn0p4hChq/A4cpxGbB6BEf1JSYxOWGPmRUV0=; b=QMac+m12CHmNcUEvsNlStnjKNYk8HEkmSHNZKQZdDXK22uSHhpegkpZLsU/2pXzwWJ SfLfO2voCTjKca1eZl+n98mSjGuYbgujuspYGJVIcoUFOgnvn5pA3GM91bLphwr4js+J X2Avujq0riAIQjiwNQLzcuA4Ww7W7P2DOPjsGS9M41vdCDtaa0aYvGY+ZxV4elh8JpMi q18+vGCcrYpYv5pwUUrmhQJ/xvw3DSo/Ay8EAY1CQkAucndA0bLlgEZ7WGcg2gW4M+9f Y8i3Wgsquq7Y4/FDkZwR0rgg0qrzWVaaYnrXSlb1tEn81n+Ky+V8eX3US/I6t/dUwvf6 Pb6g== X-Gm-Message-State: AOAM531t4APSsySZ0mw1XVXOQwtvyEIXev3uu1mazCYVpcHJOuHWhmIJ aRJkhkM0VeycHT8nYXWsH1oUZ6i0WqVkulQl X-Google-Smtp-Source: ABdhPJytNxy+FMVOuu69EE7C5ehs5WVRm1etX1nSuUlGIsJWfHaSAPmS9LDlTfCJnGptMfDv7PyGzg== X-Received: by 2002:a05:600c:1e8e:b0:37b:e97a:d4c8 with SMTP id be14-20020a05600c1e8e00b0037be97ad4c8mr15241127wmb.189.1645295001166; Sat, 19 Feb 2022 10:23:21 -0800 (PST) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:bf04:d486:cfa0:deab]) by smtp.gmail.com with ESMTPSA id f6sm26152921wrv.116.2022.02.19.10.23.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Feb 2022 10:23:20 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] oeqa/selftest/bbtests: Update after license changes Date: Sat, 19 Feb 2022 18:23:17 +0000 Message-Id: <20220219182317.3083591-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219182317.3083591-1-richard.purdie@linuxfoundation.org> References: <20220219182317.3083591-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 19 Feb 2022 18:23:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161964 Update the test to match the renamed license in the recipe. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/bbtests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index e2b9290200a..ce72c4bcc69 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -228,8 +228,8 @@ INHERIT:remove = \"report-error\" result = bitbake('selftest-ed', ignore_status=True) self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) lic_dir = get_bb_var('LICENSE_DIRECTORY') - self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv3'))) - self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPLv2'))) + self.assertFalse(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPL-3.0-or-later'))) + self.assertTrue(os.path.isfile(os.path.join(lic_dir, 'selftest-ed/generic_GPL-2.0-or-later'))) def test_setscene_only(self): """ Bitbake option to restore from sstate only within a build (i.e. execute no real tasks, only setscene)"""