Below you can find 3 patches for your consideration (for new
and legacy nvidia drivers) fixing these problems:
- drop the undefined ARCH variable, and use DEB_HOST_ARCH
instead
- make sure that *.deb file and *.changes file are written
into the same subdirectory (using KPKG_DEST_DIR)
- for legacy-96xx it fixes the changes file name (use
nvidia-graphics-drivers-legacy-96xx_96.43.07-1.1_amd64.changes
instead of
nvidia-graphics-drivers_96.43.07-1.1_amd64.changes
)
The legacy-71xx version isn't tested very well, since it doesn't
build with 2.6.26.2. But it looks the same as for 96xx.
Hope this helps. Regards
Harri
diff -ur nvidia-graphics-drivers-173.14.09.old/debian/changelog nvidia-graphics-drivers-173.14.09/debian/changelog
--- nvidia-graphics-drivers-173.14.09.old/debian/changelog 2008-08-09 13:18:19.000000000 +0200
+++ nvidia-graphics-drivers-173.14.09/debian/changelog 2008-08-09 13:23:17.000000000 +0200
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers (173.14.09-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * write *.deb and *.changes file into the same subdirectory
+ * ARCH is undefined, define and use DEB_HOST_ARCH instead
+
+ -- Harald Dunkel <[EMAIL PROTECTED]> Sat, 09 Aug 2008 13:22:30 +0200
+
nvidia-graphics-drivers (173.14.09-3) unstable; urgency=high
* Only ship TLS libs. RC bug fix (closes: #441975)
diff -ur nvidia-graphics-drivers-173.14.09.old/debian.binary/conf.mk nvidia-graphics-drivers-173.14.09/debian.binary/conf.mk
--- nvidia-graphics-drivers-173.14.09.old/debian.binary/conf.mk 2008-08-09 13:18:19.000000000 +0200
+++ nvidia-graphics-drivers-173.14.09/debian.binary/conf.mk 2008-08-09 13:02:21.000000000 +0200
@@ -48,8 +48,16 @@
endif
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-CHFILE=$(CURDIR)/../../nvidia-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
+ifeq "$(origin KPKG_DEST_DIR)" "undefined"
+ifeq "$(origin KMAINT)" "undefined"
+KPKG_DEST_DIR = $(CURDIR)/..
+else
+KPKG_DEST_DIR = $(KSRC)/..
+endif
+endif
+CHFILE=$(KPKG_DEST_DIR)/nvidia-kernel-$(KVERS)_$(PKG_VERSION)_$(DEB_HOST_ARCH).changes
KERNEL_VERSION_CODE = $(shell cat $(KSRC)/include/linux/version.h | grep LINUX_VERSION_CODE | cut -d " " -f 3)
diff -ur nvidia-graphics-drivers-173.14.09.old/debian.binary/rules nvidia-graphics-drivers-173.14.09/debian.binary/rules
--- nvidia-graphics-drivers-173.14.09.old/debian.binary/rules 2008-08-09 13:18:19.000000000 +0200
+++ nvidia-graphics-drivers-173.14.09/debian.binary/rules 2008-08-09 13:14:08.000000000 +0200
@@ -106,15 +106,7 @@
# dh_shlibdeps
dh_gencontrol -- -v$(PKG_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
.PHONY: clean
@@ -183,7 +175,7 @@
kdist:
$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
# Build a .changes file.
- dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
+ dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(KPKG_DEST_DIR)" > $(CHFILE)
debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)
$(MAKE) $(MFLAGS) -f debian/rules clean
diff -ur nvidia-graphics-drivers-legacy-71xx-71.86.04.old/debian/changelog nvidia-graphics-drivers-legacy-71xx-71.86.04/debian/changelog
--- nvidia-graphics-drivers-legacy-71xx-71.86.04.old/debian/changelog 2008-08-09 14:41:57.000000000 +0200
+++ nvidia-graphics-drivers-legacy-71xx-71.86.04/debian/changelog 2008-08-09 14:46:51.000000000 +0200
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers-legacy-71xx (71.86.04-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * write *.deb and *.changes file into the same subdirectory
+ * ARCH is undefined, define and use DEB_HOST_ARCH instead
+
+ -- Harald Dunkel <[EMAIL PROTECTED]> Sat, 09 Aug 2008 14:46:20 +0200
+
nvidia-graphics-drivers-legacy-71xx (71.86.04-2) unstable; urgency=low
* remove nvidia-glx from depends (closes: #474060)
diff -ur nvidia-graphics-drivers-legacy-71xx-71.86.04.old/debian.binary/rules nvidia-graphics-drivers-legacy-71xx-71.86.04/debian.binary/rules
--- nvidia-graphics-drivers-legacy-71xx-71.86.04.old/debian.binary/rules 2008-08-09 14:41:57.000000000 +0200
+++ nvidia-graphics-drivers-legacy-71xx-71.86.04/debian.binary/rules 2008-08-09 14:46:12.000000000 +0200
@@ -63,8 +63,16 @@
endif
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-CHFILE=$(CURDIR)/../../nvidia-kernel-legacy-71xx-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
+ifeq "$(origin KPKG_DEST_DIR)" "undefined"
+ifeq "$(origin KMAINT)" "undefined"
+KPKG_DEST_DIR = $(CURDIR)/..
+else
+KPKG_DEST_DIR = $(KSRC)/..
+endif
+endif
+CHFILE=$(KPKG_DEST_DIR)/nvidia-kernel-legacy-71xx-$(KVERS)_$(PKG_VERSION)_$(DEB_HOST_ARCH).changes
KERNEL_VERSION_CODE = $(shell cat $(KSRC)/include/linux/version.h | grep LINUX_VERSION_CODE | cut -d " " -f 3)
@@ -218,15 +226,7 @@
# dh_shlibdeps
dh_gencontrol -- -v$(PKG_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
.PHONY: clean
@@ -293,7 +293,7 @@
kdist:
$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
# Build a .changes file.
- dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
+ dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(KPKG_DEST_DIR)" > $(CHFILE)
debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)
$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
diff -ur nvidia-graphics-drivers-legacy-96xx-96.43.07.old/debian/changelog nvidia-graphics-drivers-legacy-96xx-96.43.07/debian/changelog
--- nvidia-graphics-drivers-legacy-96xx-96.43.07.old/debian/changelog 2008-08-09 13:44:14.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.07/debian/changelog 2008-08-09 13:54:47.000000000 +0200
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.07-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * write *.deb and *.changes file into the same subdirectory
+ * ARCH is undefined, define and use DEB_HOST_ARCH instead
+
+ -- Harald Dunkel <[EMAIL PROTECTED]> Sat, 09 Aug 2008 13:53:13 +0200
+
nvidia-graphics-drivers-legacy-96xx (96.43.07-1) unstable; urgency=medium
* New upstream. 2.6.26 compatible. (closes: #492309)
diff -ur nvidia-graphics-drivers-legacy-96xx-96.43.07.old/debian.binary/rules nvidia-graphics-drivers-legacy-96xx-96.43.07/debian.binary/rules
--- nvidia-graphics-drivers-legacy-96xx-96.43.07.old/debian.binary/rules 2008-08-09 13:44:14.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.07/debian.binary/rules 2008-08-09 13:52:59.000000000 +0200
@@ -63,8 +63,16 @@
endif
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-CHFILE=$(CURDIR)/../../nvidia-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
+ifeq "$(origin KPKG_DEST_DIR)" "undefined"
+ifeq "$(origin KMAINT)" "undefined"
+KPKG_DEST_DIR = $(CURDIR)/..
+else
+KPKG_DEST_DIR = $(KSRC)/..
+endif
+endif
+CHFILE=$(KPKG_DEST_DIR)/nvidia-kernel-legacy-96xx-$(KVERS)_$(PKG_VERSION)_$(DEB_HOST_ARCH).changes
KERNEL_VERSION_CODE = $(shell cat $(KSRC)/include/linux/version.h | grep LINUX_VERSION_CODE | cut -d " " -f 3)
@@ -222,15 +230,7 @@
# dh_shlibdeps
dh_gencontrol -- -v$(PKG_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
.PHONY: clean
@@ -297,7 +297,7 @@
kdist:
$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
# Build a .changes file.
- dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(CURDIR)/../.." > $(CHFILE)
+ dpkg-genchanges -b -e"$(KMAINT) <$(KEMAIL)>" -u"$(KPKG_DEST_DIR)" > $(CHFILE)
debsign -e"$(KMAINT) <$(KEMAIL)>" $(CHFILE)
$(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
