Bastian Blank
2008-Mar-06 14:15 UTC
[Pkg-xen-changes] r529 - in trunk/xen-unstable/debian: . arch/amd64 arch/i386 bin templates
Author: waldi
Date: Thu Mar 6 14:15:55 2008
New Revision: 529
Log:
Mass update.
Modified:
trunk/xen-unstable/debian/arch/amd64/defines
trunk/xen-unstable/debian/arch/i386/defines
trunk/xen-unstable/debian/bin/gencontrol.py
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
Modified: trunk/xen-unstable/debian/arch/amd64/defines
=============================================================================---
trunk/xen-unstable/debian/arch/amd64/defines (original)
+++ trunk/xen-unstable/debian/arch/amd64/defines Thu Mar 6 14:15:55 2008
@@ -3,7 +3,7 @@
amd64
xen-arch: x86_64
-[amd64]
+[amd64_base]
class: AMD64
longclass: all 64bit single- and multiprocessor AMD and Intel
Modified: trunk/xen-unstable/debian/arch/i386/defines
=============================================================================---
trunk/xen-unstable/debian/arch/i386/defines (original)
+++ trunk/xen-unstable/debian/arch/i386/defines Thu Mar 6 14:15:55 2008
@@ -4,14 +4,14 @@
i386-nonpae
xen-arch: x86_32
-[i386]
+[i386_base]
class: i386
config: pae=y
desc:
This version of the hypervisor is built with PAE enabled. If you have a cpu
without pae support install the -nonpae version instead.
-[i386-nonpae]
+[i386-nonpae_base]
class: i386 without pae
desc:
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 Thu Mar 6 14:15:55 2008
@@ -1,25 +1,30 @@
#!/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.config import ConfigCoreHierarchy
+from debian_linux.debian import Changelog
from debian_linux.gencontrol import Gencontrol as Base
-from debian_linux.config import *
-from debian_linux.debian import *
+from debian_linux.utils import Templates
class Gencontrol(Base):
- makefile_targets = (''binary-arch'',
''build'', ''setup'')
+ makeflags_base = {
+ ''VERSION'': ''unstable'',
+ ''ABINAME'': '''',
+ }
+ vars = {
+ ''version'': ''unstable'',
+ ''abiname'': '''',
+ }
def __init__(self):
- super(Gencontrol, self).__init__()
+ super(Gencontrol,
self).__init__(ConfigCoreHierarchy(["debian/arch"]),
Templates(["debian/templates"]))
self.process_changelog()
def do_main_setup(self, vars, makeflags, extra):
- makeflags.update({
- ''MAJOR'': ''unstable'',
- ''VERSION'': ''unstable'',
- ''UPSTREAMVERSION'': self.version.xen_version,
- ''EXTRAVERSION'': ''-unstable'',
- })
+ makeflags.update(self.makeflags_base)
def do_main_packages(self, packages, extra):
packages.extend(self.process_packages(self.templates["control.main"],
self.vars))
@@ -50,32 +55,21 @@
j = self.substitute(self.templates["xen-utils.%s" % i],
vars)
file("debian/%s.%s" % (package_utils_name, i),
''w'').write(j)
- 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))
+ cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch
%s" % makeflags]
+ cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" %
makeflags]
+ cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch %s" %
makeflags]
+ makefile.add(''binary-arch_%s_real'' % arch, cmds =
cmds_binary_arch)
+ makefile.add(''build_%s_real'' % arch, cmds =
cmds_build)
+ makefile.add(''setup_%s_real'' % arch, cmds =
cmds_setup)
- def do_subarch_makefile(self, makefile, arch, subarch, makeflags, extra):
- pass
-
- def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
+ def do_flavour_setup(self, vars, makeflags, arch, featureset, 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):
+ def do_flavour_packages(self, packages, makefile, arch, featureset,
flavour, vars, makeflags, extra):
hypervisor = self.templates["control.hypervisor"]
if not vars.has_key(''desc''):
@@ -99,25 +93,16 @@
j = self.substitute(self.templates["xen-hypervisor.%s" %
i], vars)
file("debian/%s.%s" % (package_name, i),
''w'').write(j)
- 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)))
+ cmds_binary_arch = ["$(MAKE) -f debian/rules.real
binary-arch-flavour %s" % makeflags]
+ cmds_build = ["$(MAKE) -f debian/rules.real build-flavour %s"
% makeflags]
+ cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s"
% makeflags]
+ makefile.add("binary-arch_%s_%s_%s" % (arch, featureset,
flavour), cmds = cmds_binary_arch)
+ makefile.add("build_%s_%s_%s" % (arch, featureset, flavour),
cmds = cmds_build)
+ makefile.add("setup_%s_%s_%s" % (arch, featureset, flavour),
cmds = cmds_setup)
def process_changelog(self):
changelog = Changelog(version = VersionXenUnstable)
self.version = changelog[0].version
- self.vars = {
- ''major'': ''unstable'',
- ''version'': ''unstable'',
- ''abiname'': '''',
- }
if __name__ == ''__main__'':
Gencontrol()()
Modified: trunk/xen-unstable/debian/rules
=============================================================================---
trunk/xen-unstable/debian/rules (original)
+++ trunk/xen-unstable/debian/rules Thu Mar 6 14:15:55 2008
@@ -15,13 +15,13 @@
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)
+ $(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
touch $@
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)
+ $(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
touch $@
$(BUILD_DIR) $(STAMPS_DIR):
@@ -42,7 +42,7 @@
binary-arch:
dh_testdir
- $(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
+ $(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
binary: binary-indep binary-arch
Modified: trunk/xen-unstable/debian/rules.defs
=============================================================================---
trunk/xen-unstable/debian/rules.defs (original)
+++ trunk/xen-unstable/debian/rules.defs Thu Mar 6 14:15:55 2008
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.22-3
+KERNELVERSION := 2.6.24-1
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 Thu Mar 6 14:15:55 2008
@@ -4,12 +4,18 @@
export DH_OPTIONS
+setup_env := env -u ABINAME -u ARCH -u FLAVOUR -u VERSION -u MAKEFLAGS
+
+MAKE_CLEAN = $(setup_env) $(MAKE)
+MAKE_SELF = $(MAKE) -f debian/rules.real
+
include debian/rules.defs
binary-arch-arch: install-utils_$(ARCH)
+binary-arch-arch: install-xenstore-utils_$(ARCH)
binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
-binary-indep: install-docs
+binary-indep:
build-arch: $(STAMPS_DIR)/build-utils_$(ARCH)
build-flavour: $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
@@ -50,25 +56,33 @@
$(STAMPS_DIR)/build-docs: DIR=$(BUILD_DIR)/build-docs
$(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs
- $(MAKE) -C $(DIR)/docs
+ $(MAKE_CLEAN) -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 \
+ $(MAKE_CLEAN) -C $(DIR)/xen \
+ $(CONFIG) \
XEN_COMPILE_ARCH=$(XEN_ARCH) \
XEN_TARGET_ARCH=$(XEN_ARCH)
touch $@
$(STAMPS_DIR)/build-utils_$(ARCH) \
-install-utils_$(ARCH): CONFIG = \
+$(STAMPS_DIR)/install-utils_$(ARCH): CONFIG = \
XEN_COMPILE_ARCH=$(XEN_ARCH) \
XEN_TARGET_ARCH=$(XEN_ARCH) \
- XEN_VERSION=$(UPSTREAMVERSION)$(ABINAME)
+ XEN_VERSION=$(VERSION)$(ABINAME)
$(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 $(CONFIG)
+ $(MAKE_CLEAN) -C $(DIR)/tools $(CONFIG)
+ touch $@
+
+$(STAMPS_DIR)/install-utils_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH)
+$(STAMPS_DIR)/install-utils_$(ARCH): INSTALL_DIR =
$(BUILD_DIR)/install-utils_$(ARCH)
+$(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
+ @rm -rf $(INSTALL_DIR)
+ $(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
$(CONFIG)
touch $@
install-base:
@@ -88,9 +102,9 @@
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) -C $(DIR)/docs install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE_CLEAN) -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
+ $(MAKE_SELF) install-base
install-hypervisor_$(ARCH)_$(FLAVOUR):
DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
install-hypervisor_$(ARCH)_$(FLAVOUR): PACKAGE_NAME =
xen-hypervisor-$(VERSION)$(ABINAME)-$(FLAVOUR)
@@ -100,27 +114,62 @@
dh_testroot
dh_clean -k
dh_installdirs boot
- cp $(DIR)/xen/xen.gz
debian/$(PACKAGE_NAME)/boot/xen-$(UPSTREAMVERSION)$(ABINAME)-$(FLAVOUR).gz
- $(MAKE) -f debian/rules.real install-base
+ cp $(DIR)/xen/xen.gz
debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz
+ $(MAKE_SELF) install-base
+
+install-lib-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-lib-dev_$(ARCH): PACKAGE_NAME = libxen-dev
+install-lib-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-lib-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_install --sourcedir=$(DIR)
+ dh_strip
+ dh_shlibdeps
+ $(MAKE_SELF) install-base
+
+install-libxenstore_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-libxenstore_$(ARCH): PACKAGE_NAME = libxenstore3.0
+install-libxenstore_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-libxenstore_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_install --sourcedir=$(DIR)
+ dh_strip
+ dh_makeshlibs
+ dh_shlibdeps
+ $(MAKE_SELF) install-base
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)
+install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
dh_testdir
dh_testroot
dh_clean -k
- @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-$(UPSTREAMVERSION)$(ABINAME)
+ dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION)$(ABINAME)
+ dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
dh_pycentral
dh_strip
dh_shlibdeps
- $(MAKE) -f debian/rules.real install-base
+ $(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)
+install-xenstore-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_install --sourcedir=$(DIR)
+ dh_strip
+ dh_shlibdeps
+ $(MAKE_SELF) install-base
# vim: filetype=make
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 Thu Mar 6
14:15:55 2008
@@ -1,7 +1,5 @@
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@
+Recommends: xen-utils-unstable at abiname@
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
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 Thu Mar 6 14:15:55 2008
@@ -1,7 +0,0 @@
-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
- includes a description interface(both the api, and a nice explanation of
- how XEN works). It also contains the VBD and Xeno howtos.
-
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 Thu Mar 6 14:15:55
2008
@@ -1,9 +1,8 @@
-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: bcc, debhelper (>= 5.0.37.2), gcc-multilib [amd64],
libgnutls-dev, libjpeg-dev, libncurses5-dev, libsdl1.2-dev, libssl-dev,
libvncserver-dev, lsb-release, pciutils-dev, pkg-config, python-central (>=
0.5), python-dev (>= 2.3), quilt, zlib1g-dev
+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 Thu Mar 6 14:15:55
2008
@@ -1,8 +1,6 @@
Package: xen-utils- at version@@abiname@
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