[Pkg-xen-devel] Ubuntu delta against 4.5.0-1 in experimental for disussion

[Stefan Bader]

On 22.01.2015 13:02, Stefan Bader wrote:
> Hi,
> 
> I just finished preparing the Xen-4.5 merge from experimental into our next
> release (Vivid/15.04). And something I actually should have done since the 4.4
> times is to report back the delta I have in case there are things Debian might
> want to pick up as well.
> 
> So below is the commented debdiff between the 4.5.0-1 in experimental and the
> Ubuntu version I prepared so far (only compile tested on x86 at the time of
> writing this).
> 
> Regards,
> Stefan
> 
> [Excluding changelog and the maintainer change in control]
> 
> First hunk in the following diff is just for the sake of completeness. OCAML was
> dropped when xend support was taken out, so setting the destination directory
> sounds useless. On the other hand it does not break anything.
> The second hunk may or may not be useful for Debian. I add this (and the
> d/xen-hypervisor-4.5.xen.cfg file) so update-grub will automatically create a
> config that boots into Xen by default. Files in /etc/default/grub.d are appended
> to /etc/default/grub, so one does not have to fiddle around with the main file).

For completeness... at least the implementation of where I added the update-grub
config and how seems less than ideal in the light of moving from one version to
the next. So clearly nothing that anyone wants to do at least in that form.

Will have to ponder how to get out of this and still offer a simple way to get a
Xen host up.

-Stefan

> 
> diff -Nru xen-4.5.0/debian/rules.real xen-4.5.0/debian/rules.real
> --- xen-4.5.0/debian/rules.real	2015-01-20 19:29:03.000000000 +0100
> +++ xen-4.5.0/debian/rules.real	2015-01-22 11:44:54.000000000 +0100
> @@ -95,7 +95,6 @@
>  		EXTRA_CFLAGS_XEN_TOOLS="$(CFLAGS)" \
>  		APPEND_CPPFLAGS="$(CPPFLAGS)" \
>  		APPEND_LDFLAGS="$(LDFLAGS)" \
> -		OCAMLDESTDIR=$(CURDIR)/$(BUILD_DIR)/install-utils_$(ARCH)/$(OCAML_STDLIB_DIR) \
>  		PYTHON=$(shell pyversions -r)
> 
>  $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
> @@ -152,6 +151,9 @@
>  	dh_testroot
>  	dh_prep
>  	dh_installdirs boot
> +	dh_installdirs etc/default/grub.d
> +	install -D -m644 debian/xen-hypervisor-$(VERSION).xen.cfg \
> +		debian/$(PACKAGE_NAME)/etc/default/grub.d/xen.cfg
>  	cp $(DIR)/xen/xen$(IMAGE_SUFFIX)
> debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR)$(IMAGE_SUFFIX)
>  ifeq ($(ARCH),amd64)
>  	cp $(DIR)/xen/xen.efi debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).efi
> 
...
> Here is the second part of the update-grub magic:
> 
> diff -Nru xen-4.5.0/debian/xen-hypervisor-4.5.xen.cfg
> xen-4.5.0/debian/xen-hypervisor-4.5.xen.cfg
> --- xen-4.5.0/debian/xen-hypervisor-4.5.xen.cfg	1970-01-01 01:00:00.000000000 +0100
> +++ xen-4.5.0/debian/xen-hypervisor-4.5.xen.cfg	2015-01-22 11:59:18.000000000 +0100
> @@ -0,0 +1,54 @@
> +#
> +# Uncomment the following variable and set to 0 or 1 to avoid warning.
> +#
> +#XEN_OVERRIDE_GRUB_DEFAULT=0
> +
> +echo "Including Xen overrides from /etc/default/grub.d/xen.cfg"
> +
> +#
> +# When running update-grub with the Xen hypervisor installed, there are
> +# some additional variables that can be used to pass options to the
> +# hypervisor or the dom0 kernel.
> +
> +# The following two are used to generate arguments for the hypervisor:
> +#
> +#GRUB_CMDLINE_XEN_DEFAULT=""
> +#GRUB_CMDLINE_XEN=""
> +#
> +# For example:
> +#
> +# dom0_mem=<size>[M]:max=<size>[M]
> +#   Sets the amount of memory dom0 uses (max prevents balloning for more)
> +# com[12]=<speed>,<data bits><parity><stopbits>
> +#   Initialize a serial console from in the hypervisor (eg. 115200,8n1)
> +#   Note that com1 would be ttyS0 in Linux.
> +# console=<dev>[,<dev> ...]


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-xen-devel/attachments/20150122/2b9a5d9a/attachment.sig>