From 8c378bc011fedb954578d8b55d48f0d196e37915 Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Sun, 17 Dec 2017 17:42:59 +0100 Subject: [PATCH] Move grub config into xen-utils-common The grub config snippet is not arch dependent, neither version dependent, so it has to move into a 'common' package. The packages with a version number in their name only have contents that do not conflict with a previous or next version. Having this file in the version dependent xen-hypervisor package currently prevents us from being able to co-install the current and next version of Xen. So, I can do this here for new packages in unstable but that will only fix upgrades from xen 4.9 to 4.10. The same change still needs to go into a stable update to solve the problem for upgrades from Stretch to Buster. Also see https://bugs.debian.org/852545 --- debian/rules.real | 4 ---- debian/templates/control.hypervisor.in | 1 + debian/templates/control.main.in | 2 ++ .../xen-utils-common/etc/default/grub.d/xen.cfg} | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename debian/{xen-hypervisor-4.8.xen.cfg => tree/xen-utils-common/etc/default/grub.d/xen.cfg} (100%) diff --git a/debian/rules.real b/debian/rules.real index 1ed72005b2..a617cefa40 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -159,10 +159,6 @@ install-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$( dh_testroot dh_prep dh_installdirs boot - # FIXME: Think of better solution (grub used for other arches?) - dh_installdirs etc/default/grub.d - install -D -m644 debian/xen-hypervisor-$(VERSION).xen.cfg \ - debian/$(PACKAGE_NAME)/etc/default/grub.d/xen.cfg dh_install debian/templates/xen-hypervisor.bug/* usr/share/bug/$(PACKAGE_NAME) cp $(DIR)/xen/xen$(IMAGE_SUFFIX) debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR)$(IMAGE_SUFFIX) ifeq ($(ARCH),amd64) diff --git a/debian/templates/control.hypervisor.in b/debian/templates/control.hypervisor.in index 51a47f100d..e7ca119c81 100644 --- a/debian/templates/control.hypervisor.in +++ b/debian/templates/control.hypervisor.in @@ -1,5 +1,6 @@ Package: xen-hypervisor-@version@@localversion@ Depends: ${misc:Depends} +Breaks: xen-utils-common (<< 4.8.3~) Provides: xen-hypervisor, xen-hypervisor-@version@, xen-hypervisor@localversion@ Recommends: xen-utils-@version@ Description: Xen Hypervisor on @class@ diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 94f6e49814..edb05408ed 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -53,6 +53,8 @@ Description: Xenstore command line utilities for Xen Package: xen-utils-common Architecture: all Depends: lsb-base, python, udev, xenstore-utils, ${misc:Depends} +Replaces: xen-hypervisor-4.8-amd64 (<< 4.8.3~), xen-hypervisor-4.8-arm64 (<< 4.8.3~), xen-hypervisor-4.8-armhf (<< 4.8.3~) +Breaks: xen-hypervisor-4.8-amd64 (<< 4.8.3~), xen-hypervisor-4.8-arm64 (<< 4.8.3~), xen-hypervisor-4.8-armhf (<< 4.8.3~) Description: Xen administrative tools - common files The userspace tools to manage a system virtualized through the Xen virtual machine monitor. diff --git a/debian/xen-hypervisor-4.8.xen.cfg b/debian/tree/xen-utils-common/etc/default/grub.d/xen.cfg similarity index 100% rename from debian/xen-hypervisor-4.8.xen.cfg rename to debian/tree/xen-utils-common/etc/default/grub.d/xen.cfg -- 2.30.2