FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 03-04-2010, 12:35 PM
Andy Whitcroft
 
Default UBUNTU: perf -- add linux-tools carrying the version switches and manuals

Add a new linux-tools binary independant package which carries the version
independant perf wrapper and any manual pages for perf.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
debian.master/control.d/flavour-control.stub | 2 +-
debian.master/control.stub.in | 10 ++++++++++
debian/rules.d/0-common-vars.mk | 1 +
debian/rules.d/3-binary-indep.mk | 25 +++++++++++++++++++++++++
debian/tools/perf | 2 ++
5 files changed, 39 insertions(+), 1 deletions(-)
create mode 100644 debian/tools/perf

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index ebd57c6..4c66f10 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -27,7 +27,7 @@ Section: admin
Priority: optional
Pre-Depends: dpkg (>= 1.10.24)
Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES=
-Depends: ${miscepends}, ${shlibsepends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda
+Depends: ${miscepends}, ${shlibsepends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda, SRCPKGNAME-tools
Conflicts: hotplug (<< 0.0.20040105-1)
Recommends: BOOTLOADER
Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index c6a8404..b319b7f 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -45,6 +45,16 @@ Description: Linux kernel specific documentation for version PKGVER
/usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
contained in each file.

+Package: SRCPKGNAME-tools
+Architecture: all
+Section: admin
+Priority: optional
+Depends: ${miscepends}
+Conflicts: SRCPKGNAME-tools-2.6
+Replaces: SRCPKGNAME-tools-2.6
+Description: Linux kernel specific tools for version PKGVER
+ This package provides the various tools in the PKGVER kernel source.
+
Package: linux-headers-PKGVER-ABINUM
Architecture: all
Section: devel
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 335879f..0909dc7 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -124,6 +124,7 @@ do_tools=false
ifneq ($(wildcard $(CURDIR)/tools),)
do_tools=true
endif
+tools_pkg_name=$(src_pkg_name)-tools

# Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008)
#
diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 094c7c5..9a99736 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -62,6 +62,28 @@ ifeq ($(do_source_package_content),true)
rm -rf $(srcdir)
endif

+toolspkg = $(tools_pkg_name)
+toolsbin = $(CURDIR)/debian/$(toolspkg)/usr/bin
+toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man
+install-tools:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -p$(toolspkg)
+
+ install -d $(toolsbin)
+ install -d $(toolsman)/man1
+
+ install -m755 debian/tools/perf $(toolsbin)/perf
+
+ install -d $(builddir)/tools
+ for i in *; do ln -s $(CURDIR)/$$i $(builddir)/tools/; done
+ rm $(builddir)/tools/tools
+ rsync -a tools/ $(builddir)/tools/tools/
+
+ cd $(builddir)/tools/tools/perf && make man
+ install -m644 $(builddir)/tools/tools/perf/Documentation/*.1
+ $(toolsman)/man1
+
install-indep-deps =
ifeq ($(do_common_headers_indep),true)
install-indep-deps += install-headers
@@ -72,6 +94,9 @@ endif
ifeq ($(do_source_package),true)
install-indep-deps += install-source
endif
+ifeq ($(do_tools),true)
+install-indep-deps += install-tools
+endif
install-indep: $(install-indep-deps)

# This is just to make it easy to call manually. Normally done in
diff --git a/debian/tools/perf b/debian/tools/perf
new file mode 100644
index 0000000..cfc2f87
--- /dev/null
+++ b/debian/tools/perf
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec perf_`uname -r` "$@"
--
1.7.0


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 05:09 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org