[kernel] r17878 - in dists/trunk/linux-tools/debian: bin build build/tools build/tools/perf templates

[Bastian Blank]

Author: waldi
Date: Sun Jul 31 17:19:18 2011
New Revision: 17878

Log:
* debian/bin/genorig.py: Include files needed for tools/perf.
* debian/build: Build tools/perf.
* debian/templates/control.source.in: Add build-deps.

Added:
   dists/trunk/linux-tools/debian/build/tools/
   dists/trunk/linux-tools/debian/build/tools/perf/
Modified:
   dists/trunk/linux-tools/debian/bin/genorig.py
   dists/trunk/linux-tools/debian/build/Makefile
   dists/trunk/linux-tools/debian/templates/control.source.in

Modified: dists/trunk/linux-tools/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-tools/debian/bin/genorig.py	Sun Jul 31 11:32:31 2011	(r17877)
+++ dists/trunk/linux-tools/debian/bin/genorig.py	Sun Jul 31 17:19:18 2011	(r17878)
@@ -100,12 +100,22 @@
         self.log("Generate orig\n")
         orig = os.path.join(self.dir, self.orig)
         temp = os.path.join(self.dir, 'temp')
-        os.makedirs(os.path.join(orig, 'include', 'linux'))
+        # TODO: move this informations somewhere else
+        os.mkdir(os.path.join(orig))
         for i in 'COPYING', 'Kbuild', 'Makefile':
             shutil.copyfile(os.path.join(temp, i), os.path.join(orig, i))
-        for i in 'input.h', 'license.h', 'mod_devicetable.h':
-            shutil.copyfile(os.path.join(temp, 'include', 'linux', i), os.path.join(orig, 'include', 'linux', i))
+        for i in 's390', 'x86':
+            os.makedirs(os.path.join(orig, 'arch', i, 'include'))
+            shutil.copyfile(os.path.join(temp, 'arch', i, 'Makefile'), os.path.join(orig, 'arch', i, 'Makefile'))
+            shutil.copytree(os.path.join(temp, 'arch', i, 'include', 'asm'), os.path.join(orig, 'arch', i, 'include', 'asm'))
+        os.mkdir(os.path.join(orig, 'arch', 'x86', 'lib'))
+        shutil.copyfile(os.path.join(temp, 'arch', 'x86', 'lib', 'memcpy_64.S'), os.path.join(orig, 'arch', 'x86', 'lib', 'memcpy_64.S'))
+        os.mkdir(os.path.join(orig, 'include'))
+        shutil.copytree(os.path.join(temp, 'include', 'linux'), os.path.join(orig, 'include', 'linux'))
+        os.mkdir(os.path.join(orig, 'lib'))
+        shutil.copyfile(os.path.join(temp, 'lib', 'rbtree.c'), os.path.join(orig, 'lib', 'rbtree.c'))
         shutil.copytree(os.path.join(temp, 'scripts'), os.path.join(orig, 'scripts'))
+        shutil.copytree(os.path.join(temp, 'tools'), os.path.join(orig, 'tools'))
 
     def tar(self):
         out = os.path.join("../orig", self.orig_tar)

Modified: dists/trunk/linux-tools/debian/build/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/Makefile	Sun Jul 31 11:32:31 2011	(r17877)
+++ dists/trunk/linux-tools/debian/build/Makefile	Sun Jul 31 17:19:18 2011	(r17878)
@@ -3,7 +3,8 @@
 	Makefile \
 
 SUBDIRS = \
-	scripts
+	scripts \
+	tools
 
 OUTDIR = .
 

Modified: dists/trunk/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-tools/debian/templates/control.source.in	Sun Jul 31 11:32:31 2011	(r17877)
+++ dists/trunk/linux-tools/debian/templates/control.source.in	Sun Jul 31 17:19:18 2011	(r17878)
@@ -4,4 +4,6 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>> 7), python
+Build-Depends:
+ debhelper (>> 7), python,
+ binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev