@@ -211,13 +211,13 @@ job_create_test () {
xen-3.*-testing:*) ;;
xen-4.0-testing:*) ;;
xen-4.1-testing:*) ;;
+ *:libvirt) tsbuildjob="libvirtbuildjob=$buildjob-libvirt"
+ ;;
xen-4.2-testing:*) ;;
xen-4.3-testing:*) ;;
*:xend) xenbuildjob="$xenbuildjob-xend"
buildjob="${bfi}build-$dom0arch-xend"
;;
- *:libvirt) tsbuildjob="libvirtbuildjob=$buildjob-libvirt"
- ;;
esac
./cs-job-create $flight $job $recipe toolstack=$toolstack \
@@ -48,12 +48,21 @@ sub checkout () {
}
sub config() {
+ my $xenprefix;
+ foreach (qw(/usr/local /usr)) {
+ if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) {
+ $xenprefix="$xendist$_";
+ last;
+ }
+ }
+ die "no xen prefix" unless $xenprefix;
+
# Uses $GNULIB_SRCDIR because ./autogen.sh doesn't propagate
# --gnulib-srcdir to ./bootstap.
target_cmd_build($ho, 3600, $builddir, <<END);
cd libvirt
- CFLAGS="-I$xendist/usr/local/include/" \\
- LDFLAGS="-L$xendist/usr/local/lib/ -Wl,-rpath-link=$xendist/usr/local/lib/" \\
+ CFLAGS="-I$xenprefix/include/" \\
+ LDFLAGS="-L$xenprefix/lib/ -Wl,-rpath-link=$xenprefix/lib/" \\
GNULIB_SRCDIR=$builddir/gnulib-libvirt \\
./autogen.sh --no-git \\
--with-libxl --without-xen --without-xenapi --without-selinux \\
libvirt supports Xen 4.2 onwards. However: - We were not correctly setting the libvirtbuildjob runvar on 4.3 and earlier. - Xen 4.2 installs to /usr not /usr/local so the CFLAGS/LDFLAGS used to build libvirt were wrong. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- mfi-common | 4 ++-- ts-libvirt-build | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-)