[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTEST PATCH 2/2] ts-libvirt-build: Do an out-of-tree build
Recent versions of libvirt do not support in-tree builds (!) Cope with this by always building in a subdirectory `build' (a subdirectory of the source tree); this is the arrangement which the libvirt upstream messages and documentation now seem to recommend (at least where things have been updated). I compared the differences in build output between the results of this branch and a previous passing xen-unstable flight. The libvirt library version increased and a file usr/local/share/libvirt/cpu_map/arm_features.xml appeared. I think this is just due to changes in the libvirt version, 2cff65e4c60e..70218e10bcde, in particular 0de541bfc575 cpu_map: Ship arm_features.xml I also tested that a test job, built with current libvirt and these osstest changes, passes as expected. CC: Jim Fehlig <jfehlig@xxxxxxxx> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> Tested-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- ts-libvirt-build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ts-libvirt-build b/ts-libvirt-build index 2a363f43..e799f003 100755 --- a/ts-libvirt-build +++ b/ts-libvirt-build @@ -58,11 +58,13 @@ sub config() { my $gnulib = submodule_find($submodules, "gnulib"); target_cmd_build($ho, 3600, $builddir, <<END); cd libvirt + mkdir build + cd build CFLAGS="-g -I$xenprefix/include/" \\ LDFLAGS="-g -L$xenprefix/lib/ -Wl,-rpath-link=$xenprefix/lib/" \\ PKG_CONFIG_PATH="$xenprefix/lib/pkgconfig/" \\ GNULIB_SRCDIR=$builddir/libvirt/$gnulib->{Path} \\ - ./autogen.sh --no-git \\ + ../autogen.sh --no-git \\ --with-libxl --without-xen --without-xenapi --without-selinux \\ --without-lxc --without-vbox --without-uml \\ --without-qemu --without-openvz --without-vmware \\ @@ -72,9 +74,9 @@ END sub build() { target_cmd_build($ho, 3600, $builddir, <<END); - cd libvirt - (make $makeflags 2>&1 && touch ../build-ok-stamp) |tee ../log - test -f ../build-ok-stamp #/ + cd libvirt/build + (make $makeflags 2>&1 && touch ../../build-ok-stamp) |tee ../log + test -f ../../build-ok-stamp #/ echo ok. END } @@ -82,7 +84,7 @@ END sub install() { target_cmd_build($ho, 300, $builddir, <<END); mkdir -p dist - cd libvirt + cd libvirt/build make $makeflags install DESTDIR=$builddir/dist mkdir -p $builddir/dist/etc/init.d END -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |