[Xen-devel,OSSTEST] Apply PYTHON_PREFIX_ARG workaround to Xen 4.2 and earlier(Was: Re: [xen-4.2-testing test] 25126: regressions - FAIL)

Message ID 1392807567.23084.127.camel@kazak.uk.xensource.com
State New
Headers show

Commit Message

Ian Campbell Feb. 19, 2014, 10:59 a.m.
On Wed, 2014-02-19 at 10:37 +0000, Ian Campbell wrote:
> I wonder if we need to apply:
> http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout

Like this, tested only the make-flight bit and ran perl -c on
ts-xen-build to check syntax.

8<-------------------

From 58f45b8855c35297958fef0f0213878856f9b3bf Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 19 Feb 2014 10:54:54 +0000
Subject: [PATCH] Apply PYTHON_PREFIX_ARG workaround to Xen 4.2 and earlier

...rather than applying only if the host is Squeeze, since this also happens on
Wheezy. Xen 4.3 onwards are not affected because they install to /usr/local
instead of /usr which avoids this particular issue.

The workaround is described in
http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout

We set PYTHON_PREFIX_ARG='' since that is what we did on Squeeze although that
is a specific quirk of Ubuntu and we could use --install-layout=deb.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 mfi-common   | 14 ++++++++++++--
 ts-xen-build |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

Patch

diff --git a/mfi-common b/mfi-common
index 8f56092..f443783 100644
--- a/mfi-common
+++ b/mfi-common
@@ -120,6 +120,16 @@  create_build_jobs () {
     *) enable_ovmf=true;
     esac
 
+    # http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout
+    # applies to Xen 4.2 and earlier.
+    case "$xenbranch" in
+    xen-3.*-testing) python_runvars=python_prefix_arg=;;
+    xen-4.0-testing) python_runvars=python_prefix_arg=;;
+    xen-4.1-testing) python_runvars=python_prefix_arg=;;
+    xen-4.2-testing) python_runvars=python_prefix_arg=;;
+    *)               python_runvars=;;
+    esac
+
     eval "
         arch_runvars=\"\$ARCH_RUNVARS_$arch\"
     "
@@ -132,7 +142,7 @@  create_build_jobs () {
         tree_qemuu=$TREE_QEMU_UPSTREAM                                       \
         tree_xen=$TREE_XEN                                                   \
                 $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars     \
-                $suite_runvars                                               \
+                $suite_runvars $python_runvars                               \
                 host_hostflags=$build_hostflags                              \
                 revision_xen=$REVISION_XEN                                   \
                 revision_qemu=$REVISION_QEMU                                 \
@@ -145,7 +155,7 @@  create_build_jobs () {
         tree_qemuu=$TREE_QEMU_UPSTREAM                                       \
         tree_xen=$TREE_XEN                                                   \
                 $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars     \
-                $suite_runvars                                               \
+                $suite_runvars $python_runvars                               \
                 host_hostflags=$build_hostflags                              \
                 revision_xen=$REVISION_XEN                                   \
                 revision_qemu=$REVISION_QEMU                                 \
diff --git a/ts-xen-build b/ts-xen-build
index 74d17f0..d228fb7 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -88,8 +88,8 @@  END
                (nonempty($r{revision_linux}) ? <<END : '').
 	echo >>.config export $linux_rev_envvar='$r{revision_linux}'
 END
-               ($ho->{Suite} =~ m/squeeze/ ? <<END : '').
-	echo >>.config PYTHON_PREFIX_ARG=
+               (defined($r{python_prefix_arg}) ? <<END : '').
+	echo >>.config PYTHON_PREFIX_ARG=$r{python_prefix_arg}
 END
                (nonempty($kerns) ? <<END : <<END)
 	echo >>.config KERNELS='$kerns'