Bastian Blank
2007-Sep-11 12:40 UTC
[Pkg-xen-changes] r452 - in trunk/xen-unstable/debian: . arch/i386 bin lib lib/python lib/python/debian_xen patches templates
Author: waldi
Date: Tue Sep 11 12:40:27 2007
New Revision: 452
Log:
Update from xen-3.
Added:
trunk/xen-unstable/debian/bin/genorig.py (contents, props changed)
trunk/xen-unstable/debian/lib/
trunk/xen-unstable/debian/lib/python/
trunk/xen-unstable/debian/lib/python/debian_xen/
trunk/xen-unstable/debian/lib/python/debian_xen/__init__.py
trunk/xen-unstable/debian/lib/python/debian_xen/debian.py
trunk/xen-unstable/debian/patches/config-prefix.diff
- copied unchanged from r412,
/trunk/xen-3/debian/patches/config-prefix.diff
trunk/xen-unstable/debian/patches/disable-features.diff
- copied unchanged from r422,
/trunk/xen-3/debian/patches/disable-features.diff
trunk/xen-unstable/debian/patches/doc-remove-unused.diff
- copied unchanged from r440,
/trunk/xen-3/debian/patches/doc-remove-unused.diff
trunk/xen-unstable/debian/patches/series
- copied unchanged from r440, /trunk/xen-3/debian/patches/series
trunk/xen-unstable/debian/patches/tools-ioemu-arch.diff
- copied unchanged from r415,
/trunk/xen-3/debian/patches/tools-ioemu-arch.diff
trunk/xen-unstable/debian/patches/tools-ioemu-config.diff
- copied unchanged from r412,
/trunk/xen-3/debian/patches/tools-ioemu-config.diff
trunk/xen-unstable/debian/patches/tools-ldflags.diff
- copied unchanged from r412,
/trunk/xen-3/debian/patches/tools-ldflags.diff
trunk/xen-unstable/debian/patches/tools-lib-abiname.diff
- copied unchanged from r420,
/trunk/xen-3/debian/patches/tools-lib-abiname.diff
trunk/xen-unstable/debian/patches/tools-libfsimage-prefix.diff
- copied unchanged from r428,
/trunk/xen-3/debian/patches/tools-libfsimage-prefix.diff
trunk/xen-unstable/debian/patches/tools-misc-prefix.diff
- copied unchanged from r446,
/trunk/xen-3/debian/patches/tools-misc-prefix.diff
trunk/xen-unstable/debian/patches/tools-misc-xend-race.diff
- copied unchanged from r434,
/trunk/xen-3/debian/patches/tools-misc-xend-race.diff
trunk/xen-unstable/debian/patches/tools-prefix.diff
- copied unchanged from r421,
/trunk/xen-3/debian/patches/tools-prefix.diff
trunk/xen-unstable/debian/patches/tools-pygrub-prefix.diff
- copied unchanged from r446,
/trunk/xen-3/debian/patches/tools-pygrub-prefix.diff
trunk/xen-unstable/debian/patches/tools-python-prefix.diff
- copied unchanged from r426,
/trunk/xen-3/debian/patches/tools-python-prefix.diff
trunk/xen-unstable/debian/patches/tools-python-xen-xm-relative-path.diff
- copied unchanged from r412,
/trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
trunk/xen-unstable/debian/patches/tools-rpath.diff
- copied unchanged from r412, /trunk/xen-3/debian/patches/tools-rpath.diff
trunk/xen-unstable/debian/patches/tools-xenfb-prefix.diff
- copied unchanged from r431,
/trunk/xen-3/debian/patches/tools-xenfb-prefix.diff
trunk/xen-unstable/debian/patches/version.patch
- copied unchanged from r412, /trunk/xen-3/debian/patches/version.patch
Removed:
trunk/xen-unstable/debian/patches/00list
trunk/xen-unstable/debian/patches/abi-revert-1.dpatch
trunk/xen-unstable/debian/patches/blktap-disable.dpatch
trunk/xen-unstable/debian/patches/libs.dpatch
trunk/xen-unstable/debian/patches/path-relative.dpatch
trunk/xen-unstable/debian/patches/prefix-ioemu.dpatch
trunk/xen-unstable/debian/patches/prefix-python.dpatch
trunk/xen-unstable/debian/patches/prefix-utils.dpatch
trunk/xen-unstable/debian/patches/qemu-arch.dpatch
trunk/xen-unstable/debian/patches/qemu-config.dpatch
trunk/xen-unstable/debian/patches/version.dpatch
Modified:
trunk/xen-unstable/debian/arch/i386/defines
trunk/xen-unstable/debian/bin/gencontrol.py
trunk/xen-unstable/debian/changelog
trunk/xen-unstable/debian/rules
trunk/xen-unstable/debian/rules.defs
trunk/xen-unstable/debian/rules.real
trunk/xen-unstable/debian/templates/control.hypervisor.in
trunk/xen-unstable/debian/templates/control.main.in
trunk/xen-unstable/debian/templates/control.source.in
trunk/xen-unstable/debian/templates/control.utils.in
trunk/xen-unstable/debian/templates/xen-hypervisor.postinst.in
trunk/xen-unstable/debian/templates/xen-hypervisor.postrm.in
Modified: trunk/xen-unstable/debian/arch/i386/defines
=============================================================================---
trunk/xen-unstable/debian/arch/i386/defines (original)
+++ trunk/xen-unstable/debian/arch/i386/defines Tue Sep 11 12:40:27 2007
@@ -1,18 +1,18 @@
[base]
flavours:
i386
- i386-pae
+ i386-nonpae
xen-arch: x86_32
[i386]
+class: i386
+config: pae=y
desc:
- This version of the hypervisor is built with support for systems with up to
- 4GB of memory. If you have more please install the -pae version instead.
+ This version of the hypervisor is built with PAE enabled. If you have a cpu
+ without pae support install the -nonpae version instead.
-[i386-pae]
-config: pae=y
+[i386-nonpae]
+class: i386 without pae
desc:
- This version of the hypervisor is built with PAE enabled, in order to support
- systems with more than 4GB of memory. If you have less than that you should
- probably choose the non -pae version.
+ This version of the hypervisor is built without PAE.
Modified: trunk/xen-unstable/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-unstable/debian/bin/gencontrol.py (original)
+++ trunk/xen-unstable/debian/bin/gencontrol.py Tue Sep 11 12:40:27 2007
@@ -1,31 +1,28 @@
-#!/usr/bin/env python2.4
-import sys
-sys.path.append(sys.argv[2]+ "/lib/python")
-import debian_linux.gencontrol
+#!/usr/bin/env python
+import os, sys
+sys.path.append(os.path.join(sys.path[0], "../lib/python"))
+from debian_xen.debian import VersionXenUnstable
+from debian_linux.gencontrol import Gencontrol as Base
from debian_linux.config import *
from debian_linux.debian import *
-class gencontrol(debian_linux.gencontrol.gencontrol):
+class Gencontrol(Base):
makefile_targets = (''binary-arch'',
''build'', ''setup'')
def __init__(self):
- super(gencontrol, self).__init__()
- self.process_changelog(read_changelog())
+ super(Gencontrol, self).__init__()
+ self.process_changelog()
def do_main_setup(self, vars, makeflags, extra):
makeflags.update({
- ''MAJOR'':
self.version[''xen''][''major''],
- ''VERSION'':
self.version[''xen''][''version''],
- ''SHORT_VERSION'':
self.version[''xen''][''short_version''],
- ''EXTRAVERSION'':
self.version[''xen''][''extraversion''],
- ''ABINAME'': self.abiname,
+ ''MAJOR'': self.version.xen_major,
+ ''VERSION'': ''unstable'',
+ ''ABINAME'': '''',
})
def do_main_packages(self, packages, extra):
packages.extend(self.process_packages(self.templates["control.main"],
self.vars))
-
packages[''source''][''Build-Depends''].append(''linux-support-%s''
% sys.argv[1])
-
def do_arch_setup(self, vars, makeflags, arch, extra):
for i in (
(''xen-arch'', ''XEN_ARCH''),
@@ -112,59 +109,14 @@
makefile.append(("setup-%s-%s-real:" % (arch, flavour),
cmds_setup))
makefile.append(("source-%s-%s-real:" % (arch, flavour)))
- def process_changelog(self, changelog):
- self.version = changelog[0][''Version'']
- self.version[''xen''] =
parse_version_xen(self.version[''complete''])
- self.abiname = ''-%s'' %
self.config[''abi'',][''abiname'']
+ def process_changelog(self):
+ changelog = Changelog(version = VersionXenUnstable)
+ self.version = changelog[0].version
self.vars = {
- ''major'':
self.version[''xen''][''major''],
- ''version'':
self.version[''xen''][''version''],
- ''short_version'':
self.version[''xen''][''short_version''],
- ''abiname'': self.abiname,
+ ''major'': self.version.xen_major,
+ ''version'': ''unstable'',
+ ''abiname'': '''',
}
-def parse_version_xen(version):
- version_re = ur"""
-^
-(?P<source>
- (?P<upstream>
- (?P<version>
- (?P<major>\d+\.\d+)
- (
- (
- (?P<minor>\.\d+)
- -\d+
- )
- |
- (?P<unstable>-unstable)
- )
- )
- (?:
- \+hg
- (?P<hg_rev>
- \d+
- )
- )?
- )
- -
- (?P<debian>[^-]+)
-)
-$
-"""
- match = re.match(version_re, version, re.X)
- if match is None:
- raise ValueError
- ret = match.groupdict()
- if ret[''unstable''] is not None:
- ret[''major''] = ''unstable''
- ret[''short_version''] =
ret[''version'']
- ret[''extraversion''] =
ret[''unstable'']
- else:
- ret[''version''] = ret[''major''] +
ret[''minor'']
- ret[''short_version''] = ret[''major'']
- ret[''extraversion''] = ret[''minor'']
- del ret[''unstable'']
- return ret
-
if __name__ == ''__main__'':
- gencontrol()()
+ Gencontrol()()
Added: trunk/xen-unstable/debian/bin/genorig.py
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/bin/genorig.py Tue Sep 11 12:40:27 2007
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+
+import os, os.path, re, shutil, sys
+
+sys.path.append(sys.path[0] + ''/../lib/python'')
+
+from debian_xen.debian import VersionXenUnstable
+from debian_linux.debian import Changelog
+
+class GenOrig(object):
+ log = sys.stdout.write
+
+ def __init__(self, repo, tag = None, version = None):
+ self.repo, self.tag, self.version = repo, tag, version
+
+ self.changelog_entry = Changelog(version = VersionXenUnstable)[0]
+ self.source = self.changelog_entry.source
+
+ def __call__(self):
+ import tempfile
+ self.dir = tempfile.mkdtemp(prefix = ''genorig'', dir =
''debian'')
+ try:
+ self.do_update()
+ self.do_version()
+
+ self.orig_dir = "%s-%s" % (self.source, self.version)
+ self.orig_tar = "%s_%s.orig.tar.gz" % (self.source,
self.version)
+
+ self.do_archive()
+ self.do_changelog()
+ self.do_tar()
+ finally:
+ shutil.rmtree(self.dir)
+
+ def do_update(self):
+ if self.tag is None:
+ return
+ raise NotImplementedError
+
+ def do_version(self):
+ if self.version is not None:
+ return
+
+ f = os.popen("cd ''%s''; hg id" % self.repo)
+ id = f.read().strip().split()[0]
+ f.close()
+ f = os.popen("cd ''%s''; hg log -r %s" %
(self.repo, id))
+ changeset = f.read().strip().split()[1].split('':'')[0]
+
+ a =
self.changelog_entry.version.upstream.split(''+'')[0]
+ self.version = ''%s+hg%s'' % (a, changeset)
+
+ def do_archive(self):
+ self.log("Create archive.\n")
+ f = os.popen("cd %s; hg archive %s/%s" % (self.repo,
os.path.realpath(self.dir), self.orig_dir))
+ if f.close() is not None:
+ raise RuntimeError
+
+ def do_changelog(self):
+ self.log("Exporting changelog.\n")
+ f = os.popen("cd %s; hg log" % (self.repo))
+ f_out = file("%s/%s/Changelog" % (self.dir, self.orig_dir),
''w'')
+ shutil.copyfileobj(f, f_out)
+ if f.close() is not None:
+ raise RuntimeError
+ f_out.close()
+
+ def do_tar(self):
+ out = "../orig/%s" % self.orig_tar
+ self.log("Generate tarball %s\n" % out)
+ f = os.popen("tar -C %s -czf %s %s" % (self.dir, out,
self.orig_dir))
+ if f.close() is not None:
+ raise RuntimeError
+
+if __name__ == ''__main__'':
+ from optparse import OptionParser
+ p = OptionParser()
+ p.add_option("-t", "--tag", dest = "tag")
+ p.add_option("-v", "--version", dest =
"version")
+ options, args = p.parse_args(sys.argv)
+ GenOrig(args[1], options.tag, options.version)()
Modified: trunk/xen-unstable/debian/changelog
=============================================================================---
trunk/xen-unstable/debian/changelog (original)
+++ trunk/xen-unstable/debian/changelog Tue Sep 11 12:40:27 2007
@@ -1,3 +1,11 @@
+xen-unstable (3.0-unstable+hg15837-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Don''t longer try to maintain binary compatibility between unstable
+ snapshots.
+
+ -- Bastian Blank <waldi at debian.org> Tue, 11 Sep 2007 12:36:42 +0000
+
xen-unstable (3.0-unstable+hg11561-1) unstable; urgency=low
* New upstream snapshot.
Added: trunk/xen-unstable/debian/lib/python/debian_xen/__init__.py
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/lib/python/debian_xen/__init__.py Tue Sep 11
12:40:27 2007
@@ -0,0 +1,19 @@
+def _setup():
+ import os.path, sys
+ version = None
+ rules = os.path.join(__path__[0], "../../../rules.defs")
+ f = file(rules)
+ for l in f:
+ l = l.strip().split()
+ if l[0] == ''KERNELVERSION'':
+ version = l[-1]
+ f.close()
+ if version is None:
+ raise RuntimeError("Can''t find KERNELVERSION
setting")
+ global support
+ support = ''/usr/src/linux-support-%s'' % version
+ if not os.path.exists(support):
+ raise RuntimeError("Can''t find %s" % support)
+ sys.path.append(''%s/lib/python'' % support)
+
+_setup()
Added: trunk/xen-unstable/debian/lib/python/debian_xen/debian.py
=============================================================================---
(empty file)
+++ trunk/xen-unstable/debian/lib/python/debian_xen/debian.py Tue Sep 11
12:40:27 2007
@@ -0,0 +1,33 @@
+import re
+from debian_linux.debian import Version
+
+class VersionXenUnstable(Version):
+ _version_xen_rules = ur"""
+^
+(?P<version>
+ \d+\.\d+
+ -unstable
+)
+(?:
+ \+hg
+ (?P<hg_rev>
+ \d+
+ )
+)
+-
+(?:[^-]+)
+$
+"""
+ _version_xen_re = re.compile(_version_xen_rules, re.X)
+
+ def __init__(self, version):
+ super(VersionXenUnstable, self).__init__(version)
+ match = self._version_xen_re.match(version)
+ if match is None:
+ raise ValueError("Invalid debian xen version")
+ d = match.groupdict()
+ self.xen_major = ''unstable''
+ self.xen_version = d[''version'']
+
+if __name__ == ''__main__'':
+ gencontrol()()
Modified: trunk/xen-unstable/debian/rules
=============================================================================---
trunk/xen-unstable/debian/rules (original)
+++ trunk/xen-unstable/debian/rules Tue Sep 11 12:40:27 2007
@@ -3,12 +3,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include debian/rules.defs
-include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
VERSION := $(shell dpkg-parsechangelog | perl -ne
''/^Version:\s+(\S+)-[^-]+$$/ && print $$1;'')
-GENCONTROL = debian/bin/gencontrol.py $(KERNELVERSION)
+include debian/rules.defs
setup: $(STAMPS_DIR)/setup-base
$(STAMPS_DIR)/setup-base: debian/control $(BUILD_DIR) $(STAMPS_DIR)
@@ -16,17 +16,61 @@
$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
touch $@
-$(BUILD_STAMP): $(STAMPS_DIR)/setup-base
+build: debian/control $(STAMPS_DIR)/build-base
+$(STAMPS_DIR)/build-base: $(STAMPS_DIR)/setup-base
+ dh_testdir
+ $(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
+ touch $@
+
+$(BUILD_DIR) $(STAMPS_DIR):
+ @[ -d $@ ] || mkdir $@
+
+maintainerclean:
+ rm -f debian/control* debian/rules.gen debian/xen-hypervisor-*
debian/xen-utils-*
+ rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
+
+clean: debian/control
+ dh_testdir
+ rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_xen/*.pyc
+ dh_clean
+
+binary-indep:
+ dh_testdir
+ $(MAKE) -f debian/rules.gen binary-indep
+
+binary-arch:
+ dh_testdir
+ $(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
+
+binary: binary-indep binary-arch
DIR_ORIG = ../orig/xen-$(MAJOR)-$(VERSION)
orig: $(DIR_ORIG)
rsync --delete --exclude debian --exclude .svn --link-dest=$(DIR_ORIG)/ -a
$(DIR_ORIG)/ .
-# This is to make dpatch-edit-patch work
-unpatch: clean
-
-maintainerclean:
- rm -f debian/control* debian/rules.gen debian/xen-hypervisor-*
debian/xen-utils-*
- rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
+CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*)
+CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard
debian/arch/*/defines)
+GENCONTROL = $(__MODULES_DIR)gencontrol.py
+debian/control debian/rules.gen: $(CONTROL_FILES)
+ if [ -f debian/control ] && [ -f debian/control.md5sum ] && [
-f debian/rules.gen ]; then \
+ if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
+ $(MAKE) -f debian/rules debian/control-real; \
+ fi \
+ else \
+ $(MAKE) -f debian/rules debian/control-real; \
+ fi
+
+
+debian/control-real: $(CONTROL_FILES)
+ debian/bin/gencontrol.py
+ md5sum $^ > debian/control.md5sum
+ @echo
+ @echo This target is made to fail intentionally, to make sure
+ @echo that it is NEVER run during the automated build. Please
+ @echo ignore the following error, the debian/control file has
+ @echo been generated SUCCESSFULLY.
+ @echo
+ exit 1
+.PHONY: clean build binary-indep binary-arch binary
Modified: trunk/xen-unstable/debian/rules.defs
=============================================================================---
trunk/xen-unstable/debian/rules.defs (original)
+++ trunk/xen-unstable/debian/rules.defs Tue Sep 11 12:40:27 2007
@@ -1,2 +1,5 @@
-KERNELVERSION := 2.6.17-2
+KERNELVERSION := 2.6.22-2
MAJOR := unstable
+BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
+TEMPLATES_DIR = debian/templates
Modified: trunk/xen-unstable/debian/rules.real
=============================================================================---
trunk/xen-unstable/debian/rules.real (original)
+++ trunk/xen-unstable/debian/rules.real Tue Sep 11 12:40:27 2007
@@ -1,5 +1,10 @@
+DEB_HOST_ARCH := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
+
+export DH_OPTIONS
+
include debian/rules.defs
-include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.real.include
binary-arch-arch: install-utils_$(ARCH)
binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
@@ -18,7 +23,7 @@
@rm -rf $(DIR)
mkdir $(DIR)
cp -a $(srcfiles) $(DIR)
- dpatch -d $(DIR) apply-all
+ cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null
push -a || test $$? = 2
touch $@
$(STAMPS_DIR)/setup-docs: SOURCE_DIR=$(BUILD_DIR)/source
@@ -53,9 +58,16 @@
$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=$(XEN_ARCH) $(CONFIG)
touch $@
+$(STAMPS_DIR)/build-utils_$(ARCH) \
+install-utils_$(ARCH): CONFIG = \
+ XEN_COMPILE_ARCH=$(XEN_ARCH) \
+ XEN_TARGET_ARCH=$(XEN_ARCH) \
+ XEN_VERSION=$(VERSION)$(ABINAME) \
+ XENFB_TOOLS=y
+
$(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 $(CONFIG)
touch $@
install-base:
@@ -69,7 +81,7 @@
dh_builddeb
install-docs: DIR=$(BUILD_DIR)/build-docs
-install-docs: PACKAGE_NAME = xen-docs-$(SHORT_VERSION)
+install-docs: PACKAGE_NAME = xen-docs-$(VERSION)
install-docs: DH_OPTIONS = -p$(PACKAGE_NAME)
install-docs: $(STAMPS_DIR)/build-docs
dh_testdir
@@ -90,26 +102,22 @@
cp $(DIR)/xen/xen.gz
debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz
$(MAKE) -f debian/rules.real install-base
-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): DH_OPTIONS = -p$(PACKAGE_NAME_UTILS)
-p$(PACKAGE_NAME_IOEMU)
+install-utils_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH)
+install-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-utils_$(ARCH): PACKAGE_NAME = xen-utils-$(VERSION)$(ABINAME)
+install-utils_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
+install-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
dh_testdir
dh_testroot
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)
- 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
+ @rm -rf $(DIR)
+ $(MAKE) -C $(SOURCE_DIR)/tools install DESTDIR=$(CURDIR)/$(DIR)
DISTDIR=$(CURDIR)/$(DIR) $(CONFIG)
+ install -D -m644 debian/xen-utils.NEWS
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS
+ install -D -m644 debian/xen-utils.README.Debian
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian
+ dh_install --sourcedir=$(DIR) usr/lib
+ dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
dh_pycentral
- dh_python
dh_strip
dh_shlibdeps
$(MAKE) -f debian/rules.real install-base
Modified: trunk/xen-unstable/debian/templates/control.hypervisor.in
=============================================================================---
trunk/xen-unstable/debian/templates/control.hypervisor.in (original)
+++ trunk/xen-unstable/debian/templates/control.hypervisor.in Tue Sep 11
12:40:27 2007
@@ -1,15 +1,15 @@
Package: xen-hypervisor- at version@@abiname@@localversion@
Depends: xen-utils- at version@@abiname@
Provides: xen-hypervisor, xen-hypervisor- at major@, xen-hypervisor- at
version@@abiname@, xen-hypervisor at localversion@
+Suggests: xen-docs- at version@
Description: The Xen Hypervisor on @class@
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.
.
+ @desc@
+ .
In order to boot a XEN system along with this package you also need a kernel
specifically crafted to work as the Domain 0, mediating hardware access for
- XEN itself. An example config file for this kernel and documentation on how
- to build it can be found in the xen-docs package.
- .
- @desc@
+ XEN itself.
Modified: trunk/xen-unstable/debian/templates/control.main.in
=============================================================================---
trunk/xen-unstable/debian/templates/control.main.in (original)
+++ trunk/xen-unstable/debian/templates/control.main.in Tue Sep 11 12:40:27 2007
@@ -1,4 +1,4 @@
-Package: xen-docs- at short_version@
+Package: xen-docs- at version@
Architecture: all
Description: documentation for XEN, a Virtual Machine Monitor
This package contains all the large documentation files for XEN. This
Modified: trunk/xen-unstable/debian/templates/control.source.in
=============================================================================---
trunk/xen-unstable/debian/templates/control.source.in (original)
+++ trunk/xen-unstable/debian/templates/control.source.in Tue Sep 11 12:40:27
2007
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
Uploaders: Julien Danjou <acid at debian.org>, Jeremy T. Bouse <jbouse
at debian.org>, Guido Trotter <ultrotter at debian.org>, Bastian Blank
<waldi at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3),
libsdl1.2-dev, bcc, dpatch, lsb-release, python-central (>= 0.5)
-Build-Depends-Indep: transfig, tetex-bin, tetex-extra, gs-common
+Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3),
libsdl1.2-dev, bcc, lsb-release, python-central (>= 0.5), quilt, zlib1g-dev,
libjpeg-dev, libncurses5-dev, libssl-dev, libvncserver-dev, gcc-multilib [amd64]
+Build-Depends-Indep: graphviz, gs-common, texlive-fonts-recommended,
texlive-latex-recommended
Standards-Version: 3.7.2.0
XS-Python-Version: current
Modified: trunk/xen-unstable/debian/templates/control.utils.in
=============================================================================---
trunk/xen-unstable/debian/templates/control.utils.in (original)
+++ trunk/xen-unstable/debian/templates/control.utils.in Tue Sep 11 12:40:27
2007
@@ -1,22 +1,10 @@
Package: xen-utils- at version@@abiname@
-Depends: ${shlibs:Depends}, ${python:Depends}, xen-utils-common, iproute, udev
(>> 0.060)
+Depends: ${shlibs:Depends}, ${python:Depends}, xen-utils-common (>=
3.0+hg11624-2), iproute, udev (>> 0.060)
Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at
version@@abiname@
Provides: xen-utils
+Suggests: xen-docs- at version@
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- at short_version@
-Depends: ${shlibs:Depends}, xen-utils- at version@@abiname@ (=
${Source-Version})
-Description: XEN administrative tools
- The userspace tools to manage a system virtualized through the XEN virtual
- machine monitor.
- .
- This package includes the utilities required to support HVM domains, which
- allows full virtualization of unmodified operating systems, such as
- Microsoft''s Windows product line, and standard Linux kernels.
- .
- For this to work, you will need a CPU with hardware virtualization support,
- such as Intel''s CPUs with VT, or AMD''s CPUs with Pacifica.
-
Modified: trunk/xen-unstable/debian/templates/xen-hypervisor.postinst.in
=============================================================================---
trunk/xen-unstable/debian/templates/xen-hypervisor.postinst.in (original)
+++ trunk/xen-unstable/debian/templates/xen-hypervisor.postinst.in Tue Sep 11
12:40:27 2007
@@ -4,7 +4,9 @@
case "$1" in
configure)
- command -v update-grub > /dev/null && update-grub
+ if command -v update-grub > /dev/null && [ -d /boot/grub ];
then
+ update-grub || :
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/xen-unstable/debian/templates/xen-hypervisor.postrm.in
=============================================================================---
trunk/xen-unstable/debian/templates/xen-hypervisor.postrm.in (original)
+++ trunk/xen-unstable/debian/templates/xen-hypervisor.postrm.in Tue Sep 11
12:40:27 2007
@@ -4,7 +4,9 @@
case "$1" in
remove)
- command -v update-grub > /dev/null && update-grub
+ if command -v update-grub > /dev/null && [ -d /boot/grub ];
then
+ update-grub || :
+ fi
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)