Bastian Blank
2011-Apr-28 13:13 UTC
[Pkg-xen-changes] r890 - in trunk/xen/debian: . patches templates
Author: waldi
Date: Thu Apr 28 13:12:54 2011
New Revision: 890
Log:
* debian/changelog: Update.
* debian/patches/qemu-disable.diff: Disable some features.
* debian/templates/control.utils.in: Remove xen-qemu-dm-*.
* debian/rules.real: Don''t build extra package.
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/patches/qemu-disable.diff
trunk/xen/debian/rules.real
trunk/xen/debian/templates/control.utils.in
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Thu Apr 28 12:47:37 2011 (r889)
+++ trunk/xen/debian/changelog Thu Apr 28 13:12:54 2011 (r890)
@@ -1,7 +1,7 @@
xen (4.1.0-3) UNRELEASED; urgency=low
* Add ghostscript to build-deps.
- * Add xen-qemu-dm-4.1 binary package.
+ * Enable qemu-dm build.
- Add qemu as another orig tar.
- Remove blktap1 support from qemu.
Modified: trunk/xen/debian/patches/qemu-disable.diff
=============================================================================---
trunk/xen/debian/patches/qemu-disable.diff Thu Apr 28 12:47:37 2011 (r889)
+++ trunk/xen/debian/patches/qemu-disable.diff Thu Apr 28 13:12:54 2011 (r890)
@@ -65,7 +65,7 @@
--- a/qemu/configure
+++ b/qemu/configure
-@@ -185,7 +185,7 @@
+@@ -185,9 +185,11 @@
kvm="yes"
kerneldir=""
aix="no"
@@ -73,24 +73,11 @@
+blobs="no"
fdt="yes"
sdl_x11="no"
++sdl="no"
++brlapi="no"
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -120,7 +120,13 @@
- $(GIT) reset --hard $(QEMU_TAG); \
- fi
-
--subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
-+subdir-all-ioemu-dir: ioemu-dir-find
-+
-+subdir-install-ioemu-dir:
-+ true
-+
-+install-ioemu-dir: ioemu-dir-find
-+ $(MAKE) -C ioemu-dir install
-
- subdir-clean-ioemu-dir:
- set -e; if test -d ioemu-dir/.; then \
+ # OS specific
+ if check_define __linux__ ; then
--- a/qemu/rules.mak
+++ b/qemu/rules.mak
@@ -16,4 +16,4 @@
Modified: trunk/xen/debian/rules.real
=============================================================================---
trunk/xen/debian/rules.real Thu Apr 28 12:47:37 2011 (r889)
+++ trunk/xen/debian/rules.real Thu Apr 28 13:12:54 2011 (r890)
@@ -15,9 +15,6 @@
binary-arch-arch: install-lib-dev_$(ARCH)
binary-arch-arch: install-libxenstore_$(ARCH)
-ifneq ($(wildcard qemu),)
- binary-arch-arch: install-qemu_$(ARCH)
-endif
binary-arch-arch: install-utils_$(ARCH)
binary-arch-arch: install-xenstore-utils_$(ARCH)
binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
@@ -89,13 +86,6 @@
#strip --remove-section=.comment --remove-section=.note
$(INSTALL_DIR)/usr/lib/xen*/boot/*
touch $@
-$(STAMPS_DIR)/install-qemu_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH)
-$(STAMPS_DIR)/install-qemu_$(ARCH): INSTALL_DIR =
$(BUILD_DIR)/install-qemu_$(ARCH)
-$(STAMPS_DIR)/install-qemu_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
- @rm -rf $(INSTALL_DIR)
- +$(MAKE_CLEAN) -C $(DIR)/tools install-ioemu-dir
DESTDIR=$(CURDIR)/$(INSTALL_DIR) XEN_VERSION=$(VERSION)
- touch $@
-
install-base:
dh_installchangelogs -XChangelog
dh_installdocs
@@ -173,20 +163,6 @@
dh_shlibdeps
+$(MAKE_SELF) install-base
-install-qemu_$(ARCH): DIR = $(BUILD_DIR)/install-qemu_$(ARCH)
-install-qemu_$(ARCH): PACKAGE_NAME = xen-qemu-dm-$(VERSION)
-install-qemu_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
-install-qemu_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-qemu_$(ARCH): $(STAMPS_DIR)/install-qemu_$(ARCH)
install-libxenstore_$(ARCH)
- dh_testdir
- dh_testroot
- dh_prep
- dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION)
- dh_strip
- dh_makeshlibs -V
- dh_shlibdeps
- +$(MAKE_SELF) install-base
-
install-xenstore-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
install-xenstore-utils_$(ARCH): PACKAGE_NAME = xenstore-utils
install-xenstore-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
Modified: trunk/xen/debian/templates/control.utils.in
=============================================================================---
trunk/xen/debian/templates/control.utils.in Thu Apr 28 12:47:37 2011 (r889)
+++ trunk/xen/debian/templates/control.utils.in Thu Apr 28 13:12:54 2011 (r890)
@@ -7,8 +7,3 @@
The userspace tools to manage a system virtualized through the XEN virtual
machine monitor.
-Package: xen-qemu-dm- at version@
-Depends: ${shlibs:Depends}, ${misc:Depends}, xen-utils- at version@ (=
${binary:Version}), qemu-keymaps, qemu-utils
-Description: Xen Qemu Device Model virtual machine hardware emulator
- This package contains the Xen version of the Qemu emulator.
-