From nobody Mon Apr 29 14:06:31 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=1575753460; cv=none; d=zohomail.com; s=zohoarc; b=IL5xsjRGTkPvrTX35Kub7NS9rX91IuYYux8uBexLly2Gprc4GWkIWxupHcX4UiGPWOoyqBLNAs5pZnpWgVRzRdJ3hAyh3Vj3T7Ja0855FGPRKsFVAaWnfJhUvj0u7z9fSBxVr3p1a1uG51hGEIBW1RybgCW9+XosztpchnnpQFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575753460; 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=1Bo9XgnqLUjC4Z29e2okqJ6fR7TXb5OpNF4Ki6I13EM=; b=GJuHFtm3wy9j0/kD7K9NVwJA9E4xuij7uyAgWXeEiRYTs7hxHXivZlyfQ+CbgJ147UbhCKRowjsRw2bQXI4C+GOxZiU3TuVcSxK+2kau3uz3TqOkckYpqG156uzo2j5Ktg0PpIIVk92ZsoGARCN+R3O8kdWwfxuaNHja3h/iLkc= 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 1575753460668483.476495271448; Sat, 7 Dec 2019 13:17:40 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idhRd-0005v1-CV; Sat, 07 Dec 2019 21:16:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idhRb-0005uw-KJ for xen-devel@lists.xenproject.org; Sat, 07 Dec 2019 21:16:51 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e1d0c9a2-1936-11ea-8621-12813bfff9fa; Sat, 07 Dec 2019 21:16:50 +0000 (UTC) X-Inumbo-ID: e1d0c9a2-1936-11ea-8621-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575753410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=2HKfHf1ZOGx8QLyGYqdyvRKBqHqqaAVsYsoH+JPY94M=; b=RALomlPlb37VkuUBIuKL1fqdn+LMqbozZp2FSqkV7JMPjmoSFGZDKn7U q+H8g+T9aGnYNugAVRzbhYqJ9/mxDyWjxhvK7ayCja36UTcUUa7G2WnPZ 4u8t8ohWeG7Wi+CFDiZhQzQ0BCYVR5A3noIw5YAU7MtWIb/qn0nHhpDA3 k=; Authentication-Results: esa2.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 (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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.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=esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: bXWHwkXDAZEQgPa76oTVnzfMATIXGTjw8pB9wXAvP7oDuk8rnLFPP4nWjyZjJcUqIvnciqNs81 LoDeEUBFxZ7+XZLFziIeScQnLuL17HsBZSvYmjYO9rKYldWcywqy5rB/+3uAPKpch3BCHXXMe1 8anuBjtNtH6JxXy8I7gKh9Uiz1D0WYL3gJ1ETKx2N0Jef9h4/eXIg0lU//hsy6TXcu80qCevsp RDx8U/+6FgX7B4InCqd6+E/LuKNGiRZjkDZNEUQQsK3MFom0XBLYWla0YgNcvMnz+2h/UokWws nQY= X-SBRS: 2.7 X-MesageID: 9355332 X-Ironport-Server: esa2.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="9355332" From: Andrew Cooper To: Xen-devel Date: Sat, 7 Dec 2019 21:16:32 +0000 Message-ID: <20191207211634.9958-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191207211634.9958-1-andrew.cooper3@citrix.com> References: <20191207211634.9958-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 1/3] xen/flask: Drop the gen-policy.py script 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 , Andrew Cooper , Daniel De Graaf 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) The script is Python 2 specific, and fails with string/binary issues with Python 3: Traceback (most recent call last): File "gen-policy.py", line 14, in for char in sys.stdin.read(): File "/usr/lib/python3.5/codecs.py", line 321, in decode (result, consumed) =3D self._buffer_decode(data, self.errors, final) UnicodeDecodeError: 'utf-8' codec can't decode byte 0x8c in position 0: i= nvalid start byte Fixing the script to be compatible isn't hard, but using python here is wasteful. Drop the script entirely, and write a short flask-policy.S inste= ad. Signed-off-by: Andrew Cooper --- CC: Daniel De Graaf CC: Juergen Gross v2: * Fix tabs vs spaces issues v3: * Use % rather than @ for progbits/object, for Arm32 build. * Spotted by https://travis-ci.org/andyhhp/xen/builds/622085138 For 4.13. This is a blocker to our intent to by Py3-clean in this release. Discovered entirely accidently when testing the final patch. --- xen/xsm/flask/Makefile | 6 ++---- xen/xsm/flask/flask-policy.S | 20 ++++++++++++++++++++ xen/xsm/flask/gen-policy.py | 23 ----------------------- 3 files changed, 22 insertions(+), 27 deletions(-) create mode 100644 xen/xsm/flask/flask-policy.S delete mode 100644 xen/xsm/flask/gen-policy.py diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index f5ffab1226..7c3f381287 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -27,7 +27,8 @@ $(FLASK_H_FILES): $(FLASK_H_DEPEND) $(AV_H_FILES): $(AV_H_DEPEND) $(CONFIG_SHELL) policy/mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) =20 -obj-$(CONFIG_XSM_FLASK_POLICY) +=3D policy.o +obj-bin-$(CONFIG_XSM_FLASK_POLICY) +=3D flask-policy.o +flask-policy.o: policy.bin =20 FLASK_BUILD_DIR :=3D $(CURDIR) POLICY_SRC :=3D $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) @@ -36,9 +37,6 @@ policy.bin: FORCE $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common -C $(XEN_ROOT)/= tools/flask/policy FLASK_BUILD_DIR=3D$(FLASK_BUILD_DIR) cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@ =20 -policy.c: policy.bin gen-policy.py - $(PYTHON) gen-policy.py < $< > $@ - .PHONY: clean clean:: rm -f $(ALL_H_FILES) *.o $(DEPS_RM) policy.* $(POLICY_SRC) diff --git a/xen/xsm/flask/flask-policy.S b/xen/xsm/flask/flask-policy.S new file mode 100644 index 0000000000..81bfc09ec2 --- /dev/null +++ b/xen/xsm/flask/flask-policy.S @@ -0,0 +1,20 @@ + .section .init.rodata, "a", %progbits + +/* const unsigned char xsm_flask_init_policy[] __initconst */ + .align 4 + .global xsm_flask_init_policy +xsm_flask_init_policy: + .incbin "policy.bin" +.Lend: + + .type xsm_flask_init_policy, %object + .size xsm_flask_init_policy, . - xsm_flask_init_policy + +/* const unsigned int __initconst xsm_flask_init_policy_size */ + .align 4 + .global xsm_flask_init_policy_size +xsm_flask_init_policy_size: + .long .Lend - xsm_flask_init_policy + + .type xsm_flask_init_policy_size, %object + .size xsm_flask_init_policy_size, . - xsm_flask_init_policy_size diff --git a/xen/xsm/flask/gen-policy.py b/xen/xsm/flask/gen-policy.py deleted file mode 100644 index c7501e4614..0000000000 --- a/xen/xsm/flask/gen-policy.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -import sys - -policy_size =3D 0 - -sys.stdout.write(""" -/* This file is autogenerated by gen_policy.py */ -#include -#include - -const unsigned char xsm_flask_init_policy[] __initconst =3D { -""") - -for char in sys.stdin.read(): - sys.stdout.write(" 0x%02x," % ord(char)) - policy_size =3D policy_size + 1 - if policy_size % 13 =3D=3D 0: - sys.stdout.write("\n") - -sys.stdout.write(""" -}; -const unsigned int __initconst xsm_flask_init_policy_size =3D %d; -""" % policy_size) --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Mon Apr 29 14:06:31 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=1575753456; cv=none; d=zohomail.com; s=zohoarc; b=DSB3MyyFcOu3l4t0YF4KA+CKxpzOzuFcds/As5wo3jbN8MIYv4wGkqROxPGujuLrmR1IeVkHXBWvlG3bTxbgG4/rxugyb6yDtlIdQLsBsYFtqSUBj6UdOnL9EFlPib+QZwhvZY69dl+xOQRTVpkSfs16g9+mNK20YdqL9x2+5ek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575753456; 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=s14aHKI/1iZflQEqC5sVfUpYm4gdU19PWQhkemnSvBU=; b=E7ltd4FjoPMr7XG0Jp1jBRp5Cd5GitFxyDNvXDYgAOOVfPFrRqya7TfprkqAUd85ICIcm6ACS/ezUNubrjSUOd6ZQZTiXij6rOSqUQM3uIZHHyyyNhcgb9avXD+kpOWWX++m6QfKf/eowE5uBfAfW6b3Ex800rsUZGTkO0evmzc= 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 1575753456538727.9425473290805; Sat, 7 Dec 2019 13:17:36 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idhRT-0005um-3T; Sat, 07 Dec 2019 21:16:43 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idhRR-0005uh-HZ for xen-devel@lists.xenproject.org; Sat, 07 Dec 2019 21:16:41 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id dc24cb0c-1936-11ea-b6f1-bc764e2007e4; Sat, 07 Dec 2019 21:16:40 +0000 (UTC) X-Inumbo-ID: dc24cb0c-1936-11ea-b6f1-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575753400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=4NCpEm4Vixmvap6emYnGF0SG/ewK6VB1f2D+wpEBaeI=; b=ThOhgJ5NyhSmZLJ3Ch14OfCg3NSUuIBWkPyXMJIHoxiwICoLKP57eDTa bvHTUs992evc9jv/ArOp7N/rMfZaGt+wsVMXA1VR1+0z9kkyP/LgTodNT i2RxQbPNXbIthDZ2kSoHLak2m4+45ogqzH+Pkjmf/pY3eEUAaVIGS1jPX k=; Authentication-Results: esa5.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 (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 andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.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=esa5.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 (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="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: HgQTDq127mAbocphYKwfGx/OJxwParejFGZDoNEYPD9kffqTHs01+GEng/XV2zaJVWiirwVaEC ElPKHkzJf5h7W9Z3mgp7YYT/VN6XfADwfVzZfmypFwTIZP3/0bYqXHxOmtohW4am0SF3LRuu4z X8Sy3lZeuulJfJf+Fd7U0VvXi6xUv90thKu7XP7iGwjsSx2c1PxugRtNvMMfv29xJbeFmBZBFK cGKhm7ORm6RgBP5aP7zOzUgdpC3I+S1bIbxFfT59bj0W28EY0r0jzLHekxJRKyrFeFvWhlRTXp B1U= X-SBRS: 2.7 X-MesageID: 9707384 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.69,289,1571716800"; d="scan'208";a="9707384" From: Andrew Cooper To: Xen-devel Date: Sat, 7 Dec 2019 21:16:33 +0000 Message-ID: <20191207211634.9958-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191207211634.9958-1-andrew.cooper3@citrix.com> References: <20191207211634.9958-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 2/3] xen/banner: Drop the fig-to-oct.py script 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 , Jan Beulich , Ian Jackson 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) The script is 664 rather than 775, so the banner conversion doesn't actually work if $(PYTHON) is empty: /bin/sh: tools/fig-to-oct.py: Permission denied make[3]: *** [include/xen/compile.h] Error 126 make[3]: Leaving directory `/builds/xen-project/people/andyhhp/xen/xen' Fixing this is easy, but using python here is wasteful. compile.h doesn't need XEN_BANNER rendering in octal, and text is much more simple to handle. Replace fig-to-oct.py with a smaller sed script. This could be a shell one-liner, but it is much more simple to comment sensibly, and doesn't need= to include the added cognative load of makefile and shell escaping. While changing this logic, take the opportunity to optimise the banner space (and time on the serial port) by dropping trailing whitespace, which = is 84 characters for current staging. Signed-off-by: Andrew Cooper Acked-by: George Dunlap --- CC: George Dunlap CC: Ian Jackson CC: Jan Beulich CC: Konrad Rzeszutek Wilk CC: Stefano Stabellini CC: Wei Liu CC: Julien Grall CC: Juergen Gross v2: * New v3: * Fix error: backslash-newline at end of file [-Werror] * Implement as a sed script. This (v3) is how happy in the CI: https://gitlab.com/xen-project/people/andyhhp/xen/pipelines/101409945 Spotted by Gitlab CI, caused by `which` not being present in some of the CentOS containers. While this is more of a container bug than anything els= e, it does highlight that the build ought to cope. --- xen/Makefile | 2 +- xen/tools/fig-to-oct.py | 18 ------------------ xen/tools/process-banner.sed | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 xen/tools/fig-to-oct.py create mode 100755 xen/tools/process-banner.sed diff --git a/xen/Makefile b/xen/Makefile index 99701e3165..949ca6eb03 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -176,7 +176,7 @@ include/xen/compile.h: include/xen/compile.h.in .banner -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "una= vailable")!g' \ < include/xen/compile.h.in > $@.new @cat .banner - @$(PYTHON) tools/fig-to-oct.py < .banner >> $@.new + @sed -rf tools/process-banner.sed < .banner >> $@.new @mv -f $@.new $@ =20 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s diff --git a/xen/tools/fig-to-oct.py b/xen/tools/fig-to-oct.py deleted file mode 100644 index db4fd32159..0000000000 --- a/xen/tools/fig-to-oct.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python -import sys - -chars_per_line =3D 18 -chars_so_far =3D 0 - -sys.stdout.write('"') - -for char in sys.stdin.read(): - - sys.stdout.write("\\%03o" % ord(char)) - chars_so_far =3D chars_so_far + 1 - - if chars_so_far =3D=3D chars_per_line: - chars_so_far =3D 0 - sys.stdout.write('" \\\n"') - -sys.stdout.write('"\n') diff --git a/xen/tools/process-banner.sed b/xen/tools/process-banner.sed new file mode 100755 index 0000000000..56c76558bc --- /dev/null +++ b/xen/tools/process-banner.sed @@ -0,0 +1,14 @@ +#!/bin/sed -rf +# Process a text input, to turn it into a C string for the XEN_BANNER macr= o. + +# Strip trailing whitespace. +s_ *$__ + +# Escape backslashes. +s_\\_\\\\_g + +# Enclose the line in "...\n". +s_(.*)_"\1\\n"_ + +# Trailing \ on all but the final line. +$!s_$_ \\_ --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Mon Apr 29 14:06:31 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=1575753458; cv=none; d=zohomail.com; s=zohoarc; b=PXJ1u2d/UNeMZfNi1D0SQMl60dZ/+g+jc/YwlT/5TES0eQn0fSsiWyjD0fBHBq+zAycbZ8VLPf0nq9ivlBJeVzIkzwZUYxnXxSxEiFvWvXbx2QWSwVcMe++FoLjfWd+T9RopsBtNgl7VCqDUniOBEpTU8e1V2HLGSOQbDtViXuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575753458; 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=szyfr4LzZgqD04Yz6khurBku8Kxeunz9MRPt/XPu/4k=; b=BsVPIu6GrtdO80k5fE4THahlpcLqsqDfbM+XlD80eU/M1yyBSPRX5Trq5Rl2Lz9YjnaFnLkLQezZWFY9A7YidRaP1pDIMpuEqurwgRV2MkTxBaf/ActIDQMnH/IYLu+uGjXy9UuXrqjXSQCEKCZNqmTqWi4/7X9PTFN7vwRZ4/8= 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 1575753458202524.0673725286348; Sat, 7 Dec 2019 13:17:38 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idhRl-0005y4-VO; Sat, 07 Dec 2019 21:17:01 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idhRl-0005xu-GW for xen-devel@lists.xenproject.org; Sat, 07 Dec 2019 21:17:01 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e2eea48a-1936-11ea-8621-12813bfff9fa; Sat, 07 Dec 2019 21:16:51 +0000 (UTC) X-Inumbo-ID: e2eea48a-1936-11ea-8621-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575753412; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=x65yPkRzbRP8bz+lg02qKJ5UXlvVqui0Ev1WEd8Adok=; b=gxOYvLYjwY/xArYoEcRbcZdRCpoZUFpmNIF0SZ1yx7TV2csO7lt0n9cY m+tmDNdob7LVd4Edd+yhKLZnY2JIwbxX5MqzHvfEgaSUfUGr4D5dCA1Cs nXw15LQSf9QDU6bMaJgCNGNMp7mcuw9xkj4HAw49F4xrSZgQAAnQwNPVl 8=; Authentication-Results: esa2.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 (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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.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=esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 1hYMHB+ENX9We1s8UfpPB64NWPIctlhuCd+Oj/7VyeV2I854O71hPLZ+VhDB+0unf9SRUrwzA6 fg4oDmuouqVdjphi01LzCdp0ihhFVEHVWESWcfQx6PT7iNXnvt4Gy8e6hkx5LD68Ujf/zxMthn UhLT0n8KGv358FdDW7yLOwKRvV1R0MZ+e3YwHiyzvjrVhLTMNCWhyfvSiAqbsJlteuGkLZKoiX 6o1AOVfeyvHVQZo4T1O0w58dTtBjkjicVksnQbG2mC0nJCqV2K6Uvi9wHqGmDnzWPMZVvdYTU8 CLg= X-SBRS: 2.7 X-MesageID: 9355333 X-Ironport-Server: esa2.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="9355333" From: Andrew Cooper To: Xen-devel Date: Sat, 7 Dec 2019 21:16:34 +0000 Message-ID: <20191207211634.9958-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191207211634.9958-1-andrew.cooper3@citrix.com> References: <20191207211634.9958-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 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 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) Needing to pass PYTHON=3Dpython3 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 Acked-by: George Dunlap --- 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 949ca6eb03..f36a5bc6c0 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -13,6 +13,11 @@ export XEN_BUILD_TIME ?=3D $(shell LC_ALL=3DC date +%T) export XEN_BUILD_HOST ?=3D $(shell hostname) export XEN_CONFIG_EXPERT ?=3D n =20 +# 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 :=3D $(word 1,$(shell which python3 python python2 2>/d= ev/null) python) +export PYTHON ?=3D $(PYTHON_INTERPRETER) + export BASEDIR :=3D $(CURDIR) export XEN_ROOT :=3D $(BASEDIR)/.. =20 --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel