[Pkg-xen-changes] r227 - in trunk/xen-3.0/debian: . arch arch/amd64 arch/i386 patches templates

Bastian Blank waldi at costa.debian.org
Sun Aug 20 20:28:51 UTC 2006


Author: waldi
Date: Sun Aug 20 20:28:50 2006
New Revision: 227

Added:
   trunk/xen-3.0/debian/arch/
   trunk/xen-3.0/debian/arch/amd64/
   trunk/xen-3.0/debian/arch/amd64/defines
   trunk/xen-3.0/debian/arch/defines
   trunk/xen-3.0/debian/arch/i386/
   trunk/xen-3.0/debian/arch/i386/defines
   trunk/xen-3.0/debian/bin/
   trunk/xen-3.0/debian/bin/gencontrol.py   (contents, props changed)
   trunk/xen-3.0/debian/rules.real
   trunk/xen-3.0/debian/templates/
   trunk/xen-3.0/debian/templates/control.hypervisor.in
   trunk/xen-3.0/debian/templates/control.main.in
   trunk/xen-3.0/debian/templates/control.source.in
   trunk/xen-3.0/debian/templates/control.utils.in
   trunk/xen-3.0/debian/templates/xen-utils.postinst.in
   trunk/xen-3.0/debian/templates/xen-utils.postrm.in
   trunk/xen-3.0/debian/xen-utils.NEWS
      - copied unchanged from r215, /trunk/xen-3.0/debian/xen-utils-3.0.NEWS
   trunk/xen-3.0/debian/xen-utils.README.Debian
      - copied unchanged from r215, /trunk/xen-3.0/debian/xen-utils-3.0.README.Debian
Removed:
   trunk/xen-3.0/debian/control
   trunk/xen-3.0/debian/patches/backport-9373.dpatch
   trunk/xen-3.0/debian/xen-ioemu-3.0.install
   trunk/xen-3.0/debian/xen-utils-3.0.NEWS
   trunk/xen-3.0/debian/xen-utils-3.0.README.Debian
   trunk/xen-3.0/debian/xen-utils-3.0.install
   trunk/xen-3.0/debian/xen-utils-3.0.postinst
   trunk/xen-3.0/debian/xen-utils-3.0.postrm
   trunk/xen-3.0/debian/xen-utils-3.0.xend.init
   trunk/xen-3.0/debian/xen-utils-3.0.xendomains.default
   trunk/xen-3.0/debian/xen-utils-3.0.xendomains.init
Modified:
   trunk/xen-3.0/debian/changelog
   trunk/xen-3.0/debian/patches/00list
   trunk/xen-3.0/debian/rules
   trunk/xen-3.0/debian/rules.defs

Log:
- Replace build environment.
- Set version to 3.0.2+hg9762-1.


Added: trunk/xen-3.0/debian/arch/amd64/defines
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/arch/amd64/defines	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,9 @@
+[base]
+flavours:
+ amd64
+xen-arch: x86_64
+
+[amd64]
+class: AMD64
+longclass: all 64bit single- and multiprocessor AMD and Intel
+

Added: trunk/xen-3.0/debian/arch/defines
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/arch/defines	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,7 @@
+[abi]
+abiname: 1
+
+[base]
+arches:
+ amd64
+ i386

Added: trunk/xen-3.0/debian/arch/i386/defines
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/arch/i386/defines	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,18 @@
+[base]
+flavours:
+ i386
+ i386-pae
+xen-arch: x86_32
+
+[i386]
+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.
+
+[i386-pae]
+config: XEN_TARGET_X86_PAE=y
+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.
+

Added: trunk/xen-3.0/debian/bin/gencontrol.py
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/bin/gencontrol.py	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,139 @@
+#!/usr/bin/env python2.4
+import sys
+sys.path.append(sys.argv[1]+ "/lib/python")
+import debian_linux.gencontrol
+from debian_linux.config import *
+from debian_linux.debian import *
+
+class gencontrol(debian_linux.gencontrol.gencontrol):
+    makefile_targets = ('binary-arch', 'build', 'setup')
+
+    def __init__(self):
+        super(gencontrol, self).__init__()
+        self.process_changelog(read_changelog())
+
+    def do_main_setup(self, vars, makeflags, extra):
+        makeflags.update({
+            'MAJOR': self.version['xen']['major'],
+            'VERSION': self.version['xen']['version'],
+            'ABINAME': self.abiname,
+        })
+
+    def do_main_packages(self, packages, extra):
+        packages.extend(self.process_packages(self.templates["control.main"], self.vars))
+
+    def do_arch_setup(self, vars, makeflags, arch, extra):
+        for i in (
+            ('xen-arch', 'XEN_ARCH'),
+        ):
+            if vars.has_key(i[0]):
+                makeflags[i[1]] = vars[i[0]]
+
+    def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
+        utils = self.templates["control.utils"]
+        packages_utils = self.process_packages(utils, vars)
+
+        for package in packages_utils:
+            name = package['Package']
+            if packages.has_key(name):
+                package = packages.get(name)
+                package['Architecture'].append(arch)
+            else:
+                package['Architecture'] = [arch]
+                packages.append(package)
+
+        package_utils_name = packages_utils[0]['Package']
+
+        # TODO: move to xen-common
+        for i in ('postinst', 'postrm'):
+            file("debian/%s.%s" % (package_utils_name, i), 'w').write(self.templates["xen-utils.%s" % i])
+
+        cmds_binary_arch = []
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags))
+        cmds_build = []
+        cmds_build.append(("$(MAKE) -f debian/rules.real build-arch %s" % makeflags,))
+        cmds_setup = []
+        cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % makeflags,))
+        makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
+        makefile.append(("build-%s-real:" % arch, cmds_build))
+        makefile.append(("setup-%s-real:" % arch, cmds_setup))
+
+    def do_subarch_makefile(self, makefile, arch, subarch, makeflags, extra):
+        pass
+
+    def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
+        for i in (
+            ('config', 'CONFIG'),
+        ):
+            if vars.has_key(i[0]):
+                makeflags[i[1]] = vars[i[0]]
+
+    def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags, extra):
+        for i in self.makefile_targets:
+            makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch, flavour))
+            makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, flavour, i, arch, flavour))
+
+    def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
+        hypervisor = self.templates["control.hypervisor"]
+
+        packages_own = []
+        packages_own.extend(self.process_packages(hypervisor, vars))
+
+        for package in packages_own:
+            name = package['Package']
+            if packages.has_key(name):
+                package = packages.get(name)
+                package['Architecture'].append(arch)
+            else:
+                package['Architecture'] = [arch]
+                packages.append(package)
+
+        cmds_binary_arch = []
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,))
+        cmds_build = []
+        cmds_build.append(("$(MAKE) -f debian/rules.real build-flavour %s" % makeflags,))
+        cmds_setup = []
+        cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags,))
+        makefile.append(("binary-arch-%s-%s-real:" % (arch, flavour), cmds_binary_arch))
+        makefile.append(("build-%s-%s-real:" % (arch, flavour), cmds_build))
+        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']
+        self.vars = {
+            'major': self.version['xen']['major'],
+            'version': self.version['xen']['version'],
+            'abiname': self.abiname,
+        }
+
+def parse_version_xen(version):
+    version_re = ur"""
+^
+(?P<source>
+    (?P<upstream>
+        (?P<version>
+            (?P<major>\d+\.\d+)
+            (\.\d+)?
+        )
+        (?:
+            \+hg
+            (?P<hg_rev>
+                \d+
+            )
+        )?
+    )
+    -
+    (?P<debian>[^-]+)
+)
+$
+"""
+    match = re.match(version_re, version, re.X)
+    if match is None:
+        raise ValueError
+    return match.groupdict()
+
+if __name__ == '__main__':
+    gencontrol()()

Modified: trunk/xen-3.0/debian/changelog
==============================================================================
--- trunk/xen-3.0/debian/changelog	(original)
+++ trunk/xen-3.0/debian/changelog	Sun Aug 20 20:28:50 2006
@@ -1,3 +1,9 @@
+xen-3.0 (3.0.2+hg9762-1) UNRELEASED; urgency=low
+
+  * 
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 18 Aug 2006 18:08:57 +0000
+
 xen-3.0 (3.0.2+hg9697-2) unstable; urgency=low
 
   [ Guido Trotter ]

Modified: trunk/xen-3.0/debian/patches/00list
==============================================================================
--- trunk/xen-3.0/debian/patches/00list	(original)
+++ trunk/xen-3.0/debian/patches/00list	Sun Aug 20 20:28:50 2006
@@ -3,4 +3,3 @@
 version
 compile_date
 default-network
-backport-9373

Modified: trunk/xen-3.0/debian/rules
==============================================================================
--- trunk/xen-3.0/debian/rules	(original)
+++ trunk/xen-3.0/debian/rules	Sun Aug 20 20:28:50 2006
@@ -3,198 +3,32 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
-BUILD_DIR = debian/build
-STAMPS_DIR = debian/stamps
 include debian/rules.defs
+include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
 
-export DH_OPTIONS
-
-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)/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 $@
-
-$(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/setup-patch
-	@rm -rf $(BUILD_DIR)/build-docs
-	cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-docs
-	touch $@
-
-$(STAMPS_DIR)/setup-hypervisor-%: $(STAMPS_DIR)/setup-patch
-	@rm -rf $(BUILD_DIR)/build-hypervisor-$*
-	cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-hypervisor-$*
-	touch $@
+srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
+VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
 
-$(STAMPS_DIR)/setup-tools: $(STAMPS_DIR)/setup-patch
-	@rm -rf $(BUILD_DIR)/build-tools
-	cp -a $(BUILD_DIR)/source/ $(BUILD_DIR)/build-tools
-	touch $@
+GENCONTROL = debian/bin/gencontrol.py
 
-build: $(STAMPS_DIR)/build
-$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup build-docs build-hypervisor build-tools
+setup: $(STAMPS_DIR)/setup-base
+$(STAMPS_DIR)/setup-base: debian/control $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir
+	$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
 	touch $@
 
-build-indep:
-
-$(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 $@
+$(BUILD_STAMP): $(STAMPS_DIR)/setup-base
 
-$(STAMPS_DIR)/build-hypervisor-i386: $(STAMPS_DIR)/setup-hypervisor-i386
-	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32
-	touch $@
+DIR_ORIG = ../orig/xen-$(MAJOR)-$(VERSION)
+TAR_ORIG = ../xen-$(MAJOR)_$(VERSION).orig.tar.gz
 
-$(STAMPS_DIR)/build-hypervisor-i386-pae: $(STAMPS_DIR)/setup-hypervisor-i386-pae
-	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32 XEN_TARGET_X86_PAE=y pae=y
-	touch $@
-
-ifneq (,$(filter amd64, $(DEB_HOST_ARCH)))
-$(STAMPS_DIR)/build-tools: XEN_TARGET_ARCH=x86_64
-endif
-ifneq (,$(filter i386, $(DEB_HOST_ARCH)))
-$(STAMPS_DIR)/build-tools: XEN_TARGET_ARCH=x86_32
-endif
-$(STAMPS_DIR)/build-tools: $(STAMPS_DIR)/setup-tools
-	$(MAKE) -C $(DIR)/tools XEN_TARGET_ARCH=$(XEN_TARGET_ARCH)
-	touch $@
-
-setup-docs:: $(STAMPS_DIR)/setup-docs
-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
-setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-i386
-build-hypervisor:: $(STAMPS_DIR)/build-hypervisor-i386-pae
-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
-endif
-
-$(BUILD_DIR) $(STAMPS_DIR):
-	@[ -d $@ ] || mkdir $@
-
-orig: ../orig/xen-$(MAJOR)-$(VERSION)
-	rsync --delete --exclude debian --exclude .svn --link-dest=../orig/xen-$(MAJOR)-$(VERSION)/ -av ../orig/xen-$(MAJOR)-$(VERSION)/ .
-
-../orig/xen-$(MAJOR)-$(VERSION):
-	if [ -f "../xen-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \
-	        mkdir -p ../orig; \
-	        tar -C ../orig -xzf ../xen-$(MAJOR)_$(VERSION).orig.tar.gz; \
-	else \
-	        echo "Can't find orig tarball." >&2; \
-	        exit 1; \
-	fi
+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
+unpatch: clean                                 
 
 maintainerclean:
+	rm -f debian/control* debian/rules.gen debian/xen-utils-*
 	rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
 
-clean:
-	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
-	dh_clean
-
-install-arch: install-hypervisor install-tools-check
-
-install-indep: install-docs
-
-install-docs: DH_OPTIONS = -pxen-docs-$(MAJOR)
-install-docs:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --sourcedir=debian/tmp
-
-install-hypervisor-%:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -pxen-hypervisor-$(MAJOR)-$*
-
-	mkdir debian/xen-hypervisor-$(MAJOR)-$*/boot -p
-	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: DH_OPTIONS = -pxen-utils-$(MAJOR) -pxen-ioemu-$(MAJOR)
-install-tools:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(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
-	cp debian/scripts/network-dummy $(CURDIR)/debian/tmp/etc/xen/scripts
-	dh_install --sourcedir=debian/tmp
-
-# Build architecture-independent files here.
-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 -X.pdf
-	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: 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 --no-restart-on-upgrade -- defaults 21 20
-	dh_installman -s
-	dh_link -s
-	dh_strip -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_pycentral -s
-	dh_python -s
-	dh_makeshlibs -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/xen-3.0/debian/rules.defs
==============================================================================
--- trunk/xen-3.0/debian/rules.defs	(original)
+++ trunk/xen-3.0/debian/rules.defs	Sun Aug 20 20:28:50 2006
@@ -1 +1,2 @@
-MAJOR    := 3.0
+KERNELVERSION := 2.6.17-2
+MAJOR := 3.0

Added: trunk/xen-3.0/debian/rules.real
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/rules.real	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,138 @@
+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)
+
+binary-indep: install-docs
+
+build-arch: $(STAMPS_DIR)/build-utils_$(ARCH)
+build-flavour: $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
+
+setup-arch: $(STAMPS_DIR)/setup-utils_$(ARCH)
+setup-flavour: $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR)
+
+srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
+$(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source:
+	@rm -rf $(DIR)
+	mkdir $(DIR)
+	cp -a $(srcfiles) $(DIR)
+	dpatch -d $(DIR) apply-all
+	touch $@
+
+$(STAMPS_DIR)/setup-docs: SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/setup-docs: DIR=$(BUILD_DIR)/build-docs
+$(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/source
+	@rm -rf $(DIR)
+	cp -a $(SOURCE_DIR) $(DIR)
+	touch $@
+
+$(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
+$(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/source
+	@rm -rf $(DIR)
+	cp -a $(SOURCE_DIR) $(DIR)
+	touch $@
+
+$(STAMPS_DIR)/setup-utils_$(ARCH): SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/setup-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
+$(STAMPS_DIR)/setup-utils_$(ARCH): $(STAMPS_DIR)/source
+	@rm -rf $(DIR)
+	cp -a $(SOURCE_DIR) $(DIR)
+	touch $@
+
+$(STAMPS_DIR)/build-docs: DIR=$(BUILD_DIR)/build-docs
+$(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs
+	$(MAKE) -C $(DIR)/docs
+	touch $@
+
+$(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
+$(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR)
+	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=$(XEN_ARCH) $(CONFIG)
+	touch $@
+
+$(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)
+	touch $@
+
+install-base:
+	dh_installchangelogs
+	dh_installdocs
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- $(GENCONTROL_ARGS)
+	dh_md5sums
+	dh_builddeb
+
+install-docs: DIR=$(BUILD_DIR)/build-docs
+install-docs: PACKAGE_NAME = xen-docs-$(MAJOR)
+install-docs: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-docs: $(STAMPS_DIR)/build-docs
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) -C $(DIR)/docs install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=debian/tmp usr/share/doc/xen/pdf/* usr/share/doc/$(PACKAGE_NAME)
+	$(MAKE) -f debian/rules.real install-base
+
+install-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
+install-hypervisor_$(ARCH)_$(FLAVOUR): PACKAGE_NAME = xen-hypervisor-$(VERSION)$(ABINAME)-$(FLAVOUR)
+install-hypervisor_$(ARCH)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs boot
+	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(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-$(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
+	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
+	# TODO: move to xen-common
+	install -D debian/scripts/network-dummy debian/$(PACKAGE_NAME_UTILS)/etc/xen/scripts/network-dummy
+	$(MAKE) -C $(DIR)/tools install XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH)
+	# TODO: move to xen-common
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp etc/udev/*.rules etc/udev
+	# TODO: move to xen-common
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
+etc/xen/auto \
+etc/xen/scripts \
+etc/xen/xend* \
+etc/xen
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/bin/xenstore* usr/bin
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/lib/python* usr/lib
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
+usr/lib/xen/bin/xc* \
+usr/lib/xen/bin/xen* \
+usr/lib/xen/bin
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
+usr/lib/xen/*.so \
+usr/lib/xen
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
+usr/sbin/xenconsoled \
+usr/sbin/xend \
+usr/sbin/xenstored \
+usr/sbin/xentop \
+usr/sbin/xm \
+usr/sbin
+	# TODO: move to xen-common and /etc/xen/scripts
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp etc/xen/qemu-ifup etc/xen
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/lib/xen/bin/qemu-dm usr/lib/xen/bin
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/lib/xen/boot usr/lib/xen
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/share/xen/qemu usr/share/xen
+	dh_pycentral
+	dh_python
+	$(MAKE) -f debian/rules.real install-base
+
+# vim: filetype=make

Added: trunk/xen-3.0/debian/templates/control.hypervisor.in
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/templates/control.hypervisor.in	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,13 @@
+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@
+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.
+ .
+ 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.
+

Added: trunk/xen-3.0/debian/templates/control.main.in
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/templates/control.main.in	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,7 @@
+Package: xen-docs-3.0
+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.
+

Added: trunk/xen-3.0/debian/templates/control.source.in
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/templates/control.source.in	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,9 @@
+Source: xen- at major@
+Section: misc
+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), libcurl3-dev | libcurl-dev, python-dev, python (>= 2.2), transfig, libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, bcc, dpatch, lsb-release, python-central (>= 0.5), tetex-bin, tetex-extra, gs-common
+Standards-Version: 3.7.2.0
+XS-Python-Version: current
+

Added: trunk/xen-3.0/debian/templates/control.utils.in
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/templates/control.utils.in	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,23 @@
+Package: xen-utils- at version@@abiname@
+Depends: ${shlibs:Depends}, ${python:Depends}, iproute, udev (>> 0.060)
+Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at version@
+Provides: xen-utils
+Conflicts: xen-utils, xen, libxen-python, libxen2.0, libxen2.0-dev
+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 version@@abiname@
+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.
+

Added: trunk/xen-3.0/debian/templates/xen-utils.postinst.in
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/templates/xen-utils.postinst.in	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+configure)
+	# Set up udev rules symlink
+	L="/etc/udev/rules.d/z60_xen-backend.rules"
+	[ ! -z "$2" ] || [ -e "$L" ] || [ -L "$L" ] || ln -s ../xen-backend.rules "$L"
+
+	XENSTORED_DIR="/var/lib/xenstored"
+	[ ! -d "${XENSTORED_DIR}" ] && install -d -m 0700 "${XENSTORED_DIR}" 
+
+	;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: trunk/xen-3.0/debian/templates/xen-utils.postrm.in
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/templates/xen-utils.postrm.in	Sun Aug 20 20:28:50 2006
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+purge)
+	# Remove udev rules symlink
+	L="/etc/udev/rules.d/z60_xen-backend.rules"
+	[ -L "$L" ] && rm "$L"
+
+	XENSTORED_DIR="/var/lib/xenstored"
+	[ -d "${XENSTORED_DIR}" ] && rm -r "${XENSTORED_DIR}"
+	;;
+
+remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+
+*)
+	echo "postrm called with unknown argument \`$1'" >&2
+	exit 
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0



More information about the Pkg-xen-changes mailing list