[Pkg-libvirt-maintainers] Bug#795516: Bug#795516: [patch] Enable Xen support on armhf and arm64 architectures

[Guido Günther]

Hi,
On Sat, Aug 15, 2015 at 08:43:59AM +0200, Yann Soubeyrand wrote:
> Hi,
> 
> I forgot to disable Virtualbox support for armhf and arm64. Seems like
> it is by default but it's cleaner this way. The new patch is enclosed.
> 
> Regards
> 
> Yann

> diff -Nru libvirt-1.2.9/debian/changelog libvirt-1.2.9/debian/changelog
> --- libvirt-1.2.9/debian/changelog	2015-02-06 15:43:48.000000000 +0100
> +++ libvirt-1.2.9/debian/changelog	2015-08-14 16:07:14.000000000 +0200
> @@ -1,3 +1,10 @@
> +libvirt (1.2.9-9.1) UNRELEASED; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Enable Xen support for armhf and arm64 architectures
> +
> + -- Yann Soubeyrand <yann.soubeyrand at gmx.fr>  Fri, 14 Aug 2015 16:06:29 +0200
> +
>  libvirt (1.2.9-9) unstable; urgency=medium
>  
>    * [4c14b83] qemu: Don't try to parse -help for new QEMU.
> diff -Nru libvirt-1.2.9/debian/control libvirt-1.2.9/debian/control
> --- libvirt-1.2.9/debian/control	2015-02-05 21:22:11.000000000 +0100
> +++ libvirt-1.2.9/debian/control	2015-08-14 16:12:21.000000000 +0200
> @@ -14,7 +14,7 @@
>   libgnutls28-dev,
>   libavahi-client-dev,
>   libsasl2-dev,
> - libxen-dev (>= 4.3) [i386 amd64],
> + libxen-dev (>= 4.3) [i386 amd64 armhf arm64],
>   lvm2 [linux-any],
>   open-iscsi [linux-any],
>   libparted0-dev (>= 2.2),
> @@ -198,7 +198,7 @@
>  Package: libvirt-dev
>  Architecture: any
>  Section: libdevel
> -Depends: ${misc:Depends}, libvirt0 (= ${binary:Version}), libxen-dev [i386 amd64]
> +Depends: ${misc:Depends}, libvirt0 (= ${binary:Version}), libxen-dev [i386 amd64 armhf arm64]
>  Replaces: libvirt-bin (<< 1.2.0~)
>  Recommends: pkg-config
>  Description: development files for the libvirt library
> diff -Nru libvirt-1.2.9/debian/rules libvirt-1.2.9/debian/rules
> --- libvirt-1.2.9/debian/rules	2015-02-05 21:22:11.000000000 +0100
> +++ libvirt-1.2.9/debian/rules	2015-08-15 08:37:41.000000000 +0200
> @@ -11,6 +11,10 @@
>      WITH_LIBXL = --with-libxl
>      WITH_VBOX = --with-vbox
>      MAKE_CHECK = 1
> +  else ifneq (,$(findstring $(DEB_HOST_ARCH), armhf arm64))
> +    WITH_XEN            = --with-xen
> +    WITH_LIBXL          = --with-libxl
> +    WITH_VBOX           = --without-vbox

You also need the XEN_ENABLED part for the libxl.conf so

>    else
>      WITH_XEN            = --without-xen
>      WITH_LIBXL          = --without-libxl

... let's better fold this into one block:

ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 armhf arm64))
 "with_xen"
else
 "without_xen"
endif

and move the MAKE_CHECK part to a i386/amd64 specific if.

Can you update your patch?

Cheers,
 -- Guido