[pkg-nvidia-devel] r808 - /packages/nvidia-graphics-drivers/trunk/debian/
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Fri Apr 9 19:41:29 UTC 2010
Author: rra
Date: Fri Apr 9 19:41:29 2010
New Revision: 808
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=808
Log:
Simplify the Lintian override handling
* Make all Lintian overrides for binary problems that the license
doesn't allow us to fix (unstripped shared libraries, executable
stack, non-PIC code, etc.) general rather than referring to specific
files. We won't be able to fix these in any files they turn up in.
This allows us to use static Lintian override files and stop
substituting version numbers into them in debian/rules, simplifying
the build process.
Added:
packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides
- copied, changed from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides
- copied, changed from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.amd64.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides
- copied, changed from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides.amd64.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides
- copied, changed from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in
Removed:
packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides.amd64.in
packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides.i386.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.amd64.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.i386.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides.amd64.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides.i386.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.i386.in
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=808&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Fri Apr 9 19:41:29 2010
@@ -12,6 +12,13 @@
* Make nvidia-kernel-source depend on module-assistant. At least for
right now, it uses the make fragments provided by module-assistant to
implement required rules for the module building interface.
+ * Make all Lintian overrides for binary problems that the license
+ doesn't allow us to fix (unstripped shared libraries, executable
+ stack, non-PIC code, etc.) general rather than referring to specific
+ files. We won't be able to fix these in any files they turn up in.
+ This allows us to use static Lintian override files and stop
+ substituting version numbers into them in debian/rules, simplifying
+ the build process.
-- Russ Allbery <rra at debian.org> Fri, 09 Apr 2010 01:11:41 -0700
Added: packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.lintian-overrides?rev=808&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.lintian-overrides (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libcuda1-ia32.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,0 +1,7 @@
+# The NVIDIA license does not allow any form of modification.
+libcuda1-ia32: shlib-with-non-pic-code
+libcuda1-ia32: shlib-without-PT_GNU_STACK-section
+libcuda1-ia32: unstripped-binary-or-object
+
+# libcudart.so.2 does dlopen("libcuda.so").
+libcuda1-ia32: non-dev-pkg-with-shlib-symlink
Added: packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides?rev=808&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libcuda1.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,0 +1,7 @@
+# The NVIDIA license does not allow any form of modification.
+libcuda1: shlib-with-non-pic-code
+libcuda1: shlib-without-PT_GNU_STACK-section
+libcuda1: unstripped-binary-or-object
+
+# libcudart.so.2 does dlopen("libcuda.so").
+libcuda1: non-dev-pkg-with-shlib-symlink
Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides (from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides?rev=808&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,26 +1,9 @@
-# the diversions are placed there
+# The diversions are placed here.
nvidia-glx-ia32: package-contains-empty-directory usr/lib32/nvidia/
-nvidia-glx-ia32: shared-lib-without-dependency-information ./usr/lib32/libnvidia-tls.so.#VERSION#
-nvidia-glx-ia32: shared-lib-without-dependency-information ./usr/lib32/tls/libnvidia-tls.so.#VERSION#
-
-nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/libGL.so.#VERSION#
-nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/libGLcore.so.#VERSION#
-nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/libnvidia-tls.so.#VERSION#
-nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/tls/libnvidia-tls.so.#VERSION#
-
-nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/libGL.so.#VERSION#
-nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/libGLcore.so.#VERSION#
-nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/libnvidia-tls.so.#VERSION#
-nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/tls/libnvidia-tls.so.#VERSION#
-
-nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libGL.so.#VERSION# .comment
-nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libGLcore.so.#VERSION# .note
-nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libGLcore.so.#VERSION# .comment
-nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libnvidia-tls.so.#VERSION# .comment
-nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/tls/libnvidia-tls.so.#VERSION# .comment
-
-nvidia-glx-ia32: spelling-error-in-binary ./usr/lib32/libGLcore.so.#VERSION# ment meant
-nvidia-glx-ia32: spelling-error-in-binary ./usr/lib32/libGLcore.so.#VERSION# incompatable incompatible
-nvidia-glx-ia32: spelling-error-in-binary ./usr/lib32/libGLcore.so.#VERSION# Unkown Unknown
-
+# The NVIDIA license does not allow any form of modification.
+nvidia-glx-ia32: binary-has-unneeded-section
+nvidia-glx-ia32: shared-lib-without-dependency-information
+nvidia-glx-ia32: shlib-with-non-pic-code
+nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section
+nvidia-glx-ia32: spelling-error-in-binary
Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides (from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.amd64.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides?rev=808&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.amd64.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,25 +1,7 @@
-nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libnvidia-tls.so.#VERSION#
-nvidia-glx: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.so.#VERSION#
-
-nvidia-glx: shlib-with-executable-stack usr/lib/libGL.so.#VERSION#
-nvidia-glx: shlib-with-executable-stack usr/lib/libGLcore.so.#VERSION#
-nvidia-glx: shlib-with-executable-stack usr/lib/libXvMCNVIDIA.so.#VERSION#
-nvidia-glx: shlib-with-executable-stack usr/lib/libnvidia-tls.so.#VERSION#
-nvidia-glx: shlib-with-executable-stack usr/lib/libnvidia-cfg.so.#VERSION#
-nvidia-glx: shlib-with-executable-stack usr/lib/tls/libnvidia-tls.so.#VERSION#
-nvidia-glx: shlib-with-executable-stack usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
-
-nvidia-glx: binary-has-unneeded-section ./usr/lib/libGL.so.#VERSION# .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/libGLcore.so.#VERSION# .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/libXvMCNVIDIA.so.#VERSION# .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/libnvidia-tls.so.#VERSION# .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/libnvidia-cfg.so.#VERSION# .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/tls_test .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/tls_test_dso.so .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/tls/libnvidia-tls.so.#VERSION# .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/drivers/nvidia_drv.so .comment
-nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/extensions/libglx.so.#VERSION# .comment
-
-nvidia-glx: spelling-error-in-binary ./usr/lib/libGLcore.so.#VERSION# incompatable incompatible
-nvidia-glx: spelling-error-in-binary ./usr/lib/libGLcore.so.#VERSION# Unkown Unknown
-
+# The NVIDIA license does not allow any form of modification.
+nvidia-glx: binary-has-unneeded-section
+nvidia-glx: shared-lib-without-dependency-information
+nvidia-glx: shlib-with-executable-stack
+nvidia-glx: shlib-with-non-pic-code
+nvidia-glx: shlib-without-PT_GNU_STACK-section
+nvidia-glx: spelling-error-in-binary
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.lintian-overrides?rev=808&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.lintian-overrides (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,0 +1,3 @@
+# The NVIDIA license does not allow any form of modification.
+nvidia-libvdpau1-ia32: binary-has-unneeded-section
+nvidia-libvdpau1-ia32: shlib-without-PT_GNU_STACK-section
Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides (from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides.amd64.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides?rev=808&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides.amd64.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,2 +1,3 @@
-nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau.so.#VERSION# .comment
-nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/vdpau/libvdpau_trace.so.#VERSION# .comment
+# The NVIDIA license does not allow any form of modification.
+nvidia-libvdpau1: binary-has-unneeded-section
+nvidia-libvdpau1: shlib-without-PT_GNU_STACK-section
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.lintian-overrides?rev=808&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.lintian-overrides (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,0 +1,4 @@
+# The NVIDIA license does not allow any form of modification.
+nvidia-vdpau-driver-ia32: binary-has-unneeded-section
+nvidia-vdpau-driver-ia32: shlib-with-non-pic-code
+nvidia-vdpau-driver-ia32: shlib-without-PT_GNU_STACK-section
Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides (from r771, packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides?rev=808&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides.amd64.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides Fri Apr 9 19:41:29 2010
@@ -1,1 +1,4 @@
-nvidia-vdpau-driver: binary-has-unneeded-section ./usr/lib/vdpau/libvdpau_nvidia.so.#VERSION# .comment
+# The NVIDIA license does not allow any form of modification.
+nvidia-vdpau-driver: binary-has-unneeded-section
+nvidia-vdpau-driver: shlib-with-non-pic-code
+nvidia-vdpau-driver: shlib-without-PT_GNU_STACK-section
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=808&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Fri Apr 9 19:41:29 2010
@@ -32,28 +32,20 @@
AUTOCLEAN = \
debian/nvidia-kernel-source.README.Debian \
debian/nvidia-glx.links \
-debian/nvidia-glx.lintian-overrides.amd64 debian/nvidia-glx.lintian-overrides.i386 \
debian/nvidia-glx.docs debian/nvidia-glx.examples \
debian/nvidia-libvdpau1.links debian/nvidia-libvdpau1.docs \
debian/nvidia-glx.postrm debian/nvidia-glx.init \
-debian/nvidia-glx-ia32.lintian-overrides debian/nvidia-glx-ia32.links \
+debian/nvidia-glx-ia32.links \
debian/nvidia-libvdpau1-ia32.links \
debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst \
debian/libcuda1.install debian/libcuda1-ia32.install debian/libcuda1-dev.install \
debian/libcuda1.links debian/libcuda1-ia32.links \
-debian/libcuda1.lintian-overrides.amd64 debian/libcuda1.lintian-overrides.i386 \
-debian/libcuda1-ia32.lintian-overrides \
debian/libcuda1-ia32.symbols \
-debian/nvidia-libvdpau1.lintian-overrides.amd64 debian/nvidia-libvdpau1.lintian-overrides.i386 \
-debian/nvidia-libvdpau1-ia32.lintian-overrides \
debian/nvidia-libvdpau1-ia32.symbols \
debian/nvidia-vdpau-driver.docs \
debian/nvidia-vdpau-driver-ia32.links \
debian/nvidia-vdpau-driver.links \
-debian/nvidia-vdpau-driver.lintian-overrides.amd64 \
-debian/nvidia-vdpau-driver.lintian-overrides.i386 \
debian/nvidia-vdpau-driver-ia32.docs \
-debian/nvidia-vdpau-driver-ia32.lintian-overrides \
debian.binary/changelog
@@ -330,17 +322,8 @@
debian/nvidia-libvdpau1-ia32.symbols: debian/nvidia-libvdpau1.symbols.i386
sed 's/nvidia-libvdpau1/nvidia-libvdpau1-ia32/g' $< > $@
-debian/nvidia-libvdpau1-ia32.lintian-overrides: debian/nvidia-libvdpau1.lintian-overrides.i386
- sed 's/^nvidia-libvdpau1:/nvidia-libvdpau1-ia32:/; s%usr/lib/%usr/lib32/%g' $< > $@
-
-debian/nvidia-vdpau-driver-ia32.lintian-overrides: debian/nvidia-vdpau-driver.lintian-overrides.i386
- sed 's/^nvidia-vdpau-driver:/nvidia-vdpau-driver-ia32:/; s%usr/lib/%usr/lib32/%g' $< > $@
-
debian/libcuda1-ia32.symbols: debian/libcuda1.symbols
sed 's/libcuda1/libcuda1-ia32/g' $< > $@
-
-debian/libcuda1-ia32.lintian-overrides: debian/libcuda1.lintian-overrides.i386
- sed 's/^libcuda1:/libcuda1-ia32:/; s%usr/lib/%usr/lib32/%g' $< > $@
# Build architecture dependant packages using the common target.
More information about the Pkg-nvidia-devel
mailing list