[pkg-nvidia-devel] r955 - in /packages/nvidia-graphics-modules/trunk/debian: changelog control.flavor control.source rules rules.defs
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Sat May 29 15:45:36 UTC 2010
Author: anbe-guest
Date: Sat May 29 15:45:35 2010
New Revision: 955
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=955
Log:
Add support for building legacy modules.
Modified:
packages/nvidia-graphics-modules/trunk/debian/changelog
packages/nvidia-graphics-modules/trunk/debian/control.flavor
packages/nvidia-graphics-modules/trunk/debian/control.source
packages/nvidia-graphics-modules/trunk/debian/rules
packages/nvidia-graphics-modules/trunk/debian/rules.defs
Modified: packages/nvidia-graphics-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/changelog?rev=955&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules/trunk/debian/changelog Sat May 29 15:45:35 2010
@@ -12,6 +12,7 @@
* Use only NVIDIA_VERSION instead of NVIDIA_CURRENT and NVIDIA_NEXT.
* Make the meta package dependency on a module package versioned and require
NVIDIA_VERSION at least.
+ * Add support for building legacy modules.
-- Andreas Beckmann <debian at abeckmann.de> Sat, 29 May 2010 15:41:11 +0200
Modified: packages/nvidia-graphics-modules/trunk/debian/control.flavor
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/control.flavor?rev=955&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/control.flavor (original)
+++ packages/nvidia-graphics-modules/trunk/debian/control.flavor Sat May 29 15:45:35 2010
@@ -1,14 +1,14 @@
-Package: nvidia-kernel-2.6-#FLAVOR#
+Package: nvidia-kernel#LEGACY#-2.6-#FLAVOR#
Architecture: #ARCH#
-Depends: ${misc:Depends}, nvidia-kernel-#KERNEL#-#FLAVOR# (>= #NVIDIA_VERSION#)
+Depends: ${misc:Depends}, nvidia-kernel#LEGACY#-#KERNEL#-#FLAVOR# (>= #NVIDIA_VERSION#)
Description: NVIDIA kernel module for Linux 2.6 (#FLAVOR# flavor)
This is a metapackage that will depend on the latest version of the
NVIDIA kernel module for the Linux 2.6 kernel series (#FLAVOR# flavor).
Install this package to automatically install the latest NVIDIA module
when new versions of the kernel are released.
-Package: nvidia-kernel-#KERNEL#-#FLAVOR#
+Package: nvidia-kernel#LEGACY#-#KERNEL#-#FLAVOR#
Architecture: #ARCH#
Depends: ${misc:Depends}
Description: NVIDIA binary kernel module (#FLAVOR# flavor)
Modified: packages/nvidia-graphics-modules/trunk/debian/control.source
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/control.source?rev=955&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/control.source (original)
+++ packages/nvidia-graphics-modules/trunk/debian/control.source Sat May 29 15:45:35 2010
@@ -1,12 +1,12 @@
-Source: nvidia-graphics-modules
+Source: nvidia-graphics#LEGACY#-modules
Section: non-free/kernel
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
Uploaders: Randall Donald <rdonald at debian.org>, Russ Allbery <rra at debian.org>
Build-Depends: debhelper (>= 7), module-assistant,
#LINUX_HEADERS#
- nvidia-kernel-source (>= #NVIDIA_VERSION#), nvidia-kernel-source (<< #NVIDIA_VERSION#.1~~),
+ nvidia-kernel#LEGACY#-source (>= #NVIDIA_VERSION#), nvidia-kernel#LEGACY#-source (<< #NVIDIA_VERSION#.1~~),
Standards-Version: 3.8.4
Homepage: http://www.nvidia.com/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-modules
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules
+Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics#LEGACY#-modules
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics#LEGACY#-modules
Modified: packages/nvidia-graphics-modules/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules?rev=955&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules Sat May 29 15:45:35 2010
@@ -22,6 +22,7 @@
include debian/rules.defs
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
package := $(shell dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f2)
+legacy = $(NVIDIA_LEGACY)
KERNEL_FLAVORS_both = $(filter $(KERNEL_FLAVORS_i386),$(KERNEL_FLAVORS_amd64))
KERNEL_FLAVORS_only_i386 = $(filter-out $(KERNEL_FLAVORS_both),$(KERNEL_FLAVORS_i386))
@@ -31,10 +32,10 @@
build-arch: build-stamp
build-indep:
build-stamp: debian/control
- tar jxf /usr/src/nvidia-kernel.tar.bz2
- sed -i -e '/^Source:/s/.*/Source: $(package)/' modules/nvidia-kernel/debian/control.template
- mv modules/nvidia-kernel/debian/changelog modules/nvidia-kernel/debian/changelog.nvidia-kernel-source.Debian
- cp debian/changelog modules/nvidia-kernel/debian
+ tar jxf /usr/src/nvidia-kernel$(legacy).tar.bz2
+ sed -i -e '/^Source:/s/.*/Source: $(package)/' modules/nvidia-kernel$(legacy)/debian/control.template
+ mv modules/nvidia-kernel$(legacy)/debian/changelog modules/nvidia-kernel$(legacy)/debian/changelog.nvidia-kernel$(legacy)-source.Debian
+ cp debian/changelog modules/nvidia-kernel$(legacy)/debian
touch $@
clean: debian/control
@@ -60,7 +61,7 @@
.NOTPARALLEL:
binary-module-%: build binary-arch-meta
- set -e; cd modules/nvidia-kernel; \
+ set -e; cd modules/nvidia-kernel$(legacy); \
KSRC=/usr/src/linux-headers-$* \
KVERS=$* \
KERNEL_DEPENDS=y \
@@ -108,6 +109,7 @@
-e 's/#FLAVOR#/$2/g' \
-e 's/#ARCH#/$3/g' \
-e 's/#NVIDIA_VERSION#/$(NVIDIA_VERSION)/g' \
+ -e 's/#LEGACY#/$(legacy)/g' \
debian/control.flavor >> debian/control.tmp
endef
@@ -116,6 +118,7 @@
sed \
-e 's/#NVIDIA_VERSION#/$(NVIDIA_VERSION)/g' \
-e 's/#LINUX_HEADERS#/$(LINUX_HEADERS)/g' \
+ -e 's/#LEGACY#/$(legacy)/g' \
debian/control.source > debian/control.tmp
$(foreach f,$(KERNEL_FLAVORS_both),$(call append-flavor-entries,$(KERNEL_VERSION),$(f),i386 amd64))
$(foreach f,$(KERNEL_FLAVORS_only_i386),$(call append-flavor-entries,$(KERNEL_VERSION),$(f),i386))
Modified: packages/nvidia-graphics-modules/trunk/debian/rules.defs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules/trunk/debian/rules.defs?rev=955&op=diff
==============================================================================
--- packages/nvidia-graphics-modules/trunk/debian/rules.defs (original)
+++ packages/nvidia-graphics-modules/trunk/debian/rules.defs Sat May 29 15:45:35 2010
@@ -1,4 +1,5 @@
NVIDIA_VERSION = 195.36.24
+NVIDIA_LEGACY =
KERNEL_VERSION = 2.6.32-5
KERNEL_FLAVORS_i386 += 486
More information about the Pkg-nvidia-devel
mailing list