[pkg-nvidia-devel] r599 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk: debian.binary/changelog debian.binary/rules debian/changelog debian/rules debian/upstream_info
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Mon Oct 5 01:41:58 UTC 2009
Author: rdonald
Date: Mon Oct 5 01:41:58 2009
New Revision: 599
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=599
Log:
96.43.11 plus Len patch
Modified:
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/rules
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules
packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog?rev=599&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/changelog Mon Oct 5 01:41:58 2009
@@ -1,3 +1,9 @@
+nvidia-kernel-legacy-96xx (96.43.07-2) unstable; urgency=high
+
+ * Remove nested rood_cmd RC bug (closes: #435386)
+
+ -- Randall Donald <rdonald at debian.org> Thu, 02 Oct 2008 15:34:31 -0700
+
nvidia-kernel-legacy-96xx (96.43.07-1) unstable; urgency=medium
* New upstream. 2.6.26 compatible. (closes: #492309)
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/rules?rev=599&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian.binary/rules Mon Oct 5 01:41:58 2009
@@ -1,240 +1,60 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+LEGACY=-legacy-96xx
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
+CFLAGS = -Wall -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# Prefix of the target package name
+PACKAGE = nvidia-kernel$(LEGACY)
-dirname=nv
+-include /usr/share/modass/include/generic.make
+-include /usr/share/modass/include/common-rules.make
-
-# if you need to redefine these
-KSRC:=$(KSRC)
-KVERS:=${KVERS}
-
-# 6106 has builtin sysfs support supposedly
-NV_PATCH_SYSFS ?= 0
-
-
-# redefine the directory for kbuild to fine the makefile.
-KBUILD_PARAMS := "-C $(KSRC) SUBDIRS=$(CURDIR)/$(dirname)"
-
-
-#### COMPILER DETECTION ####
-
-ifeq ($(origin CC),default)
-ifneq "$(wildcard $(KSRC)/include/linux/compile.h)" ""
-CC = gcc-$(shell grep LINUX_COMPILER $(KSRC)/include/linux/compile.h | sed 's/.*[gcc|GCC].* \([0-9]\.[0-9]\+\).*/\1/')
-else
-CC = gcc
-endif
-endif
-
-ifeq ($(CC),gcc-2.7)
-CC = gcc272
-endif
-
-# determine gcc versions used (kernel, nvidia.o)
-module_cc:=$(shell $(CC) -v 2>&1 | tail -1)
-version="^Linux version [^(]* (.*@.*) (\(gcc.*\)) .*"
-kernel_cc:=$(shell cat /proc/version | sed "s/"$(version)"/\1/")
-
-module_cc:=$(shell echo "$(module_cc)" | sed 's/.* \([0-9.]*\.[0-9]\).*/\1/')
-kernel_cc:=$(shell echo "$(kernel_cc)" | sed 's/.* \([0-9.]*\.[0-9]\).*/\1/')
-
-baseepoch=$(shell expr $(KDREV) : '\([0-9]*\):.*' 2>/dev/null )
-ifneq ($(baseepoch),)
- EPOCH=$(baseepoch):
-endif
-REV=$(shell expr $(KDREV) : '[0-9]*:\(.*\)' 2>/dev/null)
-ifeq ($(REV),)
- REV=$(KDREV)
-endif
-VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-ifeq ($(REV),)
-PKG_VERSION=$(EPOCH)$(VERSION)
-else
-PKG_VERSION=$(EPOCH)$(VERSION)+$(REV)
-endif
-
-
-
-CHFILE=$(CURDIR)/../../nvidia-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
-
-
-KERNEL_VERSION_CODE = $(shell cat $(KSRC)/include/linux/version.h | grep LINUX_VERSION_CODE | cut -d " " -f 3)
-DESIRED_VERSION=132608
-# 2 << 16 + 6 << 8 + 0
-VERSION_EXPR = $(shell test $(KERNEL_VERSION_CODE) -ge $(DESIRED_VERSION) ; echo $$? )
-
-ifeq ($(VERSION_EXPR),0)
- PATCHLEVEL=6
-else
- PATCHLEVEL=4
-endif
-
-# If 2.6.10-rc3-bk13 or greater, use minion.de kernel patches
-#DESIRED_VERSION=132618
-#VERSION_EXPR2 = $(shell test $(KERNEL_VERSION_CODE) -ge $(DESIRED_VERSION) ; echo $$? )
-
-#ifeq ($(VERSION_EXPR2),0)
-# NV_PATCH_MINION=1
-#else
-# NV_PATCH_MINION=0
-#endif
-
-NV_PATCH_MINION=0 # disable minion patching for 7167
-
-%.Makefile :
- # select which makefile to use.
- rm -f $(CURDIR)/$(dirname)/Makefile || true
- if [ $(PATCHLEVEL) = 6 ]; then \
- cd $(CURDIR)/$(dirname) ; \
- ln -s Makefile.kbuild Makefile ; \
- cd .. ; \
- if [ $(NV_PATCH_MINION) = 1 ] ; then \
- dpatch apply 04_minion ; \
- fi ; \
- if [ $(NV_PATCH_SYSFS) = 1 ]; then \
- dpatch apply 01_sysfs ; \
- dpatch status 01_sysfs >patch-stamp ; \
- dpatch apply 02_pcialias ; \
- dpatch status 02_pcialias >>patch-stamp ; \
- fi ; \
- fi
-
- if [ $(PATCHLEVEL) = 4 ]; then \
- cd $(CURDIR)/$(dirname) ; \
- ln -s Makefile.nvidia Makefile ; \
- cd .. ; \
- fi
-
-
-
-
-.PHONY: configure configure-stamp
-configure: configure-stamp
-configure-stamp: config.Makefile
-
-
-
- if ! $(CC) -v 2> /dev/null ; then \
- echo "Compiler $(CC) does not exist on the system" ; \
- exit 1; \
- fi
- touch configure-stamp
-
-
-.PHONY: build build-stamp
-build: configure-stamp build-stamp
-build-stamp:
- if [ -f $(CURDIR)/debian/control.template ]; then \
- cp $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \
- fi
-
- dh_testdir
- dh_testroot
-
- @echo "PATCHLEVEL = $(PATCHLEVEL) " ;
- @echo "Kernel compiler version : $(kernel_cc)" ;
- @echo "Detected compiler version : $(module_cc)" ;
-
-
- @if [ "$(kernel_cc)" != "$(module_cc)" ]; then \
- echo " "; \
- echo "You appear to be compiling the NVIDIA kernel module with "; \
- echo "a compiler different from the one that was used to compile "; \
- echo "the running kernel. This may be perfectly alright and you "; \
- echo "may be building this module for another kernel in which case"; \
- echo "you may ignore this message."; \
- echo " " ; \
- echo "The compiler that will be used to compile this module has been"; \
- echo "determined from:" ; \
- echo " 1) the CC environment variable " ; \
- echo " 2) that specified in "; \
- echo " $(KSRC)/include/linux/compile.h" ; \
- echo " 3) gcc " ; \
- fi
- @echo "Using compiler $(CC) version $(module_cc)";
-
-
-
- touch $(CURDIR)/$(dirname)/gcc-check
- touch $(CURDIR)/$(dirname)/cc-sanity-check
-
- ## Main Make ##
- IGNORE_CC_MISMATCH=1 CC="$(CC)" $(MAKE) -C $(CURDIR)/$(dirname) -f Makefile SYSSRC=$(KSRC) $(KPKG_EXTRAV_ARG) KBUILD_PARAMS=$(KBUILD_PARAMS) module;
-
- touch build-stamp
-
-
-.PHONY: install
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
-
+configure:
sed 's/#KVERS#/$(KVERS)/g' debian/control.template > $(CURDIR)/debian/control
sed 's/#KVERS#/$(KVERS)/g' debian/dirs.template > $(CURDIR)/debian/dirs
sed 's/#KVERS#/$(KVERS)/g' debian/override.template > $(CURDIR)/debian/override
+binary-modules: configure
+ dh_testroot
+
+ dh_prep
+
+ # Build the modules
+ $(MAKE) -C . LINUXDIR=$(KSRC) KVERREL=$(KVERS)
+
+ # Install the modules
dh_installdirs
+ install -m 0644 $(CURDIR)/debian/override $(CURDIR)/debian/nvidia-kernel$(LEGACY)-$(KVERS)/usr/share/lintian/overrides/nvidia-kernel$(LEGACY)-$(KVERS)
+ install -m 0644 $(CURDIR)/nvidia.ko $(CURDIR)/debian/nvidia-kernel$(LEGACY)-$(KVERS)/lib/modules/$(KVERS)/nvidia/nvidia.ko ; \
-
- install -m 0644 $(CURDIR)/debian/override $(CURDIR)/debian/nvidia-kernel-legacy-96xx-$(KVERS)/usr/share/lintian/overrides/nvidia-kernel-legacy-96xx-$(KVERS)
- if [ "$(PATCHLEVEL)" = "6" ] ; then \
- install -m 0644 $(CURDIR)/$(dirname)/nvidia.ko $(CURDIR)/debian/nvidia-kernel-legacy-96xx-$(KVERS)/lib/modules/$(KVERS)/nvidia/nvidia.ko ; \
- else \
- install -m 0644 $(CURDIR)/$(dirname)/nvidia.o $(CURDIR)/debian/nvidia-kernel-legacy-96xx-$(KVERS)/lib/modules/$(KVERS)/nvidia/nvidia.o ;\
- fi
-
-
-
-
-
-.PHONY: binary_modules
-binary_modules: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
dh_installdocs
-# dh_installexamples
-# dh_installmanpages
-# dh_undocumented
dh_installmodules
-
- dh_installinit
-
- dh_installchangelogs
- dh_link
+ dh_installchangelogs
+ dh_installmodules
dh_strip
dh_compress
dh_fixperms
-# You may want to make some executables suid here.
-# dh_suidregister
-# dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
- dh_gencontrol -- -v$(PKG_VERSION)
+ dh_gencontrol -- -v$(VERSION)
dh_md5sums
-ifeq "$(origin KPKG_DEST_DIR)" "undefined"
-ifeq "$(origin KMAINT)" "undefined"
- dh_builddeb --destdir=$(CURDIR)/..
-else
- dh_builddeb --destdir=$(KSRC)/..
-endif
-else
dh_builddeb --destdir=$(KPKG_DEST_DIR)
-endif
+ dh_prep
-
-.PHONY: clean
-clean: clean.Makefile unpatch
+clean: unpatch
if [ -f $(CURDIR)/debian/control.template ]; then \
cp $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \
fi
@@ -245,7 +65,6 @@
$(MAKE) clean SYSSRC=$(KSRC) -C $(CURDIR)/$(dirname) -f Makefile $(KPKG_EXTRAV_ARG)
- rm -f $(CURDIR)/$(dirname)/Makefile || true;
-rm $(CURDIR)/$(dirname)/gcc-check
-rm $(CURDIR)/$(dirname)/cc-sanity-check
@@ -260,44 +79,22 @@
if [ -e patch-stamp ]; then \
dpatch deapply-all ; \
rm -rf patch-stamp debian/patched ; \
- fi
+ fi
+
+
# The kdist_configure target is called by make-kpkg modules_config. It
# should configure the module so it is ready for compilation (mostly
# useful for calling configure)
-.PHONY: kdist_config
-kdist_config:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules configure
-
-.PHONY: kdist_configure
-kdist_configure:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules configure
-
-# the kdist_image target is called by make-kpkg modules_image. It is
-# responsible for compiling the module and creating the package. It
-# should also clean up after making the module. Please note we use a
-# seperate binary-modules target to make testing the package building
-# easier
-.PHONY: kdist_image
-kdist_image:
- echo "ROOT_CMD = $(ROOT_CMD)"
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
-
-
+kdist_config kdist_configure:
+ $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules configure
# the kdist_clean target is called by make-kpkg modules_clean. It is
# responsible for cleaning up any changes that have been made by the
# other kdist_commands (except for the .deb files created).
-.PHONY: kdist_clean
kdist_clean:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
+ $(MAKE) -C . LINUXDIR=$(KSRC) KVERREL=$(KVERS) clean
+ dh_clean
-kdist:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
- # Build a .changes file.
- dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
- debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
-
+.PHONY: clean binary-modules
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog?rev=599&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog Mon Oct 5 01:41:58 2009
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.11-1) unstable; urgency=low
+
+ * Include conftest.h for 2.6.31 from Lennart Sorensen
+
+ -- Randall Donald <rdonald at debian.org> Sun, 04 Oct 2009 18:38:26 -0700
+
nvidia-graphics-drivers-legacy-96xx (96.43.07-2) unstable; urgency=high
* Remove nested rood_cmd RC bug (closes: #435386)
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules?rev=599&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules Mon Oct 5 01:41:58 2009
@@ -22,20 +22,18 @@
url:=$(shell sh debian/upstream_info URL)
dirname:=$(shell sh debian/upstream_info DIRNAME)
filename:=$(shell sh debian/upstream_info FILENAME)
-
-AUTOGEN=debian/nvidia-kernel-legacy-96xx-source.README.Debian \
-debian/control \
-debian/copyright debian/nvidia-glx-legacy-96xx.links \
-debian/nvidia-glx-legacy-96xx-dev.links \
-debian/nvidia-glx-legacy-96xx.override \
-debian/nvidia-glx-legacy-96xx.docs \
-debian/nvidia-glx-legacy-96xx.examples \
-debian/nvidia-glx-legacy-96xx.postrm \
-debian/nvidia-glx-legacy-96xx.init \
-debian/nvidia-glx-legacy-96xx-ia32.override \
-debian/nvidia-glx-legacy-96xx-ia32.links \
-debian/nvidia-kernel-legacy-96xx-source.docs \
-debian/nvidia-glx-legacy-96xx-dev.preinst
+filename_x86:=$(shell sh debian/upstream_info FILENAME_X86)
+filename_x86_64:=$(shell sh debian/upstream_info FILENAME_X86_64)
+dirname_x86:=$(shell sh debian/upstream_info DIRNAME_X86)
+dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
+
+LEGACY=-legacy-96xx
+AUTOGEN=debian/nvidia-kernel$(LEGACY)-source.README.Debian debian/control \
+debian/copyright debian/nvidia-glx$(LEGACY).links debian/nvidia-glx$(LEGACY)-dev.links \
+debian/nvidia-glx$(LEGACY).override debian/nvidia-glx$(LEGACY).docs debian/nvidia-glx$(LEGACY).examples \
+debian/nvidia-glx$(LEGACY).postrm debian/nvidia-glx$(LEGACY).init \
+debian/nvidia-glx$(LEGACY)-ia32.override debian/nvidia-glx$(LEGACY)-ia32.links \
+debian/nvidia-kernel$(LEGACY)-source.docs debian/nvidia-glx$(LEGACY)-dev.preinst
@@ -59,19 +57,20 @@
.PHONY: configure-stamp
configure-stamp: version-clean $(AUTOGEN)
dh_testdir
-
- ./${filename} --extract-only
+ # extract both so we can fetch the kernel object code for both arches
+ ./${filename_x86} --extract-only
+ ./${filename_x86_64} --extract-only
if test -d $(CURDIR)/patches; \
then \
pwd; \
ls -al; \
cd $(dirname)/usr/src/nv; \
- for i in $(CURDIR)/patches/*; \
- do patch -p3 <$$i; \
- done; \
+# for i in $(CURDIR)/patches/*; \
+# do patch -p3 <$$i; \
+# done; \
fi
- sed 's/^nvidia-graphics-drivers-legacy-96xx/nvidia-kernel-legacy-96xx/g' debian/changelog > debian.binary/changelog
+ sed 's/^nvidia-graphics-drivers$(LEGACY)/nvidia-kernel$(LEGACY)/g' debian/changelog > debian.binary/changelog
touch configure-stamp
@@ -92,10 +91,11 @@
dh_testdir
# build kernel module source tarball
- mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian
- mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/nv
- cp -r $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian
+ mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian
+ # Prepare debian files for module package
+ cp -a $(CURDIR)/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian
+ cp -a $(CURDIR)/debian.binary/control.template $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian/control
for f in `ls $(CURDIR)/debian.binary` ; do \
perl -p \
-e 's{#BASE_VERSION#}{$(base_version)}g;' \
@@ -103,14 +103,32 @@
-e 's{#VERSION#}{$(version)}g;' \
-e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \
-e 's{#URL#}{$(url)}g' \
- < $(CURDIR)/debian.binary/$$f > $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/$$f ; \
- chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/$$f ; \
+ < $(CURDIR)/debian.binary/$$f > $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian/$$f ; \
+ chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian/$$f ; \
done
- chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/patches
- cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/nv || true
- chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel-legacy-96xx/debian/rules
+
+# chmod 775 $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian/patches
+ cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/
+
+ # We don't want these makefiles that don't work with kbuild
+ rm $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/makefile
+
+ # We want both 32 and 64 bit versions of nv-kernel.o
+ cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.x86_64
+ mv $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.i386
+
+ # and then make Makefile.kbuild actually use our names
+ sed -i -e 's/nv-kernel.o$$/nv-kernel.o$$(NVARCH)/' $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/Makefile.kbuild
+
+ # We have new conftest files that work purely with kbuild and doesn't require root
+ cp $(CURDIR)/Makefile $(CURDIR)/conftest.* $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/
+ cp $(CURDIR)/patches.h $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/
+
+ # Fix permissions
+ chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/debian/rules
chown -R root:src $(CURDIR)/debian/temp/modules
- tar -zcvf $(CURDIR)/nvidia-kernel-legacy-96xx-source.tar.gz -C $(CURDIR)/debian/temp modules
+
+ tar -jcvf $(CURDIR)/nvidia-kernel$(LEGACY).tar.bz2 -C $(CURDIR)/debian/temp modules
rm -rf debian/temp
touch build-kernel-stamp
@@ -121,8 +139,7 @@
rm -f build-stamp build-kernel-stamp configure-stamp
dh_clean
- rm -fr $(dirname) nvidia-kernel-legacy-96xx-source.tar.gz
-
+ rm -fr $(dirname_x86) $(dirname_x86_64) nvidia-kernel$(LEGACY).tar.bz2
.PHONY: install
@@ -132,78 +149,103 @@
dh_clean -k
dh_installdirs
- install -m 644 $(CURDIR)/nvidia-kernel-legacy-96xx-source.tar.gz $(CURDIR)/debian/nvidia-kernel-legacy-96xx-source/usr/src
-
+ install -m 644 $(CURDIR)/nvidia-kernel$(LEGACY).tar.bz2 $(CURDIR)/debian/nvidia-kernel$(LEGACY)-source/usr/src
install -m 0644 $(dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.so \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/xorg/modules/drivers
-
-
-
- install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.a $(CURDIR)/debian/nvidia-glx-legacy-96xx-dev/usr/lib/libXvMCNVIDIA.a;
- install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${version} $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/libXvMCNVIDIA.so.${version};
-
-
-
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/xorg/modules/drivers
+
+ install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.a $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/lib/libXvMCNVIDIA.a;
+ install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/libXvMCNVIDIA.so.${version};
install -m 0644 $(dirname)/usr/include/GL/gl.h \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-dev/usr/include/GL
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/GL
install -m 0644 $(dirname)/usr/include/GL/glext.h \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-dev/usr/include/GL
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/GL
+
+ -install -m 0644 $(dirname)/usr/include/cuda/cuda.h \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/cuda
+ -install -m 0644 $(dirname)/usr/include/cuda/cudaGL.h \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/cuda
+
+ -install -m 0644 $(dirname)/usr/include/vdpau/vdpau.h \
+ $(CURDIR)/debian/nvidia-glx-dev/usr/include/vdpau
+ -install -m 0644 $(dirname)/usr/include/vdpau/vdpau_x11.h \
+ $(CURDIR)/debian/nvidia-glx-dev/usr/include/vdpau
install -m 0644 $(dirname)/usr/include/GL/glx.h \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-dev/usr/include/GL
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/GL
install -m 0644 $(dirname)/usr/include/GL/glxext.h \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-dev/usr/include/GL
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/GL
install -m 0644 $(dirname)/usr/lib/libGL.so.${version} \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
install -m 0644 $(dirname)/usr/lib/libGLcore.so.${version} \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib
- sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers-legacy-96xx/" $(dirname)/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" > $(CURDIR)/debian/nvidia-glx-legacy-96xx-dev/usr/lib/libGL.la
- # install -m 0644 $(dirname)/usr/lib/libGL.la $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/libGL.la
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
+ -install -m 0644 $(dirname)/usr/lib/libcuda.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
+ -install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
+ -install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
+ -install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
+
+ sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers$(LEGACY)/" $(dirname)/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" > $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/lib/libGL.la
+ # install -m 0644 $(dirname)/usr/lib/libGL.la $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/libGL.la
# TLS (nvidia-tls new for 6106)
- install $(dirname)/usr/lib/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/
-
- install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/nvidia
-
- #sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers/" $(dirname)/usr/lib/tls/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib\/tls/" > $(CURDIR)/debian/nvidia-glx-dev/usr/lib/nvidia/libGL.la
- # install -m 0644 $(dirname)/usr/lib/tls/libGL.la $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia/libGL.la
+ #install $(dirname)/usr/lib/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/
+ install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/
+
+ #install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia
+ install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/tls/
+
+
+ #sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers$(LEGACY)/" $(dirname)/usr/lib/tls/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib\/tls/" > $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/lib/nvidia/libGL.la
+ # install -m 0644 $(dirname)/usr/lib/tls/libGL.la $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia/libGL.la
- install -m 0644 $(dirname)/usr/lib/libnvidia-cfg.so.${version} $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/nvidia/
-
-
- install $(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version} $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/xorg/modules/extensions/
-
- install $(dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/nvidia
- install $(dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib/nvidia
-
- install -d $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/share/lintian/overrides
- install -m 0644 debian/nvidia-glx-legacy-96xx.override \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/share/lintian/overrides/nvidia-glx-legacy-96xx
-
- if [ "$(DEB_BUILD_ARCH)" == "amd64" ] ; then \
+ install -m 0644 $(dirname)/usr/lib/libnvidia-cfg.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia/
+
+
+ install $(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/xorg/modules/extensions/
+# install $(dirname)/usr/X11R6/lib/modules/libnvidia-wfb.so.${version} $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/xorg/modules/
+
+ install $(dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia
+ install $(dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia
+
+ install -d $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/share/lintian/overrides
+ install -m 0644 debian/nvidia-glx$(LEGACY).override \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/share/lintian/overrides/nvidia-glx$(LEGACY)
+
+ if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
install $(dirname)/usr/lib32/libGLcore.so.${version} \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libGL.so.${version} \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ -install $(dirname)/usr/lib32/libcuda.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ -install $(dirname)/usr/lib32/libvdpau.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ -install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
+ -install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
- $(CURDIR)/debian/nvidia-glx-legacy-96xx-ia32/emul/ia32-linux/usr/lib/tls ; \
+ $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib/tls ; \
fi
- install -m 755 $(dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/bin/
+ install -m 755 $(dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/bin/
# use separate package
- #install -m 755 $(dirname)/usr/bin/nvidia-xconfig $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/bin/
+ #install -m 755 $(dirname)/usr/bin/nvidia-xconfig $(CURDIR)/debian/nvidia-glx/usr/bin/
# use separate source package instead
#install -m 755 $(dirname)/usr/bin/nvidia-settings $(CURDIR)/debian/nvidia-settings/usr/bin/
#install -m 644 $(dirname)/usr/share/doc/nvidia-settings-user-guide.txt $(CURDIR)/debian/nvidia-settings/usr/share/doc/nvidia-settings
- install $(CURDIR)/script $(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/share/bug/nvidia-glx-legacy-96xx
+ install $(CURDIR)/script $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/share/bug/nvidia-glx$(LEGACY)
dh_install
@@ -236,9 +278,9 @@
# dh_python
dh_makeshlibs
dh_installdeb
- dh_shlibdeps -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx-legacy-96xx/usr/lib
+ dh_shlibdeps -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
# quickhack! remove me :-/
- perl -pi.bak -e 's/,\s+nvidia-glx-legacy-96xx-ia32//;' $(CURDIR)/debian/nvidia-glx-legacy-96xx.substvars
+ perl -pi.bak -e 's/,\s+nvidia-glx$(LEGACY)-ia32//;' $(CURDIR)/debian/nvidia-glx$(LEGACY).substvars
dh_gencontrol -s
dh_md5sums
dh_builddeb -s
@@ -265,9 +307,6 @@
.PHONY: binary
binary: binary-arch
-.PHONY: binary-indep
-binary-indep:
-
.PHONY: version-clean
version-clean:
rm -f ${AUTOGEN} || true
Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info?rev=599&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/upstream_info Mon Oct 5 01:41:58 2009
@@ -1,8 +1,8 @@
eval `dpkg-architecture`
#BASE_VERSION=1.0
-RELEASE=96.43.07
-NEXTVER=96.43.08
+RELEASE=96.43.11
+NEXTVER=96.43.12
if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then
BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE}
@@ -17,7 +17,10 @@
echo "huh? dont know about a version of this driver for your architecture."
exit 1
fi
-
+FILENAME_X86=NVIDIA-Linux-x86-${RELEASE}-pkg0.run
+FILENAME_X86_64=NVIDIA-Linux-x86_64-${RELEASE}-pkg2.run
+DIRNAME_X86=NVIDIA-Linux-x86-${RELEASE}-pkg0
+DIRNAME_X86_64=NVIDIA-Linux-x86_64-${RELEASE}-pkg2
VERSION=${RELEASE}
UPSTREAMVERSION=${RELEASE}
@@ -42,6 +45,18 @@
FILENAME)
echo "$FILENAME"
;;
+ FILENAME_X86_64)
+ echo "$FILENAME_X86_64"
+ ;;
+ FILENAME_X86)
+ echo "$FILENAME_X86"
+ ;;
+ DIRNAME_X86_64)
+ echo "$DIRNAME_X86_64"
+ ;;
+ DIRNAME_X86)
+ echo "$DIRNAME_X86"
+ ;;
DIRNAME)
echo "$DIRNAME"
;;
More information about the Pkg-nvidia-devel
mailing list