diff options
author | Christopher Clark <christopher.w.clark@gmail.com> | 2020-02-25 16:15:59 -0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-02-27 16:59:23 -0500 |
commit | f4eec68635bc516ce99c804bdc876f74dd4523fc (patch) | |
tree | 149b04d3a85851703a72346b9b9247e5ce025b3c /recipes-extended/xen/xen.inc | |
parent | 593df044c6a18ac3594215f5b93ecbc3ceab9f44 (diff) | |
download | meta-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/xen.inc')
-rw-r--r-- | recipes-extended/xen/xen.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index b2af8aa7..0bfe72da 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc | |||
@@ -43,7 +43,7 @@ DEPENDS = " \ | |||
43 | pciutils \ | 43 | pciutils \ |
44 | pixman \ | 44 | pixman \ |
45 | procps \ | 45 | procps \ |
46 | python \ | 46 | python3 \ |
47 | libaio \ | 47 | libaio \ |
48 | lzo \ | 48 | lzo \ |
49 | util-linux \ | 49 | util-linux \ |
@@ -77,8 +77,8 @@ libexecdir = "${libdir}" | |||
77 | export XEN_OS = "Linux" | 77 | export XEN_OS = "Linux" |
78 | 78 | ||
79 | # this is used for the header (#!${bindir}/python) of the install python scripts | 79 | # this is used for the header (#!${bindir}/python) of the install python scripts |
80 | export PYTHONPATH="${bindir}/python" | 80 | export PYTHONPATH="${bindir}/env python3" |
81 | export ac_cv_path_PYTHONPATH="${bindir}/python" | 81 | export ac_cv_path_PYTHONPATH="${bindir}/env python3" |
82 | export DISTUTILS_BUILD_ARGS | 82 | export DISTUTILS_BUILD_ARGS |
83 | export DISTUTILS_INSTALL_ARGS | 83 | export DISTUTILS_INSTALL_ARGS |
84 | 84 | ||
@@ -207,6 +207,7 @@ EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y" | |||
207 | EXTRA_OEMAKE += "debug=n" | 207 | EXTRA_OEMAKE += "debug=n" |
208 | 208 | ||
209 | do_configure_common() { | 209 | do_configure_common() { |
210 | cd ${S} | ||
210 | 211 | ||
211 | #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually | 212 | #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually |
212 | if [ "${XSM_ENABLED}" = "1" ]; then | 213 | if [ "${XSM_ENABLED}" = "1" ]; then |
@@ -222,7 +223,9 @@ do_configure_common() { | |||
222 | 223 | ||
223 | # do configure | 224 | # do configure |
224 | oe_runconf EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}" \ | 225 | oe_runconf EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}" \ |
225 | EXTRA_CFLAGS_XEN_TOOLS="${EXTRA_CFLAGS_XEN_TOOLS}" | 226 | EXTRA_CFLAGS_XEN_TOOLS="${EXTRA_CFLAGS_XEN_TOOLS}" \ |
227 | PYTHON="${PYTHON}" | ||
228 | |||
226 | if [ ! -e ${STAGING_INCDIR}/bits/long-double-32.h ]; then | 229 | if [ ! -e ${STAGING_INCDIR}/bits/long-double-32.h ]; then |
227 | cp ${STAGING_INCDIR}/bits/long-double-64.h ${STAGING_INCDIR}/bits/long-double-32.h | 230 | cp ${STAGING_INCDIR}/bits/long-double-64.h ${STAGING_INCDIR}/bits/long-double-32.h |
228 | fi | 231 | fi |