Bastian Blank
2006-Mar-11 17:07 UTC
[Pkg-xen-changes] r108 - in trunk/xen-unstable/debian: . patches
Author: waldi
Date: 2006-03-11 16:19:35 +0000 (Sat, 11 Mar 2006)
New Revision: 108
Added:
trunk/xen-unstable/debian/patches/
trunk/xen-unstable/debian/patches/00list
trunk/xen-unstable/debian/patches/compile_date.dpatch
trunk/xen-unstable/debian/patches/libdir.dpatch
trunk/xen-unstable/debian/patches/manpages.dpatch
trunk/xen-unstable/debian/patches/version.dpatch
Removed:
trunk/xen-unstable/debian/diff
trunk/xen-unstable/debian/libxen3.0-unstable-dev.install
trunk/xen-unstable/debian/libxen3.0-unstable-python.install
trunk/xen-unstable/debian/libxen3.0-unstable.install
Modified:
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/control
trunk/xen-unstable/debian/rules
trunk/xen-unstable/debian/xen-utils-unstable.install
Log:
* debian/changelog: Update version.
* debian/control: Merge changes.
* debian/diff: Remove.
* debian/libxen3.0-unstable-dev.install,
debian/libxen3.0-unstable.install,
debian/libxen3.0-unstable-python.install: Remove
* debian/patches: New directory.
* debian/patches/00list: Add.
* debian/patches/compile_date.dpatch,
debian/patches/libdir.dpatch,
debian/patches/manpages.dpatch,
debian/patches/version.dpatch: Add.
* debian/rules: Merge changes.
* debian/xen-utils-unstable.install: Update.
Modified: trunk/xen-unstable/debian/changelog
==================================================================---
trunk/xen-unstable/debian/changelog 2006-03-11 15:40:58 UTC (rev 107)
+++ trunk/xen-unstable/debian/changelog 2006-03-11 16:19:35 UTC (rev 108)
@@ -1,4 +1,4 @@
-xen-unstable (head.8954-1) UNRELEASED; urgency=low
+xen-unstable (hg9211-1) UNRELEASED; urgency=low
* Initial release.
Modified: trunk/xen-unstable/debian/control
==================================================================---
trunk/xen-unstable/debian/control 2006-03-11 15:40:58 UTC (rev 107)
+++ trunk/xen-unstable/debian/control 2006-03-11 16:19:35 UTC (rev 108)
@@ -1,18 +1,15 @@
Source: xen-unstable
Section: misc
Priority: extra
-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Bastian Blank <waldi@debian.org>
-Build-Depends: debhelper (>= 4), libncurses5-dev, libz-dev, python-dev
-Build-Depends-Indep: gs-common, perl, tetex-extra
+Maintainer: Debian Xen Team <pkg-xen-devel@lists.alioth.debian.org>
+Uploaders: Julien Danjou <acid@debian.org>, Jeremy T. Bouse
<jbouse@debian.org>, Guido Trotter <ultrotter@debian.org>, Bastian
Blank <waldi@debian.org>
+Build-Depends: tetex-bin, tetex-extra, gs-common, debhelper (>= 4),
libcurl3-dev | libcurl-dev, python-dev, python (>= 2.2), transfig,
libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, bcc, dpatch, lsb-release
Standards-Version: 3.6.2.2
Package: xen-hypervisor-unstable-amd64
-Section: misc
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}
+Architecture: amd64
Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-amd64
-Description: The Xen Hypervisor (x86_64)
+Description: The Xen Hypervisor for amd64
The hypervisor is the "core" for XEN itself. It gets booted by the
boot loader
and controls cpu and memory, sharing them between your administrative domain
(Domain 0) and the virtual guest systems.
@@ -23,11 +20,9 @@
to build it can be found in the xen-docs package.
Package: xen-hypervisor-unstable-i386
-Section: misc
Architecture: i386
-Depends: ${shlibs:Depends}
Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-i386
-Description: The Xen Hypervisor
+Description: The Xen Hypervisor for i386
The hypervisor is the "core" for XEN itself. It gets booted by the
boot loader
and controls cpu and memory, sharing them between your administrative domain
(Domain 0) and the virtual guest systems.
@@ -38,11 +33,9 @@
to build it can be found in the xen-docs package.
Package: xen-hypervisor-unstable-i386-pae
-Section: misc
Architecture: i386
-Depends: ${shlibs:Depends}
Provides: xen-hypervisor, xen-hypervisor-unstable, xen-hypervisor-i386-pae
-Description: The Xen Hypervisor (pae enabled version)
+Description: The Xen Hypervisor for i386 (pae enabled version)
The hypervisor is the "core" for XEN itself. It gets booted by the
boot loader
and controls cpu and memory, sharing them between your administrative domain
(Domain 0) and the virtual guest systems.
@@ -53,9 +46,8 @@
to build it can be found in the xen-docs package.
Package: xen-utils-unstable
-Section: misc
Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${python:Depends}, xen-hypervisor-unstable,
libxen3.0-unstable-python, iproute, udev
+Depends: ${shlibs:Depends}, ${python:Depends}, xen-hypervisor-unstable,
iproute, udev (>> 0.060), python-twisted
Recommends: bridge-utils
Provides: xen-utils
Conflicts: xen-utils
@@ -63,31 +55,10 @@
The userspace tools to manage a system virtualized through the XEN virtual
machine monitor.
-Package: libxen3.0-unstable
-Section: libs
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}
-Conflicts: xen-docs (<= 1.2), libxen2.0, libxen3.0
-Description: control library for XEN, a Virtual Machine Monitor
- Library to control the XEN microkernel. Contains functions for creating,
- starting, stopping, saving, virtual instances.
+Package: xen-docs-unstable
+Architecture: all
+Description: documentation for XEN, a Virtual Machine Monitor
+ This package contains all the large documentation files for XEN. This
+ includes a description interface(both the api, and a nice explanation of
+ how XEN works). It also contains the VBD and Xeno howtos.
-Package: libxen3.0-unstable-dev
-Section: libdevel
-Architecture: amd64 i386
-Depends: libxen3.0-unstable (= ${Source-Version})
-Conflicts: libxen3.0-dev
-Description: development files for the control library for XEN
- Users wishing to develop their own tools for interfaces to the underlying
- XEN kernel should install this package.
-
-Package: libxen3.0-unstable-python
-Section: python
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${python:Depends}
-Conflicts: libxen3.0-python
-Description: python wrapper around libxc, the control library for XEN
- This python library wraps the C library, and provides a nice OO interface
- to the low-level system calls. It also provides some higher-level config
- file parsing.
-
Deleted: trunk/xen-unstable/debian/diff
==================================================================---
trunk/xen-unstable/debian/diff 2006-03-11 15:40:58 UTC (rev 107)
+++ trunk/xen-unstable/debian/diff 2006-03-11 16:19:35 UTC (rev 108)
@@ -1,124 +0,0 @@
---- xen-3.0/debian/rules 2006-02-24 17:31:09.000000000 +0100
-+++ xen-unstable/debian/rules 2006-02-24 02:43:26.000000000 +0100
-@@ -7,39 +7,36 @@
- DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
- srcver := $(shell dpkg-parsechangelog | awk ''/^Version:/ {print
$$2}'')
- VERSION := $(shell echo $(srcver) | sed -e ''s,-[^-]*$$,,'')
- MAJOR := unstable
- BUILD_DIR = debian/build
- STAMPS_DIR = debian/stamps
-
- setup: $(STAMPS_DIR)/setup
--$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) setup-docs setup-hypervisor
setup-tools
-+$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) setup-hypervisor
setup-tools-check
- dh_testdir
- touch $@
-
- srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
--$(STAMPS_DIR)/setup-patch:
-- @rm -rf $(BUILD_DIR)/source
-- mkdir $(BUILD_DIR)/source
-- cp -a $(srcfiles) $(BUILD_DIR)/source
-- touch $@
--
--$(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/setup-patch
-+$(STAMPS_DIR)/setup-docs:
- @rm -rf $(BUILD_DIR)/build-docs
-- cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-docs
-+ mkdir $(BUILD_DIR)/build-docs
-+ cp -a $(srcfiles) $(BUILD_DIR)/build-docs
- touch $@
-
--$(STAMPS_DIR)/setup-hypervisor-%: $(STAMPS_DIR)/setup-patch
-+$(STAMPS_DIR)/setup-hypervisor-%:
- @rm -rf $(BUILD_DIR)/build-hypervisor-$*
-- cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-hypervisor-$*
-+ mkdir $(BUILD_DIR)/build-hypervisor-$*
-+ cp -a $(srcfiles) $(BUILD_DIR)/build-hypervisor-$*
- touch $@
-
--$(STAMPS_DIR)/setup-tools: $(STAMPS_DIR)/setup-patch
-+$(STAMPS_DIR)/setup-tools:
- @rm -rf $(BUILD_DIR)/build-tools
-- cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-tools
-+ mkdir $(BUILD_DIR)/build-tools
-+ cp -a $(srcfiles) $(BUILD_DIR)/build-tools
- touch $@
-
- build: $(STAMPS_DIR)/build
--$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup
build-hypervisor build-tools
-+$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup
build-hypervisor build-tools-check
- dh_testdir
- touch $@
-
-@@ -47,6 +44,10 @@
-
- $(STAMPS_DIR)/build-%: DIR=$(BUILD_DIR)/$(@F)
-
-+$(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs
-+ #$(MAKE) -C $(DIR)/tools
-+ touch $@
-+
- $(STAMPS_DIR)/build-hypervisor-amd64: $(STAMPS_DIR)/setup-hypervisor-amd64
- $(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_64
- touch $@
-@@ -63,7 +64,6 @@
- $(MAKE) -C $(DIR)/tools
- touch $@
-
--setup-docs:: $(STAMPS_DIR)/setup-docs
- ifneq (,$(filter amd64 i386, $(DEB_HOST_ARCH)))
- build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-amd64
- install-hypervisor:: install-hypervisor-amd64
-@@ -76,9 +76,9 @@
- install-hypervisor:: install-hypervisor-i386-pae
- setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-i386-pae
- endif
--build-tools:: $(STAMPS_DIR)/build-tools
-+build-tools-check:: $(STAMPS_DIR)/build-tools
- install-tools-check:: install-tools
--setup-tools:: $(STAMPS_DIR)/setup-tools
-+setup-tools-check:: $(STAMPS_DIR)/setup-tools
- endif
-
- $(BUILD_DIR) $(STAMPS_DIR):
-@@ -104,17 +104,14 @@
- rm -rf $(BUILD_DIR) $(STAMPS_DIR)
- dh_clean
-
--install-arch: install-hypervisor install-tools-check
-+install-arch: build install-hypervisor install-tools-check
- dh_testdir
- dh_testroot
- dh_installdirs
-
--install-indep: install-docs
-+install-indep:
-
--install-docs:
-- $(MAKE) -C debian/build/build-docs/docs
--
--install-hypervisor-%:
-+install-hypervisor-%: $(STAMPS_DIR)/build-hypervisor-%
- dh_testdir
- dh_testroot
- dh_clean -k -pxen-hypervisor-$(MAJOR)-$*
-@@ -133,17 +130,15 @@
- dh_install --sourcedir=debian/tmp
-
- # Build architecture-independent files here.
- binary-indep:
-
- # Build architecture-dependent files here.
--binary-arch: install-arch
-+binary-arch: build install-arch
- dh_testdir
- dh_testroot
- dh_installchangelogs -s
- dh_installdocs -s
- dh_installexamples -s
-- dh_installinit -p xen-utils-$(MAJOR) --name xend -- 21 20
-- dh_installinit -p xen-utils-$(MAJOR) --name xendomains -- 20 21
- dh_installman -s
- dh_link -s
- dh_strip -s
Deleted: trunk/xen-unstable/debian/libxen3.0-unstable-dev.install
==================================================================---
trunk/xen-unstable/debian/libxen3.0-unstable-dev.install 2006-03-11 15:40:58 UTC
(rev 107)
+++ trunk/xen-unstable/debian/libxen3.0-unstable-dev.install 2006-03-11 16:19:35
UTC (rev 108)
@@ -1,4 +0,0 @@
-usr/include
-usr/lib/*.a
-usr/lib/libxenctrl.so
-usr/lib/libxenguest.so
Deleted: trunk/xen-unstable/debian/libxen3.0-unstable-python.install
==================================================================---
trunk/xen-unstable/debian/libxen3.0-unstable-python.install 2006-03-11 15:40:58
UTC (rev 107)
+++ trunk/xen-unstable/debian/libxen3.0-unstable-python.install 2006-03-11
16:19:35 UTC (rev 108)
@@ -1 +0,0 @@
-usr/lib/python*
Deleted: trunk/xen-unstable/debian/libxen3.0-unstable.install
==================================================================---
trunk/xen-unstable/debian/libxen3.0-unstable.install 2006-03-11 15:40:58 UTC
(rev 107)
+++ trunk/xen-unstable/debian/libxen3.0-unstable.install 2006-03-11 16:19:35 UTC
(rev 108)
@@ -1,4 +0,0 @@
-usr/lib/*.so.*
-usr/lib/libxenstore.so
-usr/lib/xen/bin
-usr/lib/xen/boot
Added: trunk/xen-unstable/debian/patches/00list
==================================================================---
trunk/xen-unstable/debian/patches/00list 2006-03-11 15:40:58 UTC (rev 107)
+++ trunk/xen-unstable/debian/patches/00list 2006-03-11 16:19:35 UTC (rev 108)
@@ -0,0 +1,4 @@
+libdir
+manpages
+version
+compile_date
Added: trunk/xen-unstable/debian/patches/compile_date.dpatch
==================================================================---
trunk/xen-unstable/debian/patches/compile_date.dpatch 2006-03-11 15:40:58 UTC
(rev 107)
+++ trunk/xen-unstable/debian/patches/compile_date.dpatch 2006-03-11 16:19:35
UTC (rev 108)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## compile_date.dpatch by Bastian Blank <waldi@debian.org>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xen-3.0~/xen/Makefile xen-3.0/xen/Makefile
+--- xen-3.0~/xen/Makefile 2006-03-11 13:59:27.091532083 +0100
++++ xen-3.0/xen/Makefile 2006-03-11 14:02:02.651009564 +0100
+@@ -86,8 +86,8 @@
+ # compile.h contains dynamic build info. Rebuilt on every
''make'' invocation.
+ include/xen/compile.h: LANG=C
+ include/xen/compile.h: include/xen/compile.h.in include/xen/banner.h
+- @sed -e ''s/@@date@@/$(shell date)/g'' \
+- -e ''s/@@time@@/$(shell date +%T)/g'' \
++ @sed -e ''s/@@date@@/$(shell LC_ALL=C date)/g'' \
++ -e ''s/@@time@@/$(shell LC_ALL=C date +%T)/g'' \
+ -e ''s/@@whoami@@/$(shell whoami)/g'' \
+ -e ''s/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] &&
/bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname ||
echo [unknown]))/g'' \
+ -e ''s/@@hostname@@/$(shell hostname)/g'' \
Added: trunk/xen-unstable/debian/patches/libdir.dpatch
==================================================================---
trunk/xen-unstable/debian/patches/libdir.dpatch 2006-03-11 15:40:58 UTC (rev
107)
+++ trunk/xen-unstable/debian/patches/libdir.dpatch 2006-03-11 16:19:35 UTC (rev
108)
@@ -0,0 +1,253 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## libdir.dpatch by Bastian Blank <waldi@debian.org>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
+--- xen-unstable~/Config.mk 2006-03-11 16:54:33.000000000 +0100
++++ xen-unstable/Config.mk 2006-03-11 17:18:57.685333810 +0100
+@@ -46,11 +46,7 @@
+ CFLAGS += -m64
+ endif
+
+-ifeq ($(XEN_TARGET_ARCH),x86_64)
+-LIBDIR = lib64
+-else
+ LIBDIR = lib
+-endif
+
+ ifneq ($(EXTRA_PREFIX),)
+ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
+diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
+--- xen-unstable~/tools/Rules.mk 2006-03-11 16:54:34.000000000 +0100
++++ xen-unstable/tools/Rules.mk 2006-03-11 17:18:57.685333810 +0100
+@@ -10,6 +10,9 @@
+ XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
+ XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+
++RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR)/xen
++LDFLAGS += $(RPATH_ARG)
++
+ X11_LDPATH = -L/usr/X11R6/$(LIBDIR)
+
+ %.opic: %.c
+diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
+--- xen-unstable~/tools/console/Makefile 2006-03-11 16:54:34.000000000 +0100
++++ xen-unstable/tools/console/Makefile 2006-03-11 17:18:57.685333810 +0100
+@@ -23,11 +23,11 @@
+ $(RM) client/*.o daemon/*.o
+
+ xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
+- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ -lxenctrl -lxenstore
+
+ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
+- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
++ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ -lxenctrl -lxenstore
+
+ install: $(BIN)
+diff -urNad xen-unstable~/tools/ioemu/target-i386-dm/Makefile
xen-unstable/tools/ioemu/target-i386-dm/Makefile
+--- xen-unstable~/tools/ioemu/target-i386-dm/Makefile 2006-03-11
16:54:35.000000000 +0100
++++ xen-unstable/tools/ioemu/target-i386-dm/Makefile 2006-03-11
17:18:57.686333671 +0100
+@@ -188,7 +188,7 @@
+ #########################################################
+
+ DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-LIBS+=-lm -L../../libxc -lxenctrl -lxenguest -L../../xenstore -lxenstore
++LIBS+=-lm $(RPATH_ARG) -L../../libxc -lxenctrl -lxenguest -L../../xenstore
-lxenstore
+ ifndef CONFIG_USER_ONLY
+ LIBS+=-lz
+ endif
+diff -urNad xen-unstable~/tools/libxc/Makefile
xen-unstable/tools/libxc/Makefile
+--- xen-unstable~/tools/libxc/Makefile 2006-03-11 16:54:35.000000000 +0100
++++ xen-unstable/tools/libxc/Makefile 2006-03-11 17:19:07.711946572 +0100
+@@ -4,9 +4,6 @@
+ INSTALL_DATA = $(INSTALL) -m0644
+ INSTALL_DIR = $(INSTALL) -d -m0755
+
+-MAJOR = 3.0
+-MINOR = 0
+-
+ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+@@ -65,11 +62,9 @@
+ LIB_BUILD_OBJS := $(patsubst %.c,%.o,$(BUILD_SRCS))
+ PIC_BUILD_OBJS := $(patsubst %.c,%.opic,$(BUILD_SRCS))
+
+-LIB := libxenctrl.a
+-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
++LIB += libxenctrl.so
+
+-LIB += libxenguest.a
+-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
++LIB += libxenguest.so
+
+ all: build
+ build: check-for-zlib mk-symlinks
+@@ -84,18 +79,12 @@
+ fi
+
+ install: build
+- [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
++ [ -d $(DESTDIR)/usr/$(LIBDIR)/xen ] || $(INSTALL_DIR)
$(DESTDIR)/usr/$(LIBDIR)/xen
+ [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+- $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+- $(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
+- ln -sf libxenctrl.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
+- ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
++ $(INSTALL_PROG) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)/xen
+ $(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
+
+- $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+- $(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
+- ln -sf libxenguest.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
+- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
++ $(INSTALL_PROG) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)/xen
+ $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
+
+ .PHONY: TAGS clean rpm install all
+@@ -120,25 +109,15 @@
+ libxenctrl.a: $(LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenctrl.so: libxenctrl.so.$(MAJOR)
+- ln -sf $< $@
+-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libxenctrl.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so.$(MAJOR) -shared -o
$@ $^
++libxenctrl.so: $(PIC_OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so -shared -o $@ $^
+
+ # libxenguest
+
+ libxenguest.a: $(LIB_BUILD_OBJS)
+ $(AR) rc $@ $^
+
+-libxenguest.so: libxenguest.so.$(MAJOR)
+- ln -sf $< $@
+-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS) libxenctrl.so
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) -shared -o
$@ $^ -lz -lxenctrl
++libxenguest.so: $(PIC_BUILD_OBJS) libxenctrl.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so -shared -o $@ $^
-lz -lxenctrl
+
+ -include $(DEPS)
+diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
+--- xen-unstable~/tools/misc/Makefile 2006-03-11 16:54:35.000000000 +0100
++++ xen-unstable/tools/misc/Makefile 2006-03-11 17:18:57.686333671 +0100
+@@ -50,4 +50,4 @@
+ $(CC) -c $(CFLAGS) -o $@ $<
+
+ $(TARGETS): %: %.o Makefile
+- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
+diff -urNad xen-unstable~/tools/misc/cpuperf/Makefile
xen-unstable/tools/misc/cpuperf/Makefile
+--- xen-unstable~/tools/misc/cpuperf/Makefile 2006-03-11 16:54:35.000000000
+0100
++++ xen-unstable/tools/misc/cpuperf/Makefile 2006-03-11 17:18:57.687333533
+0100
+@@ -35,7 +35,7 @@
+ $(CC) $(CFLAGS) -o $@ $<
+
+ cpuperf-xen: cpuperf.c $(HDRS) Makefile
+- $(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxenctrl -DXENO -o $@ $<
++ $(CC) $(CFLAGS) -I $(XEN_LIBXC) $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl -DXENO -o
$@ $<
+
+ cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
+ $(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
+diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
+--- xen-unstable~/tools/python/setup.py 2006-03-11 16:54:35.000000000 +0100
++++ xen-unstable/tools/python/setup.py 2006-03-11 17:18:57.687333533 +0100
+@@ -5,6 +5,7 @@
+ XEN_ROOT = "../.."
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Wall",
"-Werror" ]
++extra_link_args = [ "-Wl,-rpath,/usr/lib/xen" ]
+
+
+ include_dirs = [ XEN_ROOT + "/tools/libxc",
+@@ -19,6 +20,7 @@
+
+ xc = Extension("xc",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/xc" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+@@ -26,6 +28,7 @@
+
+ xs = Extension("xs",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = include_dirs + [
"xen/lowlevel/xs" ],
+ library_dirs = library_dirs,
+ libraries = libraries,
+diff -urNad xen-unstable~/tools/python/xen/util/auxbin.py
xen-unstable/tools/python/xen/util/auxbin.py
+--- xen-unstable~/tools/python/xen/util/auxbin.py 2006-03-11 16:54:35.000000000
+0100
++++ xen-unstable/tools/python/xen/util/auxbin.py 2006-03-11 17:18:57.687333533
+0100
+@@ -16,12 +16,7 @@
+ #===========================================================================+
+
+-LIB_BIN_32 = "/usr/lib/xen/bin"
+-LIB_BIN_64 = "/usr/lib64/xen/bin"
+-
+-## The architectures on which the LIB_BIN_64 directory is used. This
+-# deliberately excludes ia64.
+-LIB_64_ARCHS = [ ''x86_64'', ''ppc64'',
''s390x'', ''sparc64'']
++LIB_BIN = "/usr/lib/xen/bin"
+
+
+ import os
+@@ -29,20 +24,10 @@
+
+
+ def execute(exe, args = None):
+- exepath = pathTo(exe)
++ exepath = os.path.join(LIB_BIN, exe)
+ a = [ exepath ]
+ if args:
+ a.extend(args)
+ os.execv(exepath, a)
+
+
+-def pathTo(exe):
+- return os.path.join(path(), exe)
+-
+-
+-def path():
+- machine = os.uname()[4]
+- if machine in LIB_64_ARCHS and os.path.exists(LIB_BIN_64):
+- return LIB_BIN_64
+- else:
+- return LIB_BIN_32
+diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
+--- xen-unstable~/tools/xenstore/Makefile 2006-03-11 16:54:36.000000000 +0100
++++ xen-unstable/tools/xenstore/Makefile 2006-03-11 17:18:57.687333533 +0100
+@@ -146,8 +146,8 @@
+ $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
+ $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
+- $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+- $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
++ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen
++ $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)/xen
+ $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
+ $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
+
+diff -urNad xen-unstable~/tools/xentrace/Makefile
xen-unstable/tools/xentrace/Makefile
+--- xen-unstable~/tools/xentrace/Makefile 2006-03-11 16:54:36.000000000 +0100
++++ xen-unstable/tools/xentrace/Makefile 2006-03-11 17:18:57.688333395 +0100
+@@ -48,4 +48,4 @@
+ $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
+
+ %: %.c $(HDRS) Makefile
+- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
++ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
Added: trunk/xen-unstable/debian/patches/manpages.dpatch
==================================================================---
trunk/xen-unstable/debian/patches/manpages.dpatch 2006-03-11 15:40:58 UTC (rev
107)
+++ trunk/xen-unstable/debian/patches/manpages.dpatch 2006-03-11 16:19:35 UTC
(rev 108)
@@ -0,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## manpages.dpatch by Bastian Blank <waldi@debian.org>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xen-3.0~/docs/Makefile xen-3.0/docs/Makefile
+--- xen-3.0~/docs/Makefile 2006-02-23 22:07:46.000000000 +0100
++++ xen-3.0/docs/Makefile 2006-03-10 19:03:19.198939405 +0100
+@@ -16,9 +16,9 @@
+ mandir := /usr/share/man
+
+ DOC_MAN5SRC := $(wildcard man/*.pod.5)
+-DOC_MAN1SRC := $(wildcard man/*.pod.1)
+-DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(DOC_MAN1SRC))
++DOC_MAN8SRC := $(wildcard man/*.pod.1)
+ DOC_MAN5 := $(patsubst man/%.pod.5,man5/%.5,$(DOC_MAN5SRC))
++DOC_MAN8 := $(patsubst man/%.pod.1,man8/%.8,$(DOC_MAN8SRC))
+ DOC_TEX := src/user.tex src/interface.tex
+ DOC_PS := $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX))
+ DOC_PDF := $(patsubst src/%.tex,pdf/%.pdf,$(DOC_TEX))
+@@ -52,12 +52,12 @@
+
+ man-pages:
+ @if which $(POD2MAN) 1>/dev/null 2>/dev/null; then \
+- $(MAKE) $(DOC_MAN1) $(DOC_MAN5); fi
++ $(MAKE) $(DOC_MAN5) $(DOC_MAN8); fi
+
+-man1/%.1: man/%.pod.1 Makefile
++man8/%.8: man/%.pod.1 Makefile
+ $(INSTALL_DIR) $(@D)
+- $(POD2MAN) --release=$(VERSION) --name=`echo $@ | sed
''s/^man1.//''| \
+- sed ''s/.1//''` -s 1 -c "Xen" $< $@
++ $(POD2MAN) --release=$(VERSION) --name=`echo $@ | sed
''s/^man8.//''| \
++ sed ''s/.8//''` -s 8 -c "Xen" $< $@
+
+ man5/%.5: man/%.pod.5 Makefile
+ $(INSTALL_DIR) $(@D)
+@@ -70,7 +70,7 @@
+ rm -rf $(GFX) ps pdf html
+ rm -rf api
+ rm -rf man5
+- rm -rf man1
++ rm -rf man8
+
+ install: all
+ rm -rf $(DESTDIR)$(pkgdocdir)
+@@ -78,8 +78,8 @@
+ cp -dR ps $(DESTDIR)$(pkgdocdir)
+ cp -dR pdf $(DESTDIR)$(pkgdocdir)
+ $(INSTALL_DIR) $(DESTDIR)$(mandir)
+- cp -dR man1 $(DESTDIR)$(mandir)
+ cp -dR man5 $(DESTDIR)$(mandir)
++ cp -dR man8 $(DESTDIR)$(mandir)
+ [ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
+
+ pdf/%.pdf: ps/%.ps
+diff -urNad xen-3.0~/tools/xenstat/xentop/Makefile
xen-3.0/tools/xenstat/xentop/Makefile
+--- xen-3.0~/tools/xenstat/xentop/Makefile 2006-02-23 22:07:49.000000000 +0100
++++ xen-3.0/tools/xenstat/xentop/Makefile 2006-03-10 19:03:07.041621437 +0100
+@@ -23,7 +23,7 @@
+
+ prefix=/usr
+ mandir=$(prefix)/share/man
+-man1dir=$(mandir)/man1
++man8dir=$(mandir)/man8
+ sbindir=$(prefix)/sbin
+
+ CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
+@@ -36,7 +36,7 @@
+
+ install: xentop xentop.1
+ $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
+- $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
++ $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man8dir)/xentop.8
+
+ endif
+
+diff -urNad xen-3.0~/tools/xenstat/xentop/xentop.1
xen-3.0/tools/xenstat/xentop/xentop.1
+--- xen-3.0~/tools/xenstat/xentop/xentop.1 2006-02-23 22:07:49.000000000 +0100
++++ xen-3.0/tools/xenstat/xentop/xentop.1 2006-03-10 19:03:07.042621299 +0100
+@@ -13,7 +13,7 @@
+ .\" You should have received a copy of the GNU General Public License
+ .\" along with this program; if not, write to the Free Software
+ .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+-.TH xentop 1 "August 2005"
++.TH xentop 8 "August 2005"
+ .SH NAME
+ \fBxentop\fR \- displays real-time information about a Xen system and domains
+
Added: trunk/xen-unstable/debian/patches/version.dpatch
==================================================================---
trunk/xen-unstable/debian/patches/version.dpatch 2006-03-11 15:40:58 UTC (rev
107)
+++ trunk/xen-unstable/debian/patches/version.dpatch 2006-03-11 16:19:35 UTC
(rev 108)
@@ -0,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## version.dpatch by Bastian Blank <waldi@debian.org>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xen-3.0~/xen/Makefile xen-3.0/xen/Makefile
+--- xen-3.0~/xen/Makefile 2006-02-23 22:07:49.000000000 +0100
++++ xen-3.0/xen/Makefile 2006-03-10 23:44:24.978464943 +0100
+@@ -96,6 +96,9 @@
+ -e ''s/@@subversion@@/$(XEN_SUBVERSION)/g'' \
+ -e ''s/@@extraversion@@/$(XEN_EXTRAVERSION)/g'' \
+ -e ''s!@@changeset@@!$(shell ((hg parents || head -n 7
../ChangeLog || echo date: unavailable) | awk ''{FS="changeset:[
]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END
{print D, CS}'') 2>/dev/null)!g'' \
++ -e ''s/@@system_distribution@@/$(shell lsb_release
-is)/g'' \
++ -e ''s/@@system_maintainer@@/$(shell cd ../../../..;
dpkg-parsechangelog | sed -ne ''s,^Maintainer:
.[^<]*<\([^>]*\)>,\1,p'')/g'' \
++ -e ''s/@@system_version@@/$(shell cd ../../../..;
dpkg-parsechangelog | awk ''/^Version:/ {print
$$2}'')/g'' \
+ < include/xen/compile.h.in > $@.new
+ @cat include/xen/banner.h >> $@.new
+ @mv -f $@.new $@
+diff -urNad xen-3.0~/xen/common/kernel.c xen-3.0/xen/common/kernel.c
+--- xen-3.0~/xen/common/kernel.c 2006-02-23 22:07:50.000000000 +0100
++++ xen-3.0/xen/common/kernel.c 2006-03-10 23:44:02.932515123 +0100
+@@ -104,7 +104,7 @@
+ {
+ struct xen_compile_info info;
+ safe_strcpy(info.compiler, XEN_COMPILER);
+- safe_strcpy(info.compile_by, XEN_COMPILE_BY);
++ safe_strcpy(info.compile_by, XEN_COMPILE_SYSTEM_MAINTAINER);
+ safe_strcpy(info.compile_domain, XEN_COMPILE_DOMAIN);
+ safe_strcpy(info.compile_date, XEN_COMPILE_DATE);
+ if ( copy_to_user(arg, &info, sizeof(info)) )
+diff -urNad xen-3.0~/xen/drivers/char/console.c
xen-3.0/xen/drivers/char/console.c
+--- xen-3.0~/xen/drivers/char/console.c 2006-02-23 22:07:50.000000000 +0100
++++ xen-3.0/xen/drivers/char/console.c 2006-03-10 23:44:02.933514984 +0100
+@@ -463,15 +463,11 @@
+
+ serial_set_rx_handler(sercon_handle, serial_rx);
+
+- /* HELLO WORLD --- start-of-day banner text. */
+- printk(XEN_BANNER);
+- printk(" http://www.cl.cam.ac.uk/netos/xen\n");
+- printk(" University of Cambridge Computer Laboratory\n\n");
+- printk(" Xen version %d.%d%s (%s@%s) (%s) %s\n",
++ printk(" Xen version %d.%d%s (%s %s) (%s) (%s) %s\n",
+ XEN_VERSION, XEN_SUBVERSION, XEN_EXTRAVERSION,
+- XEN_COMPILE_BY, XEN_COMPILE_DOMAIN,
++ XEN_COMPILE_SYSTEM_DISTRIBUTION, XEN_COMPILE_SYSTEM_VERSION,
++ XEN_COMPILE_SYSTEM_MAINTAINER,
+ XEN_COMPILER, XEN_COMPILE_DATE);
+- printk(" Latest ChangeSet: %s\n\n", XEN_CHANGESET);
+ set_printk_prefix("(XEN) ");
+
+ if ( opt_sync_console )
+diff -urNad xen-3.0~/xen/include/xen/compile.h.in
xen-3.0/xen/include/xen/compile.h.in
+--- xen-3.0~/xen/include/xen/compile.h.in 2006-02-23 22:07:51.000000000 +0100
++++ xen-3.0/xen/include/xen/compile.h.in 2006-03-10 23:44:02.933514984 +0100
+@@ -3,6 +3,9 @@
+ #define XEN_COMPILE_BY "@@whoami@@"
+ #define XEN_COMPILE_DOMAIN "@@domain@@"
+ #define XEN_COMPILE_HOST "@@hostname@@"
++#define XEN_COMPILE_SYSTEM_DISTRIBUTION "@@system_distribution@@"
++#define XEN_COMPILE_SYSTEM_VERSION "@@system_version@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER "@@system_maintainer@@"
+ #define XEN_COMPILER "@@compiler@@"
+
+ #define XEN_VERSION @@version@@
Modified: trunk/xen-unstable/debian/rules
==================================================================---
trunk/xen-unstable/debian/rules 2006-03-11 15:40:58 UTC (rev 107)
+++ trunk/xen-unstable/debian/rules 2006-03-11 16:19:35 UTC (rev 108)
@@ -11,35 +11,40 @@
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
+export DH_OPTIONS
+
+unpatch:
+
+setup: $(STAMPS_DIR)/setup
+$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) setup-docs setup-hypervisor
setup-tools
+ dh_testdir
+ touch $@
+
srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/source:
+$(STAMPS_DIR)/setup-patch:
@rm -rf $(BUILD_DIR)/source
mkdir $(BUILD_DIR)/source
cp -a $(srcfiles) $(BUILD_DIR)/source
+ dpatch -d $(BUILD_DIR)/source apply-all
touch $@
-setup: $(STAMPS_DIR)/setup
-$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) setup-hypervisor setup-tools
- dh_testdir
- touch $@
-
-$(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/source
+$(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/setup-patch
@rm -rf $(BUILD_DIR)/build-docs
- cp -a $(BUILD_DIR)/source $(BUILD_DIR)/build-docs
+ cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-docs
touch $@
-$(STAMPS_DIR)/setup-hypervisor-%: $(STAMPS_DIR)/source
+$(STAMPS_DIR)/setup-hypervisor-%: $(STAMPS_DIR)/setup-patch
@rm -rf $(BUILD_DIR)/build-hypervisor-$*
- cp -a $(BUILD_DIR)/source $(BUILD_DIR)/build-hypervisor-$*
+ cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-hypervisor-$*
touch $@
-$(STAMPS_DIR)/setup-tools: $(STAMPS_DIR)/source
+$(STAMPS_DIR)/setup-tools: $(STAMPS_DIR)/setup-patch
@rm -rf $(BUILD_DIR)/build-tools
- cp -a $(BUILD_DIR)/source $(BUILD_DIR)/build-tools
+ cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-tools
touch $@
build: $(STAMPS_DIR)/build
-$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup
build-hypervisor build-tools
+$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup build-docs
build-hypervisor build-tools
dh_testdir
touch $@
@@ -47,6 +52,10 @@
$(STAMPS_DIR)/build-%: DIR=$(BUILD_DIR)/$(@F)
+$(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs
+ $(MAKE) -C $(DIR)/docs
+ touch $@
+
$(STAMPS_DIR)/build-hypervisor-amd64: $(STAMPS_DIR)/setup-hypervisor-amd64
$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_64
touch $@
@@ -64,10 +73,12 @@
touch $@
setup-docs:: $(STAMPS_DIR)/setup-docs
-ifneq (,$(filter amd64 i386, $(DEB_HOST_ARCH)))
+build-docs:: $(STAMPS_DIR)/build-docs
+ifneq (,$(filter amd64, $(DEB_HOST_ARCH)))
build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-amd64
install-hypervisor:: install-hypervisor-amd64
setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-amd64
+endif
ifneq (,$(filter i386, $(DEB_HOST_ARCH)))
build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-i386
install-hypervisor:: install-hypervisor-i386
@@ -76,6 +87,7 @@
install-hypervisor:: install-hypervisor-i386-pae
setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-i386-pae
endif
+ifneq (,$(filter amd64 i386 ia64, $(DEB_HOST_ARCH)))
build-tools:: $(STAMPS_DIR)/build-tools
install-tools-check:: install-tools
setup-tools:: $(STAMPS_DIR)/setup-tools
@@ -105,15 +117,18 @@
dh_clean
install-arch: install-hypervisor install-tools-check
- dh_testdir
- dh_testroot
- dh_installdirs
install-indep: install-docs
+install-docs: DH_OPTIONS = -pxen-docs-$(MAJOR)
install-docs:
- $(MAKE) -C debian/build/build-docs/docs
+ dh_testdir
+ dh_testroot
+ dh_clean
+ $(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
+ dh_install --sourcedir=debian/tmp
+
install-hypervisor-%:
dh_testdir
dh_testroot
@@ -123,27 +138,42 @@
cp $(BUILD_DIR)/build-hypervisor-$*/xen/xen.gz
debian/xen-hypervisor-$(MAJOR)-$*/boot/xen-$(MAJOR)-$*.gz
#cp $(BUILD_DIR)/build-hypervisor-$*/xen/xen-syms
debian/xen-hypervisor-$(MAJOR)-$*/boot/xen-$(MAJOR)-$*.gz
-install-tools: export DH_OPTIONS = -plibxen3.0-unstable
-plibxen3.0-unstable-dev -plibxen3.0-unstable-python -pxen-utils-unstable
+install-tools: DH_OPTIONS = -pxen-utils-$(MAJOR)
install-tools:
dh_testdir
dh_testroot
dh_clean
- $(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1
DESTDIR=$(CURDIR)/debian/tmp LIBDIR=lib
+ $(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1
DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp
dh_install --sourcedir=debian/tmp
# Build architecture-independent files here.
-binary-indep:
+binary-indep: install-indep
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install-arch
+binary-arch: install-arch
dh_testdir
dh_testroot
dh_installchangelogs -s
dh_installdocs -s
dh_installexamples -s
- dh_installinit -p xen-utils-$(MAJOR) --name xend -- defaults 20 21
- dh_installinit -p xen-utils-$(MAJOR) --name xendomains -- defaults 21 20
+ dh_installinit -p xen-utils-$(MAJOR) --name xend -- 21 20
+ dh_installinit -p xen-utils-$(MAJOR) --name xendomains -- 20 21
dh_installman -s
dh_link -s
dh_strip -s
@@ -152,7 +182,7 @@
dh_python -s
dh_makeshlibs -s
dh_installdeb -s
- dh_shlibdeps -s -L libxen3.0-unstable
+ dh_shlibdeps -s
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
Modified: trunk/xen-unstable/debian/xen-utils-unstable.install
==================================================================---
trunk/xen-unstable/debian/xen-utils-unstable.install 2006-03-11 15:40:58 UTC
(rev 107)
+++ trunk/xen-unstable/debian/xen-utils-unstable.install 2006-03-11 16:19:35 UTC
(rev 108)
@@ -1,6 +1,17 @@
+etc/udev/*.rules
etc/xen/auto
etc/xen/scripts
etc/xen/xend*
-usr/bin/xen*
-usr/sbin/xen*
+usr/bin/xenstore*
+usr/lib/python2.3
+usr/lib/xen/bin/xc*
+usr/lib/xen/bin/xen*
+usr/lib/xen/*.so
+usr/sbin/xenconsoled
+usr/sbin/xend
+usr/sbin/xenstored
+usr/sbin/xentop
usr/sbin/xm
+usr/share/man/man5
+usr/share/man/man8/xentop.8
+usr/share/man/man8/xm.8