[kernel] r16229 - in dists/sid/linux-2.6/debian: . bin templates
Ian Campbell
ijc-guest at alioth.debian.org
Mon Aug 30 08:44:57 UTC 2010
Author: ijc-guest
Date: Mon Aug 30 08:44:52 2010
New Revision: 16229
Log:
Fix some low hanging lintian warnings
Pulled over from trunk r16172.
Added:
dists/sid/linux-2.6/debian/templates/image-dbg.lintian-override.in
Modified:
dists/sid/linux-2.6/debian/bin/gencontrol.py
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/rules.real
dists/sid/linux-2.6/debian/templates/control.headers.arch.in
dists/sid/linux-2.6/debian/templates/control.headers.featureset.in
dists/sid/linux-2.6/debian/templates/control.headers.in
dists/sid/linux-2.6/debian/templates/control.image-dbg.in
dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in
dists/sid/linux-2.6/debian/templates/control.image.type-modulesextra.in
dists/sid/linux-2.6/debian/templates/control.image.type-modulesinline.in
dists/sid/linux-2.6/debian/templates/control.image.type-plain.in
dists/sid/linux-2.6/debian/templates/control.image.type-standalone.in
dists/sid/linux-2.6/debian/templates/control.libc-dev.in
dists/sid/linux-2.6/debian/templates/control.main.in
dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in
Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py Mon Aug 30 08:44:52 2010 (r16229)
@@ -45,7 +45,8 @@
libc_dev = self.templates["control.libc-dev"]
packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
- extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = PackageRelation()
+ packages_headers_arch[-1]['Depends'].extend(PackageRelation())
+ extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends']
self.merge_packages(packages, packages_headers_arch, arch)
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/changelog Mon Aug 30 08:44:52 2010 (r16229)
@@ -2,6 +2,15 @@
[ Ian Campbell ]
* xen: backport pvhvm drivers from upstream.
+ * Fixes/overrides for Linitan warnings:
+ - Add "(meta package)" to short description of linux-headers
+ metapackages, resolves empty-binary-package.
+ - Add dependency on ${misc:Depends} to all packages, resolves
+ debhelper-but-no-misc-depends. Required update to gencontrol.py to
+ augment rather than override headers_arch_depends read from templates.
+ - Override dbg-package-missing-depends for linux-image-*-dbg. It is not
+ necessary to install the kernel image package to use the dbg package
+ since the dbg package already contains a complete image with symbols.
[ Ben Hutchings ]
* [x86/xen] Restore stack guard page (CVE-2010-2240)
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/rules.real Mon Aug 30 08:44:52 2010 (r16229)
@@ -470,7 +470,10 @@
dh_testdir
dh_testroot
dh_prep
- dh_installdirs usr/lib/debug usr/lib/debug/boot
+ dh_installdirs usr/lib/debug usr/lib/debug/boot usr/share/lintian/overrides/
+ sed -e 's/=V/$(REAL_VERSION)/g' \
+ debian/templates/image-dbg.lintian-override.in \
+ > $(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME)
install -m644 $(DIR)/vmlinux $(DEBUG_DIR)/boot/vmlinux-$(REAL_VERSION)
ifeq ($(MODULES),True)
+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(DEBUG_DIR)
Modified: dists/sid/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.headers.arch.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.headers.arch.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,12 +1,13 @@
Package: linux-headers- at upstreamversion@@abiname at -all
-Depends: linux-headers- at upstreamversion@@abiname at -all-${kernel:Arch} (= ${binary:Version})
-Description: All header files for Linux @version@
+Depends: linux-headers- at upstreamversion@@abiname at -all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends}
+Description: All header files for Linux @version@ (meta-package)
This package depends against all architecture-specific kernel header files
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
kernel modules.
Package: linux-headers- at upstreamversion@@abiname at -all-@arch@
-Description: All header files for Linux @version@
+Depends: ${misc:Depends}
+Description: All header files for Linux @version@ (meta-package)
This package depends against all architecture-specific kernel header files
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
kernel modules.
Modified: dists/sid/linux-2.6/debian/templates/control.headers.featureset.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.headers.featureset.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.headers.featureset.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,4 +1,5 @@
Package: linux-headers- at upstreamversion@@abiname at -common@localversion_headers@
+Depends: ${misc:Depends}
Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@
This package provides the architecture-specific common kernel header files
for Linux kernel version @upstreamversion@@abiname@@localversion_headers@, generally used for building out-of-tree
Modified: dists/sid/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.headers.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.headers.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,5 +1,5 @@
Package: linux-headers- at upstreamversion@@abiname@@localversion@
-Depends: linux-headers- at upstreamversion@@abiname at -common@localversion_headers@ (= ${binary:Version}), linux-kbuild- at version@
+Depends: linux-headers- at upstreamversion@@abiname at -common@localversion_headers@ (= ${binary:Version}), linux-kbuild- at version@, ${misc:Depends}
Provides: linux-headers, linux-headers- at major@
Description: Header files for Linux @upstreamversion@@abiname@@localversion@
This package provides the architecture-specific kernel header files
Modified: dists/sid/linux-2.6/debian/templates/control.image-dbg.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image-dbg.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.image-dbg.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,4 +1,5 @@
Package: linux-image- at upstreamversion@@abiname@@localversion at -dbg
+Depends: linux-image- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
Section: debug
Priority: extra
Description: Debugging infos for Linux @upstreamversion@@abiname@@localversion@
Modified: dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,7 +1,7 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
-Depends: module-init-tools
+Depends: module-init-tools, ${misc:Depends}
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
The Linux kernel @upstreamversion@ and modules for use on @longclass at .
Modified: dists/sid/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-modulesextra.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-modulesextra.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,11 +1,11 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
Provides: linux-image, linux-image- at major@
-Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${binary:Version})
+Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
The Linux kernel @upstreamversion@ for use on @longclass at .
Package: linux-modules- at upstreamversion@@abiname@@localversion@
-Depends: module-init-tools
+Depends: module-init-tools, ${misc:Depends}
Description: Linux @upstreamversion@ modules for @class@
Modules for Linux kernel @upstreamversion@ for use on @longclass at .
Modified: dists/sid/linux-2.6/debian/templates/control.image.type-modulesinline.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-modulesinline.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-modulesinline.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,6 +1,6 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
-Depends: module-init-tools
+Depends: module-init-tools, ${misc:Depends}
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
The Linux kernel @upstreamversion@ for use on @longclass at .
Modified: dists/sid/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-plain.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-plain.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,7 +1,7 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
-Depends: module-init-tools, linux-base (>= ${source:Version}), ${shlibs:Depends}
+Depends: module-init-tools, linux-base (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: firmware-linux-free (>= @source_upstream@)
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
Modified: dists/sid/linux-2.6/debian/templates/control.image.type-standalone.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-standalone.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-standalone.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,6 +1,6 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
Provides: linux-image, linux-image- at major@
Suggests: linux-doc- at version@
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Linux @upstreamversion@ for @class@
The Linux kernel @upstreamversion@ for use on @longclass at .
Modified: dists/sid/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.libc-dev.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.libc-dev.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,5 +1,6 @@
Package: linux-libc-dev
Section: devel
+Depends: ${misc:Depends}
Provides: linux-kernel-headers
Replaces: linux-kernel-headers
Conflicts: linux-kernel-headers
Modified: dists/sid/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.main.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.main.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -14,7 +14,7 @@
Architecture: all
Section: kernel
Provides: linux-source, linux-source- at major@
-Depends: binutils, bzip2
+Depends: binutils, bzip2, ${misc:Depends}
Recommends: libc6-dev | libc-dev, gcc, make
Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
Description: Linux kernel source for version @version@ with Debian patches
@@ -31,6 +31,7 @@
Package: linux-doc- at version@
Architecture: all
+Depends: ${misc:Depends}
Section: doc
Provides: linux-doc- at major@
Description: Linux kernel specific documentation for version @version@
@@ -43,6 +44,7 @@
Package: linux-manual- at version@
Architecture: all
+Depends: ${misc:Depends}
Section: doc
Provides: linux-manual, kernel-manual- at major@
Conflicts: linux-manual, kernel-manual- at major@
@@ -59,7 +61,7 @@
Package: linux-patch-debian- at version@
Architecture: all
-Depends: bzip2, linux-support- at upstreamversion@@abiname@, python
+Depends: bzip2, linux-support- at upstreamversion@@abiname@, python, ${misc:Depends}
Suggests: linux-source- at version@
Description: Debian patches to version @version@ of the Linux kernel
This package includes the patches used to produce the prepackaged
@@ -72,6 +74,7 @@
Package: firmware-linux-free
Architecture: all
+Depends: ${misc:Depends}
Description: Binary firmware for various drivers in the Linux kernel
This package contains firmware which was previously included in the
Linux kernel and which is compliant with the Debian Free Software
@@ -83,7 +86,7 @@
Package: linux-support- at upstreamversion@@abiname@
Architecture: all
Section: devel
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
Description: Support files for Linux @upstreamversion@
This package provides support files for the Linux kernel build,
e.g. scripts to handle ABI information and for generation of
Modified: dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in Mon Aug 30 06:16:53 2010 (r16228)
+++ dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -1,5 +1,5 @@
Package: xen-linux-system- at upstreamversion@@abiname@@localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@ (= ${binary:Version})
-Description: Xen system with Linux @upstreamversion@ on @class@
+Depends: linux-image- at upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
+Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package)
This package depends on the binary Linux image and hypervisors.
Added: dists/sid/linux-2.6/debian/templates/image-dbg.lintian-override.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/templates/image-dbg.lintian-override.in Mon Aug 30 08:44:52 2010 (r16229)
@@ -0,0 +1,2 @@
+# Kernel dbg packages contain a full image with debug data
+linux-image-=V-dbg: dbg-package-missing-depends
More information about the Kernel-svn-changes
mailing list