[kernel] r16203 - in dists/sid/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Aug 29 12:44:08 2010
New Revision: 16203

Log:
* debian/bin/gencontrol.py: Generate Suggests and appropriate Breaks for bootloaders.
* debian/lib/python/debian_linux/config.py: Field image/bootloaders is list.

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Aug 29 12:35:45 2010	(r16202)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Aug 29 12:44:08 2010	(r16203)
@@ -140,6 +140,20 @@
                     image_fields['Breaks'].append(PackageRelationGroup([a]))
             image_fields['Depends'].append(l_depends)
 
+        bootloaders = config_entry_image.get('bootloaders')
+        print bootloaders
+        if bootloaders:
+            l = PackageRelationGroup()
+            for i in bootloaders:
+                i = config_entry_relations.get(i, i)
+                l.append(i)
+                a = PackageRelationEntry(i)
+                if a.operator is not None:
+                    a.operator = -a.operator
+                    image_fields['Breaks'].append(PackageRelationGroup([a]))
+            print l
+            image_fields['Suggests'].append(l)
+
         desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')
         if desc_parts:
             # XXX: Workaround, we need to support multiple entries of the same name

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	Sun Aug 29 12:35:45 2010	(r16202)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	Sun Aug 29 12:44:08 2010	(r16203)
@@ -117,6 +117,7 @@
             'parts': SchemaItemList(),
         },
         'image': {
+            'bootloaders': SchemaItemList(),
             'configs': SchemaItemList(),
             'initramfs': SchemaItemBoolean(),
             'initramfs-generators': SchemaItemList(),