r3745 - in people/waldi/kernel/source/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: 2005-08-08 15:40:20 +0000 (Mon, 08 Aug 2005)
New Revision: 3745

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules
Log:
* debian/bin/gencontrol.py
  - Rename some variables.
  - Write debian/rules.gen.
* debian/rules: Use debian/rules.gen.


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:09:50 UTC (rev 3744)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-08 15:40:20 UTC (rev 3745)
@@ -261,7 +261,7 @@
     write_rfc822(file("debian/control", 'w'), list)
 
 def write_makefile(list):
-    f = file("debian/Makefile.inc", 'w')
+    f = file("debian/rules.gen", 'w')
     for i in list:
         f.write("%s\n" % i[0])
         if i[1] is not None:
@@ -324,16 +324,16 @@
     image = read_template("image")
     image_latest = read_template("image.latest")
 
-    i1 = arches.keys()
-    i1.sort()
-    for arch in i1:
+    arch_list = arches.keys()
+    arch_list.sort()
+    for arch in arch_list:
         arch_vars = vars.copy()
         arch_vars['arch'] = arch
         arch_vars.update(config_arch(arch).defaults())
 
-        i2 = arches[arch].keys()
-        i2.sort()
-        for subarch in i2:
+        subarch_list = arches[arch].keys()
+        subarch_list.sort()
+        for subarch in subarch_list:
             subarch_config = config_subarch(arch, subarch)
             subarch_vars = arch_vars.copy()
             subarch_vars.update(subarch_config.defaults())
@@ -348,9 +348,9 @@
             for i in ('binary', 'build', 'unpack'):
                 makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
 
-            i3 = arches[arch][subarch].keys()
-            i3.sort()
-            for flavour in i3:
+            flavour_list = arches[arch][subarch].keys()
+            flavour_list.sort()
+            for flavour in flavour_list:
                 flavour_vars = subarch_vars.copy()
                 flavour_vars['flavour'] = flavour
                 try:
@@ -370,7 +370,8 @@
 
                 for i in ('binary', 'build', 'unpack'):
                     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:" % (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(("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]),)))
 
     extra = read_template("extra")
     packages.extend(extra)

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-08 15:09:50 UTC (rev 3744)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-08 15:40:20 UTC (rev 3745)
@@ -220,7 +220,7 @@
 	for i in $(subarchs); do	\
 	  $(MAKE) subarch=$${i} binary;	\
 	done
-	$(MAKE) -f debian/Makefile.inc binary-$(DEB_BUILD_ARCH)
+	$(MAKE) -f debian/rules.gen binary-$(DEB_BUILD_ARCH)
 
 binary:	binary-indep binary-arch
 
@@ -228,7 +228,7 @@
 # Makes the master debian/control file by substituting
 # variable values into the template.
 #
-debian/control: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
+debian/control debian/rules.gen: debian/bin/gencontrol.py debian/changelog $(wildcard debian/templates/control.*.in)
 	debian/bin/gencontrol.py
 	@echo
 	@echo This target is made to fail intentionally, to make sure