r3746 - people/waldi/kernel/source/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: 2005-08-08 15:51:26 +0000 (Mon, 08 Aug 2005)
New Revision: 3746

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Simplify rules.


Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-08 15:40:20 UTC (rev 3745)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-08 15:51:26 UTC (rev 3746)
@@ -345,7 +345,7 @@
                 subarch_text = 'none'
                 subarch_vars['subarch'] = ''
 
-            for i in ('binary', 'build', 'unpack'):
+            for i in ('binary', 'build'):
                 makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
 
             flavour_list = arches[arch][subarch].keys()
@@ -368,10 +368,15 @@
                 packages.append(process_real_package(headers[0], flavour_vars))
                 packages.extend(dummy_packages)
 
-                for i in ('binary', 'build', 'unpack'):
+                for i in ('binary', 'build'):
                     makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
-                makefile.append(("binary-%s-%s-%s:: binary-%s-%s-%s-dummy" % (arch, subarch_text, flavour, arch, subarch_text, flavour), None))
-                makefile.append(("binary-%s-%s-%s-dummy:" % (arch, subarch_text, flavour), ("$(MAKE) -f debian/Makefile binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),)))
+                    makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch_text, flavour, i, arch, subarch_text, flavour), None))
+                cmds_binary = []
+                cmds_binary.append(("$(MAKE) -f debian/Makefile binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
+                cmds_build = []
+                cmds_unpack = []
+                makefile.append(("binary-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_binary))
+                makefile.append(("build-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_build))
 
     extra = read_template("extra")
     packages.extend(extra)