[kernel] r19076 - in dists/sid/linux/debian: . bin

[Ben Hutchings]

Author: benh
Date: Sun Jun  3 22:59:24 2012
New Revision: 19076

Log:
Move special case for 'none' featureset to rules.real

This is needed to get the proper dependency.

Modified:
   dists/sid/linux/debian/bin/gencontrol.py
   dists/sid/linux/debian/rules.real

Modified: dists/sid/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/bin/gencontrol.py	Sun Jun  3 22:44:01 2012	(r19075)
+++ dists/sid/linux/debian/bin/gencontrol.py	Sun Jun  3 22:59:24 2012	(r19076)
@@ -66,19 +66,14 @@
     def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
         # Add featureset source rules
         for featureset in iter(self.config['base', ]['featuresets']):
-            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])
+            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)
 

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Sun Jun  3 22:44:01 2012	(r19075)
+++ dists/sid/linux/debian/rules.real	Sun Jun  3 22:59:24 2012	(r19076)
@@ -86,8 +86,12 @@
 $(STAMPS_DIR)/source_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(FEATURESET)
 $(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
 	rm -rf '$(DIR)'
+ifeq ($(FEATURESET),none)
+	ln -s source '$(DIR)'
+else
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	$(patch_cmd) -f $(FEATURESET)
+endif
 	@$(stamp)
 
 $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)