From patchwork Sun Jun 5 12:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 8869 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 632E8C43334 for ; Sun, 5 Jun 2022 12:26:07 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web09.19985.1654431961552951625 for ; Sun, 05 Jun 2022 05:26:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=gxaqQ6ha; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.43, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f43.google.com with SMTP id q15so8225102wrc.11 for ; Sun, 05 Jun 2022 05:26:01 -0700 (PDT) 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=dofObs7nkuzHfZWUE9jtsCYXmz1Dm3RSmQQmon3zO3s=; b=gxaqQ6haDzrmVmim+DZ2pwjraWJndqONUNTwgLRSlT4Ry4W//kPQ5S7nbSumWb+xaH wYLGRrwTFmT+TdTDkhIJXCaa7gdhKDKBGq3xi2SpWw73S9rFUsLPmO9TF9ZRt3SOjAKz cbkC/sk/WLy+YVs9xnMHS3WqYSkVwlNr5UnJ4= 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=dofObs7nkuzHfZWUE9jtsCYXmz1Dm3RSmQQmon3zO3s=; b=tyNLqsgCyOcVncngDCcV5X7mTaceEKg5XxOexwyxQdhkWyvE4jFfRU8Po9PJCLgCIa pLmkmX0HG1xQXFhqzjEbNsyvmDlHREqZigDdt65FjvbQhLbuJVwzIPBXhU3IROwumNcZ 00+uze+UllAjRhn5ENgL3fqzWlQJqDmiuQlezeQavI9A5+zZDLOSFTqh5FAKDpxLnRPu dXhpt2gGYGhSFxY/wkbo0SiXwjwJrWsuVl9Qnmk0BBEeF1seRQNyq/ZUcSAh6eWk/BPf sLO5jyjpFP5JorBSvEfC0cr9QlfzKUTrnG6z/sOMgo/8YvZYH8vdYbOCSzujD232ZkCD obFA== X-Gm-Message-State: AOAM533rex/1pBaI3n01dYxe0wFXF33bIouYCVjf02OHzbuexKZHejOz E10aREutZpC5fIh4Obi/Fya25elZJ6Yx3Q== X-Google-Smtp-Source: ABdhPJwDGCDtcJwDsL4+6DBLQpaCUH56S9e+uatZE4MNMcX+R9piw33LF9ogachl5G3zYYtNbD1Juw== X-Received: by 2002:adf:a4c2:0:b0:213:be00:9d2 with SMTP id h2-20020adfa4c2000000b00213be0009d2mr11227176wrb.568.1654431959580; Sun, 05 Jun 2022 05:25:59 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1a6f:63e8:c3d9:1249]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c3b8900b003942a244ecbsm12455927wms.16.2022.06.05.05.25.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 05:25:59 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] sanity: Switch to make 4.0 as a minimum version Date: Sun, 5 Jun 2022 13:25:55 +0100 Message-Id: <20220605122558.270399-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 05 Jun 2022 12:26:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166575 We can't build glibc without make 4.0 and we don't work on older distros with older versions of make without buildtools tarball so increase the minimum version to 4.0. Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index b416918013c..eb0ca058049 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -432,8 +432,7 @@ def check_patch_version(sanity_data): except subprocess.CalledProcessError as e: return "Unable to execute patch --version, exit code %d:\n%s\n" % (e.returncode, e.output) -# Unpatched versions of make 3.82 are known to be broken. See GNU Savannah Bug 30612. -# Use a modified reproducer from http://savannah.gnu.org/bugs/?30612 to validate. +# Glibc needs make 4.0 or later, we may as well match at this point def check_make_version(sanity_data): import subprocess @@ -442,31 +441,8 @@ def check_make_version(sanity_data): except subprocess.CalledProcessError as e: return "Unable to execute make --version, exit code %d\n%s\n" % (e.returncode, e.output) version = result.split()[2] - if bb.utils.vercmp_string_op(version, "3.82", "=="): - # Construct a test file - f = open("makefile_test", "w") - f.write("makefile_test.a: makefile_test_a.c makefile_test_b.c makefile_test.a( makefile_test_a.c makefile_test_b.c)\n") - f.write("\n") - f.write("makefile_test_a.c:\n") - f.write(" touch $@\n") - f.write("\n") - f.write("makefile_test_b.c:\n") - f.write(" touch $@\n") - f.close() - - # Check if make 3.82 has been patched - try: - subprocess.check_call(['make', '-f', 'makefile_test']) - except subprocess.CalledProcessError as e: - return "Your version of make 3.82 is broken. Please revert to 3.81 or install a patched version.\n" - finally: - os.remove("makefile_test") - if os.path.exists("makefile_test_a.c"): - os.remove("makefile_test_a.c") - if os.path.exists("makefile_test_b.c"): - os.remove("makefile_test_b.c") - if os.path.exists("makefile_test.a"): - os.remove("makefile_test.a") + if bb.utils.vercmp_string_op(version, "4.0", "<"): + return "Please install a make version of 4.0 or later.\n" if bb.utils.vercmp_string_op(version, "4.2.1", "=="): distro = oe.lsb.distro_identifier() From patchwork Sun Jun 5 12:25:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 8870 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 6F456CCA481 for ; Sun, 5 Jun 2022 12:26:07 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web09.19988.1654431962181160815 for ; Sun, 05 Jun 2022 05:26:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=ZmRvlLqZ; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.51, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f51.google.com with SMTP id c5-20020a1c3505000000b0038e37907b5bso8670728wma.0 for ; Sun, 05 Jun 2022 05:26:01 -0700 (PDT) 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=Wf404Ay5Un75Vi60OFOdUnyO0S+ZE+2HpNJCdpNmwL4=; b=ZmRvlLqZlwZOsRmPYR393BLFRM/OwliRK9p0dM9mVRrImCN4rVI/3TJOxwrLAyesnJ aiN5Z2gk4sG1yDpAoekrW3YVVjR8KVwnGewNzIyRRWSBQCnPZ0LBLmi7ypndZ3BoSsHM CF2KB6TtM0SC34jf1ssPt9sCVhGghubBIWSA0= 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=Wf404Ay5Un75Vi60OFOdUnyO0S+ZE+2HpNJCdpNmwL4=; b=YA6C/7CzTf8rEOnleecuDW+h7sdqkyQg7cjcSzkimgsf+kpgCpsuVI6SwTl4CC0P/R W/fMywxSq4CWBmIK1mHXZjvTUGbDlQhnMaffoQilfGDilv2MUX1vFkwEogrqF+h0gS81 8he59q8fH9iBp9YK/Z7m1dPAgHT9sCI3bysniAu+GXe7AOzAGHHvCd/l//x7HsyhdNCP rU/Fwf4XsPlGfNkJXhPThYNC+Nbvzaq68FPRhc8ly5Mr0GUoft2W9xgr1gjYV1g0TwqV 8OOo0Akh3emqcPId25Olax6HVcKC6yjqf7M8LIifLbTjU2VjmrBGsDebq29G0fGqtf8o bkmw== X-Gm-Message-State: AOAM532Nr6F3SJKIqag2IrevFqEVpjC3oSnpK4vA8go5XM+OS2eMP0ab duvSYIwGcX77VeuHim1242MdjVeQpD3Bqg== X-Google-Smtp-Source: ABdhPJz5twn0uXAeDeDXsnAyg1k6Eom6P8yFwkl2Ouq26mWeCa6cTzwQyZCN5iSte/PjK+AIssW+9A== X-Received: by 2002:a05:600c:2105:b0:39c:37d0:6f5e with SMTP id u5-20020a05600c210500b0039c37d06f5emr14058335wml.44.1654431960195; Sun, 05 Jun 2022 05:26:00 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1a6f:63e8:c3d9:1249]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c3b8900b003942a244ecbsm12455927wms.16.2022.06.05.05.25.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 05:25:59 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] perl: Add dependency on make-native to avoid race issues Date: Sun, 5 Jun 2022 13:25:56 +0100 Message-Id: <20220605122558.270399-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605122558.270399-1-richard.purdie@linuxfoundation.org> References: <20220605122558.270399-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 ; Sun, 05 Jun 2022 12:26:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166576 Make 4.1 has race issues with double colon usage in makefiles which are common in MakeMaker generated code in perl. Add a dependency on make-native to avoid this as it is relaitvely low overhead. Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl_5.34.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/perl/perl_5.34.1.bb b/meta/recipes-devtools/perl/perl_5.34.1.bb index 4b9d2e2c501..42bcb8b1bc6 100644 --- a/meta/recipes-devtools/perl/perl_5.34.1.bb +++ b/meta/recipes-devtools/perl/perl_5.34.1.bb @@ -33,6 +33,8 @@ S = "${WORKDIR}/perl-${PV}" inherit upstream-version-is-even update-alternatives DEPENDS += "perlcross-native zlib virtual/crypt" +# make 4.1 has race issues with the double-colon usage of MakeMaker, see #14096 +DEPENDS += "make-native" PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0" From patchwork Sun Jun 5 12:25:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 8871 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 67594C433EF for ; Sun, 5 Jun 2022 12:26:07 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.19908.1654431962512286182 for ; Sun, 05 Jun 2022 05:26:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=NfH0t4mR; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.41, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f41.google.com with SMTP id h62-20020a1c2141000000b0039aa4d054e2so8662180wmh.1 for ; Sun, 05 Jun 2022 05:26:02 -0700 (PDT) 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=zZLpGVsgqVtPUTOiB+rR1S4z0wuWshCkLBZLc/eb6Bs=; b=NfH0t4mRwtZa8k7xV2UasehLMq2mOc1lgDZKO6cgKYTxqJU5FbJfO9Y2Z8BSqG9Zay 9FGSH9XHAwoNn9uVBuTlYh9hHCgzQr8Yr9wHC2xwdxnnxoKx3d6y4EFbF9zH8lDRFhck yS+H4ZHxKcVpp+3L3uEtfA0M0Wsr6yeY0xovk= 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=zZLpGVsgqVtPUTOiB+rR1S4z0wuWshCkLBZLc/eb6Bs=; b=lHMqnjHG2YWDrlSzQD7vhGR2sWZmSx8I/2cV6vFnFPDpjBmJuGDqFu+IftOT4374aH /hpT8Mdr/LAH6bSA4GLS3xZcTc7198BVNmuRzmTyOJLgR1F4C+vtCHQ8dmyq0qxRHisE Izs8iHBrdtbGF37kWU8MBWEdY9XvoRLcuT/nTgGFDtL/5UEl8Sa70QI7GXgREvhNlXKa Y3Mu/oetaWPk0zqnjXDRQw0rw5bf+aMGiB25FAqnniglhKQqW75glFSlfD/M0D6u/PGi VHjj3HruMAIHPCBjtfFkUpjDsFtxUe9yNw8WNgRnL3V72MOoRh9pG8xQz2OZn4rCeRLe Bnzg== X-Gm-Message-State: AOAM533BsEz9ED4Ua/3WZLskPfKEtKnofUS80Fcxdb7BeJs2iyYV5Rpi gkcVhl/jNKKwgrL+S6rvNzVM09qpSRf1tw== X-Google-Smtp-Source: ABdhPJxOXxkK4587CuZ2WEgI9+ovsCaB8MN3AB2eya8kH9MplznOnach/M8DH2HWjLfsITD0BQuWrw== X-Received: by 2002:a05:600c:154d:b0:394:880f:ae3a with SMTP id f13-20020a05600c154d00b00394880fae3amr46301418wmg.13.1654431960869; Sun, 05 Jun 2022 05:26:00 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1a6f:63e8:c3d9:1249]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c3b8900b003942a244ecbsm12455927wms.16.2022.06.05.05.26.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 05:26:00 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] glibc: Drop make-native dependency Date: Sun, 5 Jun 2022 13:25:57 +0100 Message-Id: <20220605122558.270399-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605122558.270399-1-richard.purdie@linuxfoundation.org> References: <20220605122558.270399-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 ; Sun, 05 Jun 2022 12:26:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166577 Now that our make version is a minmum of 4.0 we can drop this dependency. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc_2.35.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc_2.35.bb b/meta/recipes-core/glibc/glibc_2.35.bb index 6ea5b1efb59..96fe39c548c 100644 --- a/meta/recipes-core/glibc/glibc_2.35.bb +++ b/meta/recipes-core/glibc/glibc_2.35.bb @@ -16,7 +16,7 @@ CVE_CHECK_IGNORE += "CVE-2019-1010022 CVE-2019-1010023 CVE-2019-1010024" # Potential patch at https://sourceware.org/bugzilla/show_bug.cgi?id=22853 CVE_CHECK_IGNORE += "CVE-2019-1010025" -DEPENDS += "gperf-native bison-native make-native" +DEPENDS += "gperf-native bison-native" NATIVESDKFIXES ?= "" NATIVESDKFIXES:class-nativesdk = "\ From patchwork Sun Jun 5 12:25:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 8868 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 6507ECCA47B for ; Sun, 5 Jun 2022 12:26:07 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web12.20000.1654431963215749030 for ; Sun, 05 Jun 2022 05:26:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=BI1w7OJu; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.44, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f44.google.com with SMTP id q7so16275271wrg.5 for ; Sun, 05 Jun 2022 05:26:03 -0700 (PDT) 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=Voi57evU1dJe6udgLWUwSjE5TOEKwl46LhlxauCIIH8=; b=BI1w7OJuCLe3LbOQPlOllBR/g/VTe8pLFXLO5YarkdDjeVyXi3i3GEd2sa4S78AgHR n6atNWPtxebuosYcUgvW0a7ISHxN/8R9iEwXYzIOo2apEYL4nvHLrr7a40Q6LG+JUDhB FQ6boYwQ2+F3EzSgkqns6iuU2EHa6D35mVb4E= 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=Voi57evU1dJe6udgLWUwSjE5TOEKwl46LhlxauCIIH8=; b=Ggd5DFLTL7S3fMY6H9Ry7/UTIWq+rGgPqZPgKI0O0QP2E8GnjYEUCoq0qZNxQiGNda di7lcOYJ66MNfsizCq7zqaJpYhIV2kfBHaOhTuX9TqfPptp4cShSE6H5cGzOeRBfG2Nz rA2WDkDq+8Sow6sOwsPwo4CT6nvWPyBIBUKt/A/Ohm4E4kOQr+FGC/dTlR5fxWE42KFR Dk6j3eWWAgtdW1y7Josy4t21eDTIEa1BxlYyDu4Sdox6YY+Ybp+ICEvvXf/RVnSWkdY2 xn/DEpUZDf8VcFXYwh8d6UtptIBKVH0C8jcHwVl//y5KlZr0oTJcIU6VZrilODpY67p9 9Nbg== X-Gm-Message-State: AOAM5310qHPuAs3EOXv+1uQcVgEFZE9K4wHb6vL7XjHoYM+5MI6bVqCj 1nCYe0b8LRxfiXYn8tbR21yFaBQnxWT9Jw== X-Google-Smtp-Source: ABdhPJyxcq38803DdhNQ4dfbyLVRa6M2uvSTK0rG/9EXkF7g1U/aOp1Im3M3nu/tKqeMHGdH1E4cDw== X-Received: by 2002:a5d:648a:0:b0:217:3552:eb2d with SMTP id o10-20020a5d648a000000b002173552eb2dmr3930220wri.78.1654431961562; Sun, 05 Jun 2022 05:26:01 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1a6f:63e8:c3d9:1249]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c3b8900b003942a244ecbsm12455927wms.16.2022.06.05.05.26.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 05:26:01 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] populate_sdk_ext: Fix second bb_unihashes reference Date: Sun, 5 Jun 2022 13:25:58 +0100 Message-Id: <20220605122558.270399-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605122558.270399-1-richard.purdie@linuxfoundation.org> References: <20220605122558.270399-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 ; Sun, 05 Jun 2022 12:26:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166578 A previous fix for zero length bb_unihashes.dat files wasn't complete as there is a second copy of the unihashes file made. Change this second call site to match the first to fully fix the zero length file issue. Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 3ddbb46eda4..d58b2ba5d0d 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -491,10 +491,10 @@ python copy_buildsystem () { else: tasklistfn = None - if os.path.exists(builddir + '/cache/bb_unihashes.dat'): - bb.parse.siggen.save_unitaskhashes() - bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) - shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') + + cachedir = os.path.join(baseoutpath, 'cache') + bb.utils.mkdirhier(cachedir) + bb.parse.siggen.copy_unitaskhashes(cachedir) # Add packagedata if enabled if d.getVar('SDK_INCLUDE_PKGDATA') == '1':