debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge changes from trunk 

svn path=/dists/sid/linux-tools/; revision=20356
This commit is contained in:
Ben Hutchings 2013-07-16 04:53:37 +00:00
parent fa0ad3f1b8
commit 41ace24b2d
10 changed files with 86 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/changelog vendored
View File

@ -1,3 +1,20 @@
linux-tools (3.10-1~exp1) UNRELEASED; urgency=low
* New upstream release
[ Chris Boot ]
* Update modpost-symbol-prefix.patch for 3.10
[ Ben Hutchings ]
* debian/patches: Add DEP-3 headers (From, Subject, Forwarded) to all patches
* debian/copyright: Convert to machine-readable format (fka DEP-5)
* debian/copyright: Add explanation of indirect linking of perf to OpenSSL
* debian/rules.real: Remove support for pre-multiarch dpkg
* Update policy version to 3.9.4
- debian/rules: Implement build-arch and build-indep targets
-- Chris Boot <debian@bootc.net> Mon, 01 Jul 2013 22:07:42 +0100
linux-tools (3.9.4-1) unstable; urgency=low
* New upstream release

60
debian/copyright vendored
View File

@ -1,32 +1,32 @@
This is the Debian GNU/Linux prepackaged version of the Linux kernel.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Linux kernel
Source: http://ftp.kernel.org/pub/linux/kernel/
Comment:
The 'perf' tool is dynamically linked with the Python interpreter,
which is itself dynamically linked with OpenSSL, which is not
GPL-compatible. However, since perf itself does not link with or use
OpenSSL, we believe that this indirect linking does not require
additional permissions beyond the GPL.
It was downloaded from http://ftp.kernel.org/pub/linux/kernel/.
Files: *
Copyright: 1991-2012 Linus Torvalds and many others
License: GPL-2
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General Public License version
2 can be found in `/usr/share/common-licenses/GPL-2'.
Copyright:
Copyright (C) 1996, 1997 Linux International
2000, 2006 IBM Corporation
2002, 2003 Kai Germaschewski
2002-2004 Rusty Russell
2002-2005 Roman Zippel
and others
License:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License version
2 can be found in `/usr/share/common-licenses/GPL-2'.
The Debian packaging is licensed under the GPL v2, see above.
Files: debian/*
Copyright: 2006-2012 Debian kernel team
License: GPL-2

29
debian/patches/modpost-symbol-prefix.patch vendored
View File

@ -1,19 +1,22 @@
From: Chris Boot <debian@bootc.net>
Date: Mon, 01 Jul 2013 23:10:02 +0100
Subject: modpost symbol prefix setting
Forwarded: not-needed
[bwh: The original version of this was added by Bastian Blank. The
upstream code includes <generated/autoconf.h> so that <linux/export.h>
can tell whether C symbols have an underscore prefix. Since we build
modpost separately from the kernel, <generated/autoconf.h> won't exist.
However, no Debian Linux architecture uses the symbol prefix, so we
can simply omit it.]
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -16,15 +16,11 @@
#include <ctype.h>
#include <string.h>
@@ -18,7 +18,6 @@
#include <limits.h>
#include <stdbool.h>
#include "modpost.h"
-#include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h"
#include "../../include/linux/export.h"
/* Some toolchains use a `_' prefix for all user symbols. */
-#ifdef CONFIG_SYMBOL_PREFIX
-#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
-#else
+/* No Debian architecture currently does this. */
#define MODULE_SYMBOL_PREFIX ""
-#endif
/* Are we using CONFIG_MODVERSIONS? */

5
debian/patches/tools-perf-install.patch vendored
View File

@ -1,3 +1,8 @@
From: Bastian Blank <waldi@debian.org>
Date: Fri, 07 Oct 2011 21:37:52 +0100
Subject: Install perf scripts non-executable
Forwarded: no
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -1145,20 +1145,20 @@ install-bin: all

9
debian/patches/tools-perf-version.patch vendored
View File

@ -1,3 +1,12 @@
From: Bastian Blank <waldi@debian.org>
Date: Mon, 26 Sep 2011 13:53:12 +0100
Subject: Create manpages and binaries including the version
Forwarded: no
[bwh: Fix version insertion in perf man page cross-references and perf
man page title. Install bash_completion script for perf with a
version-dependent name.]
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -1141,7 +1141,7 @@ perfexec_instdir_SQ = $(subst ','\'',$(p

2
debian/patches/usbip-document-tcp-wrappers.patch vendored
View File

@ -1,5 +1,7 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 24 Jun 2012 02:51:39 +0100
Subject: usbip: Document TCP wrappers
Forwarded: no
Add references to TCP wrappers configuration in the manual page.

6
debian/rules vendored
View File

@ -10,12 +10,16 @@ VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.*
include debian/rules.defs
build: debian/control $(STAMPS_DIR)/build-base
build: build-arch build-indep
build-arch: debian/control $(STAMPS_DIR)/build-base
$(STAMPS_DIR)/build-base: $(STAMPS_DIR)
dh_testdir
$(MAKE) -f debian/rules.gen build
touch $@
build-indep: debian/control
$(STAMPS_DIR):
@[ -d $@ ] || mkdir $@

6
debian/rules.real vendored
View File

@ -3,7 +3,6 @@ export DH_OPTIONS
include debian/rules.defs
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
binary-arch: install-kbuild install-usbip
ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
@ -24,11 +23,6 @@ install-kbuild: $(STAMPS_DIR)/build
dh_testdir
dh_testroot
dh_clean -k -d
ifneq (,$(HAVE_MULTIARCH))
echo linux-kbuild:Multi-Arch=foreign >>debian/$(PACKAGE_NAME).substvars
else
echo linux-kbuild:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
endif
$(MAKE) -C $(BUILD_DIR)/scripts install prefix=$(DIR) top_srcdir=$(CURDIR)
dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
dh_installchangelogs

2
debian/templates/control.main.in vendored
View File

@ -1,7 +1,7 @@
Package: linux-kbuild-@version@
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: ${linux-kbuild:Multi-Arch}
Multi-Arch: foreign
Description: Kbuild infrastructure for Linux @version@
This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.

2
debian/templates/control.source.in vendored
View File

@ -3,7 +3,7 @@ Section: kernel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Jonathan Nieder <jrnieder@gmail.com>
Standards-Version: 3.9.2
Standards-Version: 3.9.4
Build-Depends:
debhelper (>> 7), python,
asciidoc, binutils-dev, bison, flex, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto,