From nobody Thu May 2 04:09:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1583949639; cv=none; d=zohomail.com; s=zohoarc; b=lOkXB+637zM03dEUKYSO9Bp/mIt9Gy8Prl2aZH1Q7FdSe+8KGLve6Ps/KWZZgnVy50Qo8MnZXSCjcyyW2hZpn7oAhDqMvvJjqoAD9wIRDtdg5oyZgeMZ7sF7AaeBGu5G3+iSnQszx2X74A1BdplpGhdLtaGdJVw36lCD5AdqE/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583949639; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4cwDnR3YSENop9ZA5olzJivnPSM5JzDY9mUUR1zUFDo=; b=DsG0pUIOpk7anNArUqHzxgq8V1RyKOHf3AsgY2sQZRj5oeNloszBsZ7FTYKTV7S22jhwlWTK5qmxkcOxC4IMTNfe+XSShA5ea0NMtfplXKcaqgtajwFZ2RR8poDb0WaD3D8S0QUxz8rKpAjRguUpkpN0IthR3cYrGJhWHifstqU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1583949639173655.7149580149303; Wed, 11 Mar 2020 11:00:39 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC5dr-0006Mu-Q5; Wed, 11 Mar 2020 17:59:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC5dr-0006Mp-A8 for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 17:59:39 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 12f1310e-63c2-11ea-bec1-bc764e2007e4; Wed, 11 Mar 2020 17:59:38 +0000 (UTC) X-Inumbo-ID: 12f1310e-63c2-11ea-bec1-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583949578; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iKjt09WCplqfiGEa8HyXm8pt6eoDbkC3BIkUN/SA+ug=; b=R4IsFviiRTFz+j0139BZp3whmTVZRWMm9Ao2GlaTzjV1khq+KIBseEXN UsDlFVjoSn+KPv5Ji9Smvck3rPGIsNlGePONCQm91b0Da5WlXXkYGNQrx +GW3CARoiq07HMzFyZkhDh5wTecSNLQztwubYamksFdf7eKnZhlIYnOQa M=; 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 (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: tb2awcH2P3tpiRcf0t4EhsacB2bvVURVSGSdqo+5wCQ4f7FpypGkW0rIXBR3OQZp8wxo2n5mSR ChKWjSl51M2JX1+Z5WrRg2ig+alWyHhZHnLF3v4uSOkrY8YNTiXisEiM1oRlDeqAmK6/QbcCTq PWroXD35D6h/eXcQ1+ZmDiku1rR6fba6w/8PzcOr5R1NN5fW8dMTF+77ErSN7e8yiVNiFbT5Ru w4ISk66ITESd2Hopkgz5ZEFtrCCedK6Og9xmMHDijui0pEVZvdiQrxYe1a7CHb5O66t4ZlYfrw 4jM= X-SBRS: 2.7 X-MesageID: 14131587 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="14131587" From: Anthony PERARD To: Date: Wed, 11 Mar 2020 17:59:32 +0000 Message-ID: <20200311175933.1362235-2-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 1/2] tools/python: Fix install-wrap 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=20Marczykowski-G=C3=B3recki?= , Wei Liu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This allows to use install-wrap when the source scripts is in a subdirectory. Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- tools/python/install-wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/python/install-wrap b/tools/python/install-wrap index 00e2014016f9..fef24e01708d 100755 --- a/tools/python/install-wrap +++ b/tools/python/install-wrap @@ -44,7 +44,7 @@ shift destf=3D"$dest" for srcf in ${srcs}; do if test -d "$dest"; then - destf=3D"$dest/${srcf%%*/}" + destf=3D"$dest/${srcf##*/}" fi org=3D"$(sed -n '2q; /^#! *\/usr\/bin\/env python *$/p' $srcf)" if test "x$org" =3D x; then --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Thu May 2 04:09:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1583949635; cv=none; d=zohomail.com; s=zohoarc; b=KqWGbEBGwcZUmn8PnM0iiptFXjGHAiwkak5WTmXb6GWbifQtQ3kGaZabUuHtkLVzmZb2/3e2PeMhrVq+hfiZdBKP9Cll2RJpnaJjah2uob3/d4Bbe5Dq66A6K3sg2qJpSxmTz6XVs6BBpFLvdMjR8067BUneQu1v3FfEofJ5/FM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583949635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4HngALNhjpcAEsu3OqdQfvOBG2XYM3KXGclcxuQPIQU=; b=Z460KyBDp9t3HyTeBXyuoxilVLQ33sH/lok0jTJULJUzJdhpBzwCYItq5W6JOcTXFngaICXBtBRshjhehAkfNXnxzMIyljPKHJ8K8qqM2xbPcJ2jGSqGNTRfqVDiu6YZBPhaMfU0yoq9qTLHUbUxBzmj7nCL3gtROZlJBmugJdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1583949635516673.232822564998; Wed, 11 Mar 2020 11:00:35 -0700 (PDT) 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 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) X-Inumbo-ID: 13987a5e-63c2-11ea-bec1-bc764e2007e4 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 (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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=20Marczykowski-G=C3=B3recki?= , Wei Liu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 avail= able, 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 =20 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=3D"$(DESTDIR)" --force =20 - $(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) =20 .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 =20 .PHONY: uninstall uninstall: --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel