From patchwork Fri May 27 16:25:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 8579 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 26192C433FE for ; Fri, 27 May 2022 16:25:10 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web09.5665.1653668706868025567 for ; Fri, 27 May 2022 09:25:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=akrbT4V0; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f45.google.com with SMTP id k5so228792wrd.5 for ; Fri, 27 May 2022 09:25:06 -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=LYE91f0kywlXhZUaYt5JsVTsQwCXDduSzAM7CoVEQSE=; b=akrbT4V00+Xzg9GSZwkoFMWzDsYPZqRv2vVlvI8gHAkFxsAcVzeqNXtp/K5iMB6pz9 CvzTJ6RxPUUto863mwaOQkRd6cectiyCMqnLJhTeStYBJODh0BKKYdgqCtLgKjn8R/io TYLVkDDl4KaYWXakYBv9Yc6xJFUQJof34oHgY= 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=LYE91f0kywlXhZUaYt5JsVTsQwCXDduSzAM7CoVEQSE=; b=1fJGwov2jfZ8VNz0hSbw4pEdg4KrX4DQ7hKOOYmUbo4R/Bn6k0sYZFBKJJNrJap6v7 565+ZVc/97Z3JyhIoKSSAJuixNEOtBZ7Am30/wucvPFUFG53+s/aH5UGiRVJQ64i5SFS xBf3EE48fSeNTWWssw8a6vtZW92JX3gJFPTCIGAOoSoPdM3DyOX/DAyjn3lY7PESWmIu YDnep6t/0o9rga3M5uxyeP4KH0h84iEKIkbDRkoAtwiXiugfRmFyI77AIqEpTc0+u2EQ toHAqo+5T2BKaKtUEAi4tFaUiIrD9jorTj+lQB3wOTRkQ/YTl91jK2MZRtf50Z4Xg7CH 2fyA== X-Gm-Message-State: AOAM5308ikcrfuEBPXJS5vYb1OTkWorFEUX1m7yz02aOSrIGZEwEg0EA 8JRAB8TTYyMt/cIAQVqbCcQp7Apu94rL9/Lk X-Google-Smtp-Source: ABdhPJx26ik3ZGFZ3Lvpc2rFPuKqc6fRErUXH9yEt9XHf/Ov2RZAPWhkaK7C4VJYlgEWJKTH1M5xfQ== X-Received: by 2002:a5d:4e08:0:b0:210:297:7d4b with SMTP id p8-20020a5d4e08000000b0021002977d4bmr10294587wrt.112.1653668704887; Fri, 27 May 2022 09:25:04 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:6a82:36c1:b105:e682]) by smtp.gmail.com with ESMTPSA id y12-20020adff6cc000000b0020e6470b2a7sm2049715wrp.85.2022.05.27.09.25.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:25:04 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/2] Revert "qemu.inc: Remove empty egg-info directories before running meson" Date: Fri, 27 May 2022 17:25:02 +0100 Message-Id: <20220527162503.463372-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 ; Fri, 27 May 2022 16:25:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166213 This reverts commit 9d05227e910d3f374ba7a9763ff2584b9e40db61. This is no longer needed with a patch to importlib in python. --- meta/recipes-devtools/qemu/qemu.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 5f303992bed..e4ced6ac27e 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" RDEPENDS:${PN}-ptest = "bash" require qemu-targets.inc -inherit pkgconfig ptest python3-dir +inherit pkgconfig ptest LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" @@ -111,11 +111,7 @@ do_configure:prepend:class-native() { } do_configure() { - # This is taken from meson.bbclass to avoid errors when updating to a - # new version of meson. - rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || : - - ${S}/configure ${EXTRA_OECONF} + ${S}/configure ${EXTRA_OECONF} } do_configure[cleandirs] += "${B}" From patchwork Fri May 27 16:25:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 8580 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 25570C433EF for ; Fri, 27 May 2022 16:25:10 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web08.5743.1653668707120322742 for ; Fri, 27 May 2022 09:25:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=UEi3Xzvv; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.48, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f48.google.com with SMTP id 129-20020a1c0287000000b003974edd7c56so1449111wmc.2 for ; Fri, 27 May 2022 09:25:06 -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=uu3wRLk4lJHlF40IT+jcsZaBB20xsOlsGBzno/Z2OFo=; b=UEi3XzvvwFavkYxJCqyK+4WVXZsXJRzgcZxH3UWexr2bXphCl/A8/ajuNkLQlKXAG2 n/p+H/49byl7XYioIz8Vi4WYueaiWSY/RUWbxgF/MxyTWfpqBQfICk5mIQ8nMkx6PeQ6 sfqTR/AHInNxJahUx0fRhG9y1y9vqWe5sRedQ= 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=uu3wRLk4lJHlF40IT+jcsZaBB20xsOlsGBzno/Z2OFo=; b=wQeduIiJs2plxxSqdjENkMMZRwiragsaoHn9BobxHwQvrT3vhAm3WjWzLNLYzyC6w5 0iWiXRUA9v+M1IvtV3cR+F2TzmZ+Qgp0wPHbkT5rdza0JIxPpo16eIBdPeG6//zQz3tu WWPGHLdcx9mR3RGV75qxfVbmz0IK0j7C3y6ySTZidou5C8xvey98qn5Nj/yEYoZ8L7ez AcMVrvmZ6EuEOQSDgsuSWAMXY2OwEgn8Zwvftc2HHao9Wt/Rw5QHAbqdPV98UjSOJM5f z9IspZ/0YOGPc37GHvRogsH/SpT9dfhTcTuTsvKX9pWNnTJTHLgYYk4JPYXUeBtG+gda /Tig== X-Gm-Message-State: AOAM533CgJvu2AFcK1b38nwtDiYP/d4VfK08bfI4KZz35E6GcqYNul0Y HvVj+T7ylN9qJj/WxP/sK6XD0y2EydZ+Pu85 X-Google-Smtp-Source: ABdhPJwQ4YSzLxuMkeGfmQRl6OXInX8Yx44sJeiKNHtLl/iSca1D6vhTaaZENn7KYNK+X7/ubNsLtQ== X-Received: by 2002:a1c:4c16:0:b0:397:56cd:c8d5 with SMTP id z22-20020a1c4c16000000b0039756cdc8d5mr7842275wmf.4.1653668705503; Fri, 27 May 2022 09:25:05 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:6a82:36c1:b105:e682]) by smtp.gmail.com with ESMTPSA id y12-20020adff6cc000000b0020e6470b2a7sm2049715wrp.85.2022.05.27.09.25.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 09:25:05 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/2] Revert "meson.bblcass: Remove empty egg-info directories before running meson" Date: Fri, 27 May 2022 17:25:03 +0100 Message-Id: <20220527162503.463372-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220527162503.463372-1-richard.purdie@linuxfoundation.org> References: <20220527162503.463372-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 ; Fri, 27 May 2022 16:25:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/166214 This reverts commit 47d9d90b4ec7d04d6f3f1a9b97c0ab7f1264a88e. This is no longer needed with a patch to fix importlib in python. --- meta/classes/meson.bbclass | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 0bfe9458118..b265e6659fe 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -140,16 +140,6 @@ meson_do_configure() { # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 unset LD - # sstate.bbclass no longer removes empty directories to avoid a race (see - # commit 4f94d929 "sstate/staging: Handle directory creation race issue"). - # Unfortunately Python apparently treats an empty egg-info directory as if - # the version it previously contained still exists and fails if a newer - # version is required, which Meson does. To avoid this, make sure there are - # no empty egg-info directories from previous versions left behind. Ignore - # all errors from rmdir since the egg-info may be a file rather than a - # directory. - rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || : - # Work around "Meson fails if /tmp is mounted with noexec #2972" mkdir -p "${B}/meson-private/tmp" export TMPDIR="${B}/meson-private/tmp"