diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/arch/amd64/xen/defines | 2 | ||||
-rw-r--r-- | debian/arch/defines | 3 | ||||
-rw-r--r-- | debian/arch/i386/xen/defines | 2 | ||||
-rwxr-xr-x | debian/bin/gencontrol.py | 9 | ||||
-rw-r--r-- | debian/templates/control.xen-linux-system.in | 9 |
5 files changed, 24 insertions, 1 deletions
diff --git a/debian/arch/amd64/xen/defines b/debian/arch/amd64/xen/defines index 71bccee1950c..bf438f792675 100644 --- a/debian/arch/amd64/xen/defines +++ b/debian/arch/amd64/xen/defines @@ -6,3 +6,5 @@ flavours: initramfs: false type: plain-xen +[xen] +flavour: amd64 diff --git a/debian/arch/defines b/debian/arch/defines index 39473c18a202..1421526f33f6 100644 --- a/debian/arch/defines +++ b/debian/arch/defines @@ -22,6 +22,9 @@ compiler: gcc-4.1 initramfs-generators: initramfs-tools yaird initramfs-fallback type: kernel-package +[xen] +version: 3.0.2-1 + [commands-image-initramfs-generators] initramfs-tools: mkinitramfs-kpkg yaird: mkinitrd.yaird diff --git a/debian/arch/i386/xen/defines b/debian/arch/i386/xen/defines index 65fa03e69232..bd87b170885e 100644 --- a/debian/arch/i386/xen/defines +++ b/debian/arch/i386/xen/defines @@ -7,3 +7,5 @@ flavours: recommends: libc6-xen type: plain-xen +[xen] +flavour: i386 diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index a641cf729bd9..8354c2fff36a 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -123,12 +123,17 @@ class gencontrol(debian_linux.gencontrol.gencontrol): l.extend(generators) image_depends.append(l) + packages_dummy = [] packages_own = [] if vars['type'] == 'plain-s390-tape': image = image_type_standalone elif vars['type'] == 'plain-xen': image = image_type_modulesextra + config_entry_xen = self.config.merge('xen', arch, subarch, flavour) + for i, j in config_entry_xen.iteritems(): + vars['xen-%s' % i] = j + packages_dummy.extend(self.process_packages(self.templates['control.xen-linux-system'], vars)) else: image = image_type_modulesinline @@ -142,7 +147,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol): packages_own.append(package_headers) extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package']) - for package in packages_own: + for package in packages_own + packages_dummy: name = package['Package'] if packages.has_key(name): package = packages.get(name) @@ -153,6 +158,8 @@ class gencontrol(debian_linux.gencontrol.gencontrol): cmds_binary_arch = [] cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags,)) + if packages_dummy: + cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags),)) cmds_build = [] cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags,)) cmds_setup = [] diff --git a/debian/templates/control.xen-linux-system.in b/debian/templates/control.xen-linux-system.in new file mode 100644 index 000000000000..2d3485d6b92b --- /dev/null +++ b/debian/templates/control.xen-linux-system.in @@ -0,0 +1,9 @@ +Package: xen-linux-system-@upstreamversion@@abiname@@localversion@ +Section: admin +Priority: extra +Depends: + linux-image-@upstreamversion@@abiname@@localversion@ (= ${Source-Version}), + xen-hypervisor-@xen-version@-@xen-flavour@ +Description: XEN system with Linux @upstreamversion@ image on @class@ + This package depends on the binary Linux image and the correct hypervisor. + |