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

[Bastian Blank]

Author: waldi
Date: 2005-08-10 12:36:57 +0000 (Wed, 10 Aug 2005)
New Revision: 3819

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/bin/gencontrol.py, debian/rules, debian/rules.real: Add binary-indep.


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-10 12:29:17 UTC (rev 3818)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-10 12:36:57 UTC (rev 3819)
@@ -324,16 +324,12 @@
         arch_vars['arch'] = arch
         arch_vars.update(config_arch(arch).defaults())
 
-        for i in ('binary', 'build', 'setup'):
+        for i in ('setup'):
             makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
 
         arch_makeflags = "VERSION='%s' SOURCE_VERSION='%s' ARCH='%s'" % (version, source_version, arch)
-        cmds_binary = []
-        cmds_build = []
         cmds_setup = []
         cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % arch_makeflags,))
-        makefile.append(("binary-%s-real:" % arch, cmds_binary))
-        makefile.append(("build-%s-real:" % arch, cmds_build))
         makefile.append(("setup-%s-real:" % arch, cmds_setup))
 
         subarch_list = arches[arch].keys()
@@ -350,18 +346,18 @@
                 subarch_text = 'none'
                 subarch_vars['subarch'] = ''
 
-            for i in ('binary', 'build', 'setup'):
+            for i in ('binary-arch', 'binary-indep', 'build', 'setup'):
                 makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
+                makefile.append(("%s-%s-%s::" % (i, arch, subarch_text), None))
+            for i in ('binary-arch', 'setup'):
                 makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch_text, i, arch, subarch_text), None))
 
             subarch_makeflags = arch_makeflags + " SUBARCH='%s' ABINAME='-%s'" % (subarch_text, subarch_vars['abiname'])
             cmds_binary = []
             cmds_binary.append(("$(MAKE) -f debian/rules.real binary-subarch %s" % subarch_makeflags,))
-            cmds_build = []
             cmds_setup = []
             cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % subarch_makeflags,))
             makefile.append(("binary-%s-%s-real:" % (arch, subarch_text), cmds_binary))
-            makefile.append(("build-%s-%s-real:" % (arch, subarch_text), cmds_build))
             makefile.append(("setup-%s-%s-real:" % (arch, subarch_text), cmds_setup))
 
             flavour_list = arches[arch][subarch].keys()
@@ -384,19 +380,21 @@
                 packages.append(process_package(headers[0], flavour_vars))
                 packages.extend(dummy_packages)
 
-                for i in ('binary', 'build', 'setup'):
+                for i in ('binary-arch', 'binary-indep', 'build', 'setup'):
                     makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
+                    makefile.append(("%s-%s-%s-%s::" % (i, arch, subarch_text, flavour), None))
+                for i in ('binary-arch', 'build', 'setup'):
                     makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch_text, flavour, i, arch, subarch_text, flavour), None))
 
                 flavour_makeflags = subarch_makeflags + " FLAVOUR='%s'" % flavour
-                cmds_binary = []
-                cmds_binary.append(("$(MAKE) -f debian/rules.real binary-flavour %s" % flavour_makeflags,))
-                cmds_binary.append(("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
+                cmds_binary_arch = []
+                cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % flavour_makeflags,))
+                cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
                 cmds_build = []
                 cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % flavour_makeflags,))
                 cmds_setup = []
                 cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % flavour_makeflags,))
-                makefile.append(("binary-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_binary))
+                makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_binary_arch))
                 makefile.append(("build-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_build))
                 makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_setup))
 
@@ -420,8 +418,8 @@
             if i.has_key('X-Version-Overwrite-Epoch'):
                     tmp.append("-v1:%s" % source_version)
             cmds.append("$(MAKE) -f debian/rules.real binary-dummy DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (i['Package'], ' '.join(tmp)))
-        makefile.append(("binary-%s:: binary-%s-extra" % (arch, arch), None))
-        makefile.append(("binary-%s-extra:" % arch, cmds))
+        makefile.append(("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch), None))
+        makefile.append(("binary-arch-%s-extra:" % arch, cmds))
 
     write_control(packages)
     write_makefile(makefile)

Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 12:29:17 UTC (rev 3818)
+++ people/waldi/kernel/source/linux-2.6/debian/rules	2005-08-10 12:36:57 UTC (rev 3819)
@@ -168,10 +168,13 @@
 	dh_clean
 
 binary-indep: source tree patch-debian doc
-binary-arch: build
 	dh_testdir
-	$(MAKE) -f debian/rules.gen binary-$(DEB_HOST_ARCH)
+	$(MAKE) -f debian/rules.gen binary-indep-$(DEB_HOST_ARCH)
 
+binary-arch:
+	dh_testdir
+	$(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
+
 binary:	binary-indep binary-arch
 
 #

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:29:17 UTC (rev 3818)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:36:57 UTC (rev 3819)
@@ -78,8 +78,8 @@
 #
 # Targets
 #
-binary-subarch: install-header-subarch-$(ARCH)-$(SUBARCH)
-binary-flavour: install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+binary-arch-subarch: install-header-subarch-$(ARCH)-$(SUBARCH)
+binary-arch-flavour: install-image-flavour-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)