From patchwork Wed Mar 11 17:59:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11432445 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 EE63E913 for ; Wed, 11 Mar 2020 18:01:04 +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 83C3C206E9 for ; Wed, 11 Mar 2020 18:01:04 +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="cuTHg5IT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 83C3C206E9 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 1jC5dx-0006NB-2T; Wed, 11 Mar 2020 17:59:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC5dw-0006N5-87 for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 17:59:44 +0000 X-Inumbo-ID: 13987a5e-63c2-11ea-bec1-bc764e2007e4 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 13987a5e-63c2-11ea-bec1-bc764e2007e4; Wed, 11 Mar 2020 17:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583949579; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K1D50I11UAhWK3G1yzmu7dJk//QmxCBmix8CvBhLtfE=; b=cuTHg5ITW5JPgg+uvj/Oin+ZUW/eELmi546ABkhUkb/us2EvHW9GmVXp N0OEN+4W8Z+eXjHIx55nvUwbTnP+hAqLWvKvkAm+DXpECthKZcnH7KiNc i8rfqwuOrGmxx3A4h49Im73uC9TKzEnrqupQwB+tLdFJ6Vc1MW5sCGW+i k=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: nawCy/aY+goI+Jg2HNDSO91xgolUNJBjtov5exldWZLdwIfZt7TlI6OqfenAVt4AD+m0FxZBmF eIcPO3QmPns6dnv+FiILmVBzcg4BJl2ktQa+xrHFj86e7UV2YX0eJwRO/seB+7F7KkWGmSrqu6 Lo5QvD0yGBuhoKWi5bfIn9bqReRuKfTfktpaU+N8r2XUicXJM3fmLK4VpjTkgyP8iyb0yQXGuH 57Bv4ekWe9rDpBRXDc2Cs8c28oDvsR72WvoyFClsvnC7kRbo5Zwizjc+uMcZ/AY4RiUf1WxT45 UIo= X-SBRS: 2.7 X-MesageID: 14131589 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,541,1574139600"; d="scan'208";a="14131589" From: Anthony PERARD To: Date: Wed, 11 Mar 2020 17:59:33 +0000 Message-ID: <20200311175933.1362235-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200311175933.1362235-1-anthony.perard@citrix.com> References: <20200311175933.1362235-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [XEN PATCH 2/2] tools: Use INSTALL_PYTHON_PROG 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: Anthony PERARD , Ian Jackson , =?utf-8?q?Marek_Marczykowski-G?= =?utf-8?q?=C3=B3recki?= , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Whenever python scripts are install, have the shebang be modified to use whatever PYTHON_PATH is. This is useful for system where python isn't available, or where the package build tools prevent unversioned shebang. INSTALL_PYTHON_PROG only looks for "#!/usr/bin/env python". Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- tools/misc/xencov_split | 2 +- tools/python/Makefile | 4 ++-- tools/xenmon/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/misc/xencov_split b/tools/misc/xencov_split index 1f20518b8637..5771f6cfc285 100755 --- a/tools/misc/xencov_split +++ b/tools/misc/xencov_split @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, os, os.path as path, struct, errno from optparse import OptionParser diff --git a/tools/python/Makefile b/tools/python/Makefile index e99f78a5373a..8d22c0367657 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -20,8 +20,8 @@ install: setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ --root="$(DESTDIR)" --force - $(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index e1712304d07d..3e150b065998 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -32,7 +32,7 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon + $(INSTALL_PYTHON_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon .PHONY: uninstall uninstall: