Bastian Blank
2006-Oct-08 15:57 UTC
[Pkg-xen-changes] r342 - in trunk/xen-3.0/debian: . patches templates
Author: waldi
Date: Sun Oct 8 15:56:58 2006
New Revision: 342
Modified:
trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch
trunk/xen-3.0/debian/patches/prefix-utils.dpatch
trunk/xen-3.0/debian/rules.real
trunk/xen-3.0/debian/templates/control.utils.in
Log:
* debian/patches/prefix-ioemu.dpatch, debian/patches/prefix-utils.dpatch:
Only use one version for utils and ioemu.
* debian/rules.real: Install ioemu and utils in the same directory.
* debian/templates/control.utils.in
- Fix recommends in utils package.
- Add abiname to name of ioemu package.
Modified: trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-ioemu.dpatch Sun Oct 8 15:56:58 2006
@@ -14,7 +14,7 @@
# It belongs in /usr/lib, not /usr/lib64.
TARGET := hvmloader/hvmloader
-INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot
-+INSTALL_DIR := $(DESTDIR)/usr/lib/xen-ioemu-$(XEN_VERSION_IOEMU)/boot
++INSTALL_DIR := $(DESTDIR)/usr/lib/xen-$(XEN_VERSION)/boot
SUBDIRS : SUBDIRS += rombios
@@ -26,7 +26,7 @@
fi
mandir="$installroot/$prefix/share/man"
-datadir="$installroot/$prefix/share/xen/qemu"
-+datadir="$installroot/$prefix/share/xen-ioemu-$XEN_VERSION_IOEMU/qemu"
++datadir="$installroot/$prefix/share/xen-$XEN_VERSION/qemu"
docdir="$installroot/$prefix/share/doc/qemu"
bindir="$installroot/$prefix/bin"
configdir="$installroot/etc/xen"
@@ -38,7 +38,7 @@
include $(XEN_ROOT)/tools/Rules.mk
-INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
-+INSTALL_DIR := $(DESTDIR)/usr/lib/xen-ioemu-$(XEN_VERSION_IOEMU)/bin
++INSTALL_DIR := $(DESTDIR)/usr/lib/xen-$(XEN_VERSION)/bin
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
Modified: trunk/xen-3.0/debian/patches/prefix-utils.dpatch
=============================================================================---
trunk/xen-3.0/debian/patches/prefix-utils.dpatch (original)
+++ trunk/xen-3.0/debian/patches/prefix-utils.dpatch Sun Oct 8 15:56:58 2006
@@ -18,7 +18,7 @@
-else
-LIBDIR = lib
-endif
-+PREFIX = lib/xen-$(XEN_VERSION_TOOLS)
++PREFIX = lib/xen-$(XEN_VERSION)
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
Modified: trunk/xen-3.0/debian/rules.real
=============================================================================---
trunk/xen-3.0/debian/rules.real (original)
+++ trunk/xen-3.0/debian/rules.real Sun Oct 8 15:56:58 2006
@@ -55,7 +55,7 @@
$(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
$(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH)
- $(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH)
XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION_TOOLS=$(VERSION)$(ABINAME)
XEN_VERSION_IOEMU=$(SHORT_VERSION)
+ $(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH)
XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME)
touch $@
install-base:
@@ -92,7 +92,7 @@
install-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
install-utils_$(ARCH): PACKAGE_NAME_UTILS = xen-utils-$(VERSION)$(ABINAME)
-install-utils_$(ARCH): PACKAGE_NAME_IOEMU = xen-ioemu-$(SHORT_VERSION)
+install-utils_$(ARCH): PACKAGE_NAME_IOEMU = xen-ioemu-$(VERSION)$(ABINAME)
install-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME_UTILS)
-p$(PACKAGE_NAME_IOEMU)
install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
dh_testdir
@@ -100,14 +100,9 @@
dh_clean -k
install -D -m644 debian/xen-utils.NEWS
debian/$(PACKAGE_NAME_UTILS)/usr/share/doc/$(PACKAGE_NAME_UTILS)/NEWS
install -D -m644 debian/xen-utils.README.Debian
debian/$(PACKAGE_NAME_UTILS)/usr/share/doc/$(PACKAGE_NAME_UTILS)/README.Debian
- $(MAKE) -C $(DIR)/tools install DESTDIR=$(CURDIR)/debian/tmp
DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH)
XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION_TOOLS=$(VERSION)$(ABINAME)
XEN_VERSION_IOEMU=$(SHORT_VERSION)
+ $(MAKE) -C $(DIR)/tools install DESTDIR=$(CURDIR)/debian/tmp
DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH)
XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME)
DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp
usr/lib/xen-$(VERSION)$(ABINAME) usr/lib
- DH_OPTIONS= dh_link -p$(PACKAGE_NAME_UTILS)
usr/lib/xen-ioemu-$(SHORT_VERSION)/bin/qemu-dm
usr/lib/xen-$(VERSION)$(ABINAME)/bin/qemu-dm
- DH_OPTIONS= dh_link -p$(PACKAGE_NAME_UTILS)
usr/lib/xen-ioemu-$(SHORT_VERSION)/boot usr/lib/xen-$(VERSION)$(ABINAME)/boot
- # TODO: move to xen-common and /etc/xen/scripts
- DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp
etc/xen/scripts/qemu-ifup etc/xen/scripts
- DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp
usr/lib/xen-ioemu-$(SHORT_VERSION) usr/lib
- DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp
usr/share/xen-ioemu-$(SHORT_VERSION) usr/share
+ DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp
usr/share/xen-$(VERSION)$(ABINAME) usr/share
dh_pycentral
dh_python
dh_strip
Modified: trunk/xen-3.0/debian/templates/control.utils.in
=============================================================================---
trunk/xen-3.0/debian/templates/control.utils.in (original)
+++ trunk/xen-3.0/debian/templates/control.utils.in Sun Oct 8 15:56:58 2006
@@ -1,13 +1,13 @@
Package: xen-utils-@version@@abiname@
Depends: ${shlibs:Depends}, ${python:Depends}, xen-utils-common, iproute, udev
(>> 0.060)
-Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-@version@
+Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-@version@@abiname@
Provides: xen-utils
XB-Python-Version: ${python:Versions}
Description: XEN administrative tools
The userspace tools to manage a system virtualized through the XEN virtual
machine monitor.
-Package: xen-ioemu-@short_version@
+Package: xen-ioemu-@version@@abiname@
Depends: ${shlibs:Depends}, xen-utils-@version@@abiname@ (= ${Source-Version})
Description: XEN administrative tools
The userspace tools to manage a system virtualized through the XEN virtual