From nobody Thu May 2 15:38:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1561450543; cv=none; d=zoho.com; s=zohoarc; b=H6E7MxgJqeA8ppbvie8wDHRpwwJV8fUKS8id/TCmr5RBfRrdZ+hIPpvn5DXKGG008oq+ulww6abQKlzUiNJOCAoU3crQ/DN0juZbBBGp1SEP3EVZC+MkihD+szR+QegfaKdBA62cVsOsuRrpu4u+l/T+6FI6N4smkDI8mr4qj0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561450543; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=i8MKkqHmm6nURbGaZ6qb92ZMP1ot2tc/ralIbqNbx2w=; b=Zlg8b5XKosm08dEiZZDi9OcC6lJ45BF/2Tl9Hm838F+QfOBZbvUKzHA27wgsKmBAYbr31weJekrinsPMbVOHoNtLdSpXqjht81mrxOCE8WDX0EcX+skmYfljaZjbk5+TL4akFA5P1EhtVNxS1xmf2Sx+G0KTK7rAtBAWZpqB70U= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1561450543061488.008694234265; Tue, 25 Jun 2019 01:15:43 -0700 (PDT) Received: from localhost ([::1]:57402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfgbm-0002Sb-M1 for importer@patchew.org; Tue, 25 Jun 2019 04:15:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48409) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfgaG-0001Uv-Is for qemu-devel@nongnu.org; Tue, 25 Jun 2019 04:13:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfgaF-0000Sx-G7 for qemu-devel@nongnu.org; Tue, 25 Jun 2019 04:13:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49278) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfgaE-0000Qr-MU for qemu-devel@nongnu.org; Tue, 25 Jun 2019 04:13:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5995D308A9BE for ; Tue, 25 Jun 2019 08:13:41 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-27.ams2.redhat.com [10.36.112.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80FBF5C231; Tue, 25 Jun 2019 08:13:40 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 25 Jun 2019 10:13:39 +0200 Message-Id: <20190625081339.9176-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 25 Jun 2019 08:13:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] minikconf: do not include variables from MINIKCONF_ARGS in config-all-devices.mak 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: , Cc: Christophe de Dinechin Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When minikconf writes config-devices.mak, it includes all variables includi= ng those from MINIKCONF_ARGS. This causes values from config-host.mak to "sti= ck" to the ones used in generating config-devices.mak, because config-devices.mak = is included after config-host.mak. Avoid this by omitting assignments coming from the command line in the output of minikconf. Reported-by: Christophe de Dinechin Signed-off-by: Paolo Bonzini Reviewed-by: Christophe de DInechin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Christophe de Dinechin Tested-by: Philippe Mathieu-Daud=C3=A9 --- scripts/minikconf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 0ffc6c38da..3109a81db7 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -688,11 +688,13 @@ if __name__ =3D=3D '__main__': =20 data =3D KconfigData(mode) parser =3D KconfigParser(data) + external_vars =3D set() for arg in argv[3:]: m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) if m is not None: name, value =3D m.groups() parser.do_assignment(name, value =3D=3D 'y') + external_vars.add(name[7:]) else: fp =3D open(arg, 'r') parser.parse_file(fp) @@ -700,7 +702,8 @@ if __name__ =3D=3D '__main__': =20 config =3D data.compute_config() for key in sorted(config.keys()): - print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) + if key not in external_vars: + print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) =20 deps =3D open(argv[2], 'w') for fname in data.previously_included: --=20 2.21.0