From nobody Fri Dec 19 20:14:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599220605; cv=none; d=zohomail.com; s=zohoarc; b=UfAfpbT9F3WQx6ba8s/oVHQm7XDEVs3A4B9y5HbC2l5zDKhTsJV8jHNnnlMmG5vKCgnJD/HiUTK51lAahyt+cu+pm7SJloIFuj29zkr1zDKcqI85ojf+v68cbSuN0X1k9d9B7d1J+569Kk3ieBmrJkAnmVHmGhKXiuqpDHb79tM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599220605; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wI7hFWx6sPeGb8YbxWYcUWNm467cVi3XKy83JOcRMFk=; b=QGdAqVu/CeJFvmTSmG4wptPNzOgk1JbPD7Sbfz0Br4yOu4B4UW3ir0GYILZAFY8XWCa4G0x46xgaVqA1yi2GefRmJjsRInC5jB5ENgQZ34fsj6SVo8h/O1rKQ0xT+G4/T+9EBZbFFPYHflaEcV2NEVt5ekuvDbibPS79MnogstY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599220605209865.062830325835; Fri, 4 Sep 2020 04:56:45 -0700 (PDT) Received: from localhost ([::1]:44490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEAKh-0003e9-Bn for importer@patchew.org; Fri, 04 Sep 2020 07:56:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEA6e-0000jj-1h for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:42:12 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:25590 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kEA6b-0005Gl-M4 for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:42:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-NdjqO0EINfi5sdugqyqT1Q-1; Fri, 04 Sep 2020 07:42:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34E468EC16C for ; Fri, 4 Sep 2020 11:41:40 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0433C6024E for ; Fri, 4 Sep 2020 11:41:39 +0000 (UTC) X-MC-Unique: NdjqO0EINfi5sdugqyqT1Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 28/46] meson: compute config_all_devices directly Date: Fri, 4 Sep 2020 07:41:04 -0400 Message-Id: <20200904114122.31307-29-pbonzini@redhat.com> In-Reply-To: <20200904114122.31307-1-pbonzini@redhat.com> References: <20200904114122.31307-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/04 01:57:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" There is no need anymore to produce config-all-devices.mak, compute the resulting dictionary directly instead of going through grepy.sh. Signed-off-by: Paolo Bonzini --- .gitignore | 1 - meson.build | 14 ++------------ scripts/grepy.sh | 3 --- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100755 scripts/grepy.sh diff --git a/.gitignore b/.gitignore index 4ccb9ed975..f3fbd87ce4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /build/ /.doctrees /config-devices.* -/config-all-devices.* /config-all-disas.* /config-host.* /config-target.* diff --git a/meson.build b/meson.build index b71f561c96..037ccd3f4c 100644 --- a/meson.build +++ b/meson.build @@ -455,6 +455,7 @@ endforeach genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 minikconf =3D find_program('scripts/minikconf.py') +config_all_devices =3D {} config_devices_mak_list =3D [] config_devices_h =3D {} config_target_h =3D {} @@ -523,11 +524,11 @@ foreach target : target_dirs config_devices_h +=3D {target: configure_file(output: target + '-confi= g-devices.h', configuration: config_devi= ces_data)} config_target +=3D config_devices + config_all_devices +=3D config_devices endif config_target_mak +=3D {target: config_target} endforeach =20 -grepy =3D find_program('scripts/grepy.sh') # This configuration is used to build files that are shared by # multiple binaries, and then extracted out of the "common" # static_library target. @@ -537,17 +538,6 @@ grepy =3D find_program('scripts/grepy.sh') # targets that are not built for this compilation. The CONFIG_ALL # pseudo symbol replaces it. =20 -if have_system - config_all_devices_mak =3D configure_file( - output: 'config-all-devices.mak', - input: config_devices_mak_list, - capture: true, - command: [grepy, '@INPUT@'], - ) - config_all_devices =3D keyval.load(config_all_devices_mak) -else - config_all_devices =3D {} -endif config_all =3D config_all_devices config_all +=3D config_host config_all +=3D config_all_disas diff --git a/scripts/grepy.sh b/scripts/grepy.sh deleted file mode 100755 index aee46ddc8d..0000000000 --- a/scripts/grepy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -grep -h '=3Dy$' "$@" | sort -u --=20 2.26.2