[kernel] r19075 - in dists/sid/linux/debian: bin patches

[Ben Hutchings]

Author: benh
Date: Sun Jun  3 22:44:01 2012
New Revision: 19075

Log:
Remove the patch series for featureset 'none'

Make 'source_none' a symlink rather than treating 'none' like a real
featureset.

Deleted:
   dists/sid/linux/debian/patches/series-none
Modified:
   dists/sid/linux/debian/bin/gencontrol.py

Modified: dists/sid/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/bin/gencontrol.py	Sun Jun  3 22:20:59 2012	(r19074)
+++ dists/sid/linux/debian/bin/gencontrol.py	Sun Jun  3 22:44:01 2012	(r19075)
@@ -66,14 +66,19 @@
     def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
         # Add featureset source rules
         for featureset in iter(self.config['base', ]['featuresets']):
-            makeflags_featureset = makeflags.copy()
-            makeflags_featureset['FEATURESET'] = featureset
-            cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
-                           % makeflags_featureset]
-            makefile.add('source_%s_real' % featureset, cmds=cmds_source)
-            makefile.add('source_%s' % featureset,
-                         ['source_%s_real' % featureset])
-            makefile.add('source', ['source_%s' % featureset])
+            if featureset == 'none':
+                makefile.add('source_none_real',
+                             cmds=['ln -s source source_none'])
+                makefile.add('source_none', ['source_none_real'])
+            else:
+                makeflags_featureset = makeflags.copy()
+                makeflags_featureset['FEATURESET'] = featureset
+                cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
+                               % makeflags_featureset]
+                makefile.add('source_%s_real' % featureset, cmds=cmds_source)
+                makefile.add('source_%s' % featureset,
+                             ['source_%s_real' % featureset])
+                makefile.add('source', ['source_%s' % featureset])
 
         super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra)