[pkg-nvidia-devel] r357 - in /packages/nvidia-graphics-drivers/trunk/debian.binary: changelog conf.mk rules
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Wed Feb 6 07:17:23 UTC 2008
Author: rdonald
Date: Wed Feb 6 07:17:22 2008
New Revision: 357
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=357
Log:
add conf.mk
Added:
packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
Modified:
packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
packages/nvidia-graphics-drivers/trunk/debian.binary/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/changelog?rev=357&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/changelog Wed Feb 6 07:17:22 2008
@@ -1,3 +1,9 @@
+nvidia-kernel (169.09-1) unstable; urgency=low
+
+ * New upstream. (with fan fix!)
+
+ -- Randall Donald <rdonald at debian.org> Sat, 02 Feb 2008 15:21:28 -0800
+
nvidia-kernel (169.07-2) unstable; urgency=low
* Fix permissions on patches.old (closes: #459848, #460173)
Added: packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk?rev=357&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk (added)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/conf.mk Wed Feb 6 07:17:22 2008
@@ -1,0 +1,116 @@
+#!/usr/bin/make -f
+
+dirname=nv
+
+
+# if you need to redefine these
+KSRC:=$(KSRC)
+KVERS:=${KVERS}
+
+
+# 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/")
+
+kernel_arch:=$(shell uname -m)
+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
+
+%.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 .. ; \
+ 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
+ if [ -f $(CURDIR)/debian/control.template ]; then \
+ cp $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \
+ fi
+ if [ "$(kernel_arch)" = "x86_64" ]; then \
+ cp $(CURDIR)/nv-kernel.o.x86_64 $(CURDIR)/nv/nv-kernel.o ; \
+ fi
+ touch configure-stamp
+
+
+
Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=357&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Wed Feb 6 07:17:22 2008
@@ -12,142 +12,18 @@
ROOT_CMD=
endif
+include $(CURDIR)/debian/conf.mk
-
-dirname=nv
-
-
-# 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/")
-
-kernel_arch:=$(shell uname -m)
-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
- if [ "$(kernel_arch)" = "x86_64" ]; then \
- cp $(CURDIR)/nv-kernel.o.x86_64 $(CURDIR)/nv/nv-kernel.o ; \
- fi
+
@echo "PATCHLEVEL = $(PATCHLEVEL) " ;
@echo "Kernel compiler version : $(kernel_cc)" ;
@echo "Detected compiler version : $(module_cc)" ;
More information about the Pkg-nvidia-devel
mailing list