From patchwork Sat Dec 7 18:18:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11277723 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2036138C for ; Sat, 7 Dec 2019 18:19:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 838C424670 for ; Sat, 7 Dec 2019 18:19:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="gLT2OygX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 838C424670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idees-00083G-Ow; Sat, 07 Dec 2019 18:18:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ideer-00083B-7M for xen-devel@lists.xenproject.org; Sat, 07 Dec 2019 18:18:21 +0000 X-Inumbo-ID: f22fa25a-191d-11ea-a914-bc764e2007e4 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f22fa25a-191d-11ea-a914-bc764e2007e4; Sat, 07 Dec 2019 18:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575742699; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=lKsa37cBBmEzXkKR6QBZn8NlydatO/CmIMaDlkwtEkI=; b=gLT2OygX2MXepA+MlEKP1taCSlDX9h6m9tP63Z59emOrffIDcVdCrULC wuC8wAzuouZHsDDmsXARXP8iAAMsRzCVPv/AdC98BBN4bxWTxV+NgdKS0 dfGcVJB9wd7GnCMHuUeoN4QW6rJssI5YW5sWcKTsT7g2MmL9B+eR60eLj 8=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 2XgBhsiIXrmyezUEdD/tQTKpa7jjjuZg/vexxzKvUlwAP89b6Vj/TSy99hEuDILlyvwkrzSE4T yfIbxrYZB62jkEAeoMTu+ZAM3FxD+4HNktbtIITSFAdaVNFTD5urkk70tneVAKWUpQEGgn8173 RskQNY7t7uVY8lbIRrdgV1r8rfCIiL0K4DItadVaoS1VGB36zrPGnIEBI3JbWBEF8lOe2t6eKa ysoeLVM+P3Hk6GTj7yHBKBnqIkm+0VBm9IF+kuL52ZYz0SFfvfmFQg0t89Z7P7S/L7ZmBx5AOD WYA= X-SBRS: 2.7 X-MesageID: 9906132 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,289,1571716800"; d="scan'208";a="9906132" From: Andrew Cooper To: Xen-devel Date: Sat, 7 Dec 2019 18:18:13 +0000 Message-ID: <20191207181813.30176-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191207181813.30176-1-andrew.cooper3@citrix.com> References: <20191207181813.30176-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 3/3] xen/build: Automatically locate a suitable python interpreter X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Steven Haigh , Jan Beulich , Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Needing to pass PYTHON=python3 into hypervisor builds is irritating and unnecessary. Locate a suitable interpreter automatically, defaulting to Py3 if it is available. Reported-by: Steven Haigh Signed-off-by: Andrew Cooper --- CC: George Dunlap CC: Ian Jackson CC: Jan Beulich CC: Konrad Rzeszutek Wilk CC: Stefano Stabellini CC: Wei Liu CC: Julien Grall CC: Steven Haigh CC: Juergen Gross v2: * Cope with `which` not being present in the system. * Only evaulate the shell command one, rather than once per $(PTHON) usage For 4.13. This is a very-nice-to-have WRT our Py3-clean intention. --- xen/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen/Makefile b/xen/Makefile index 13ae1b6011..4f02aca3ac 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -13,6 +13,11 @@ export XEN_BUILD_TIME ?= $(shell LC_ALL=C date +%T) export XEN_BUILD_HOST ?= $(shell hostname) export XEN_CONFIG_EXPERT ?= n +# Best effort attempt to find a python interpreter, defaulting to Python 3 if +# available. Fall back to just `python` if `which` is nowhere to be found. +PYTHON_INTERPRETER := $(word 1,$(shell which python3 python python2 2>/dev/null) python) +export PYTHON ?= $(PYTHON_INTERPRETER) + export BASEDIR := $(CURDIR) export XEN_ROOT := $(BASEDIR)/..