Author: waldi
Date: Fri Jun 29 14:35:20 2007
New Revision: 9040
Log:
* debian/bin/gencontrol.py: Split normal and modules excluded images.
* debian/templates/control.image.latest.in: Delete.
* debian/templates/control.image.latest.type-modules.in
- Add.
- Update wording.
- Add modules meta package.
- Provide linux-latest-abi-*.
* debian/templates/control.image.latest.type-standalone.in
- Add.
- Update wording.
- Provide linux-latest-abi-*.
Added:
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
- copied, changed from r7148,
/dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
- copied, changed from r7148,
/dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in
Removed:
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in
Modified:
dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py (original)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py Fri Jun 29 14:35:20 2007
@@ -19,13 +19,16 @@
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour,
vars, makeflags, extra):
config_entry = self.config.merge('base', arch, subarch, flavour)
- image_latest = self.templates["control.image.latest"]
- headers_latest = self.templates["control.headers.latest"]
+ templates = []
- packages_dummy = []
- packages_dummy.extend(self.process_packages(image_latest, vars))
+ if config_entry.get('type', None) == 'plain-xen':
+
templates.extend(self.templates["control.image.latest.type-modules"])
+ else:
+
templates.extend(self.templates["control.image.latest.type-standalone"])
if config_entry.get('modules', True):
- packages_dummy.extend(self.process_packages(headers_latest, vars))
+ templates.extend(self.templates["control.headers.latest"])
+
+ packages_dummy = self.process_packages(templates, vars)
for package in packages_dummy:
name = package['Package']
Copied:
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
(from r7148,
/dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in)
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in
(original)
+++
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
Fri Jun 29 14:35:20 2007
@@ -1,15 +1,33 @@
Package: [EMAIL PROTECTED]@
Section: admin
Priority: optional
-Depends: [EMAIL PROTECTED]@@localversion@
-Description: Linux kernel image on @class@
+Depends: [EMAIL PROTECTED]@@localversion@, [EMAIL PROTECTED]@
+Description: Linux image on @class@
This package depends on the latest binary image for Linux kernel on
@longclass@ machines.
Package: [EMAIL PROTECTED]@@localversion@
Section: admin
Priority: optional
-Depends: [EMAIL PROTECTED]@@abiname@@localversion@
-Description: Linux kernel @major@ image on @class@
+Depends: [EMAIL PROTECTED]@@abiname@@localversion@, [EMAIL
PROTECTED]@@localversion@
+Description: Linux @major@ image on @class@
This package depends on the latest binary image for Linux kernel @major@
on @longclass@ machines.
+
+Package: [EMAIL PROTECTED]@
+Section: admin
+Priority: optional
+Depends: [EMAIL PROTECTED]@@localversion@
+Description: Linux modules on @class@
+ This package depends on the latest pre-built loadable modules for Linux kernel
+ on @longclass@ machines.
+
+Package: [EMAIL PROTECTED]@@localversion@
+Section: admin
+Priority: optional
+Depends: [EMAIL PROTECTED]@@abiname@@localversion@
+Provides: [EMAIL PROTECTED]@@abiname@@localversion@
+Description: Linux @major@ modules on @class@
+ This package depends on the latest pre-built loadable modules for Linux kernel
+ @major@ on @longclass@ machines.
+
Copied:
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
(from r7148,
/dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in)
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.image.latest.in
(original)
+++
dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
Fri Jun 29 14:35:20 2007
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Depends: [EMAIL PROTECTED]@@localversion@
-Description: Linux kernel image on @class@
+Description: Linux image on @class@
This package depends on the latest binary image for Linux kernel on
@longclass@ machines.
@@ -10,6 +10,7 @@
Section: admin
Priority: optional
Depends: [EMAIL PROTECTED]@@abiname@@localversion@
-Description: Linux kernel @major@ image on @class@
+Provides: [EMAIL PROTECTED]@@abiname@@localversion@
+Description: Linux @major@ image on @class@
This package depends on the latest binary image for Linux kernel @major@
on @longclass@ machines.
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
