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

[Ben Hutchings]

Author: benh
Date: Tue Aug  4 00:40:30 2015
New Revision: 22902

Log:
Update rules for renaming of linux-tools binary package

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

Modified: dists/sid/linux-latest/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest/debian/bin/gencontrol.py	Tue Aug  4 00:19:50 2015	(r22901)
+++ dists/sid/linux-latest/debian/bin/gencontrol.py	Tue Aug  4 00:40:30 2015	(r22902)
@@ -145,6 +145,12 @@
         archs = extra_arches.keys()
         archs.sort()
         for arch in archs:
+            if arch == 'all':
+                arch_var = ''
+                target = 'binary-indep'
+            else:
+                arch_var = "ARCH='%s'" % arch
+                target = 'binary-arch_%s' % arch
             cmds = []
             for i in extra_arches[arch]:
                 if i.has_key(u'X-Version-Overwrite-Epoch'):
@@ -152,9 +158,9 @@
                 else:
                     version = u'-v%s' % self.package_version
                 cmds += self.get_link_commands(i, ['config', 'postinst', 'templates'])
-                cmds.append("$(MAKE) -f debian/rules.real install-dummy ARCH='%s' DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch, i['Package'], version))
-            makefile.add('binary-arch_%s' % arch, [u'binary-arch_%s_extra' % arch])
-            makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
+                cmds.append("$(MAKE) -f debian/rules.real install-dummy %s DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch_var, i['Package'], version))
+            makefile.add(target, [target + '_extra'])
+            makefile.add(target + '_extra', cmds = cmds)
 
     def process_real_image(self, entry, fields, vars):
         entry = self.process_package(entry, vars)

Modified: dists/sid/linux-latest/debian/rules.real
==============================================================================
--- dists/sid/linux-latest/debian/rules.real	Tue Aug  4 00:19:50 2015	(r22901)
+++ dists/sid/linux-latest/debian/rules.real	Tue Aug  4 00:40:30 2015	(r22902)
@@ -12,7 +12,7 @@
 
 binary-indep: install-doc
 binary-indep: install-source
-binary-indep: install-tools
+binary-indep: install-perf
 
 install-base:
 	dh_bugfiles
@@ -45,8 +45,8 @@
 	dh_prep
 	$(MAKE) -f debian/rules.real install-base
 
-install-tools: PACKAGE_NAME = linux-tools
-install-tools: DH_OPTIONS = -p$(PACKAGE_NAME)
-install-tools:
+install-perf: PACKAGE_NAME = linux-perf
+install-perf: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-perf:
 	dh_prep
 	$(MAKE) -f debian/rules.real install-base