summaryrefslogtreecommitdiffstats
path: root/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch
diff options
context:
space:
mode:
authorChristopher Clark <christopher.w.clark@gmail.com>2020-02-25 16:15:59 -0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-02-27 16:59:23 -0500
commitf4eec68635bc516ce99c804bdc876f74dd4523fc (patch)
tree149b04d3a85851703a72346b9b9247e5ce025b3c /recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch
parent593df044c6a18ac3594215f5b93ecbc3ceab9f44 (diff)
downloadmeta-virtualization-f4eec68635bc516ce99c804bdc876f74dd4523fc.tar.gz
xen, xen-tools: update recipes for python3
Adds patches for packaged scripts to enable deployment with python3 where they have been ported to python 3 upstream. setuptools3 inherits distutils3 which modifies ${B}, so cd ${S} is needed in the do_configure, do_compile and do_install steps. Remove python 2 dependency from the Xen recipes by adding a new separate recipe, xen-python2, for packaging the remaining optional scripts which are yet to be ported to python 3. Package naming in the separate recipe is chosen to support transition back into the xen-tools recipe if the scripts are ported later. Use RSUGGESTS to support inclusion of the xen-python2 scripts in images that include python 2. Drop the remus package python dependency since the script was removed in 2014: commit 5b66f84e37a45038f9e5dae7a5768a5525d1e6ba Add python3 RDEPENDS needed to run xenmon. Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch')
-rw-r--r--recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch b/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch
new file mode 100644
index 00000000..d913be20
--- /dev/null
+++ b/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch
@@ -0,0 +1,40 @@
1From b9e1368af14ded6aee3bdf64e8329628b16291ff Mon Sep 17 00:00:00 2001
2From: Wei Liu <wei.liu2@citrix.com>
3Date: Mon, 11 Mar 2019 12:55:29 +0000
4Subject: [PATCH] pygrub: change tabs into spaces
5
6Not sure why Python 2 never complained, but Python 3 does.
7
8Change tabs to spaces.
9
10Signed-off-by: Wei Liu <wei.liu2@citrix.com>
11Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
12---
13 tools/pygrub/src/pygrub | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
17index 52a8965ad9..1189b1ca48 100755
18--- a/tools/pygrub/src/pygrub
19+++ b/tools/pygrub/src/pygrub
20@@ -858,7 +858,7 @@ if __name__ == "__main__":
21 output_directory = a
22
23 if debug:
24- logging.basicConfig(level=logging.DEBUG)
25+ logging.basicConfig(level=logging.DEBUG)
26
27
28 try:
29@@ -917,7 +917,7 @@ if __name__ == "__main__":
30 # IOErrors raised by fsimage.open
31 # RuntimeErrors raised by run_grub if no menu.lst present
32 if debug:
33- traceback.print_exc()
34+ traceback.print_exc()
35 fs = None
36 continue
37
38--
392.17.1
40