From 10fba8a255a236bd9984c620bc61829413a47ce9 Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Fri, 23 Feb 2018 17:13:51 +0100 Subject: [PATCH] Revert "Move grub config into xen-utils-common" This reverts commit 8c378bc011fedb954578d8b55d48f0d196e37915. We're going to do this differently. --- debian/rules.real | 4 ++++ debian/templates/control.hypervisor.in | 1 - debian/templates/control.main.in | 2 -- .../etc/default/grub.d/xen.cfg => xen-hypervisor-4.8.xen.cfg} | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename debian/{tree/xen-utils-common/etc/default/grub.d/xen.cfg => xen-hypervisor-4.8.xen.cfg} (100%) diff --git a/debian/rules.real b/debian/rules.real index 16f75558b8..175ac33042 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -163,6 +163,10 @@ 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 e7ca119c81..51a47f100d 100644 --- a/debian/templates/control.hypervisor.in +++ b/debian/templates/control.hypervisor.in @@ -1,6 +1,5 @@ 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 20dcdce9a1..932a39e854 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -52,8 +52,6 @@ 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/tree/xen-utils-common/etc/default/grub.d/xen.cfg b/debian/xen-hypervisor-4.8.xen.cfg similarity index 100% rename from debian/tree/xen-utils-common/etc/default/grub.d/xen.cfg rename to debian/xen-hypervisor-4.8.xen.cfg -- 2.30.2