[pkg-nvidia-devel] r784 - in /packages/nvidia-graphics-modules-i386/trunk/debian: changelog rules
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Fri Apr 9 06:30:59 UTC 2010
Author: rra
Date: Fri Apr 9 06:30:52 2010
New Revision: 784
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=784
Log:
General debian/rules cleanup
* General debian/rules cleanup.
- Use dpkg-parsechangelog instead of head -1 | sed.
- Merge unpack and build rules.
- Remove commented-out code, unused variables, and unnecessary
commands.
- Wrap and reformat for readability.
Modified:
packages/nvidia-graphics-modules-i386/trunk/debian/changelog
packages/nvidia-graphics-modules-i386/trunk/debian/rules
Modified: packages/nvidia-graphics-modules-i386/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules-i386/trunk/debian/changelog?rev=784&op=diff
==============================================================================
--- packages/nvidia-graphics-modules-i386/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-modules-i386/trunk/debian/changelog Fri Apr 9 06:30:52 2010
@@ -3,6 +3,12 @@
[ Russ Allbery ]
* Build for 2.6.32-4. (Closes: #536763, #551571)
* Use nvidia-kernel-source 190.53.
+ * General debian/rules cleanup.
+ - Use dpkg-parsechangelog instead of head -1 | sed.
+ - Merge unpack and build rules.
+ - Remove commented-out code, unused variables, and unnecessary
+ commands.
+ - Wrap and reformat for readability.
* Remove obsolete Emacs variables from debian/changelog.
[ Andreas Beckmann ]
Modified: packages/nvidia-graphics-modules-i386/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-modules-i386/trunk/debian/rules?rev=784&op=diff
==============================================================================
--- packages/nvidia-graphics-modules-i386/trunk/debian/rules (original)
+++ packages/nvidia-graphics-modules-i386/trunk/debian/rules Fri Apr 9 06:30:52 2010
@@ -1,84 +1,71 @@
#!/usr/bin/make -f
#
-# debian/rules for nvidia-graphics-modules-*-i386
+# This package is responsible for generating the pre-built kernel modules
+# for the current kernel version. Most of the work is done by the existing
+# build machinery in nvidia-kernel-source. This package depends on
+# nvidia-kernel-source and the relevant kernel headers, unpacks the former
+# package, and then builds it for each kernel flavor in turn. The resulting
+# *.deb files are then added to the *.changes file as packages built by this
+# source file.
#
+# This package should be a minimal shim around nvidia-kernel-source. Most
+# problems apparently found in this package are probably actually problems
+# that should be fixed there.
+#
+# Based on the debian/rules template by Joey Hess
# GNU copyright 1997 to 1999 by Joey Hess.
# Copyright (c) 1999-2001 Herbert Xu <herbert at debian.org>
# Fixes by Steve Kowalik for the New Alsa-Source.
# Customized by Randall Donald for nvidia-kernel-source
+# Further revisions by the Debian NVIDIA Maintainers. See debian/changelog.
+# amd64 MUST be last in the flavours list.
+kernel := 2.6.32-4
+flavours := 686 686-bigmem amd64
+revision := $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f2)
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-SHELL := sh -e
-
-revision := $(shell \
- head -1 debian/changelog | \
- sed 's/^.*(\(.*\)).*$$/\1/' \
-)
-
-version := 2.6.32-4
-# amd64 must be last
-flavours := 686 686-bigmem amd64
-
-
-
-#krevision := $(shell \
-# zcat /usr/share/doc/kernel-build-$(version)/changelog.Debian.gz | \
-# head -1 | sed 's/^.*(\(.*\)).*$$/\1/' \
-# )
-
-
-unpack: unpack-stamp
-unpack-stamp:
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep:
+build-stamp:
tar jxf /usr/src/nvidia-kernel.tar.bz2
cp debian/changelog modules/nvidia-kernel/debian
- touch unpack-stamp
-
-build: unpack-stamp
+ touch $@
clean:
-
- $(RM) unpack-stamp install-stamp
- $(RM) -r kernel-source-$(version) build-* modules
- $(RM) *.deb
+ rm -rf modules
+ rm -f *.deb
dh_clean
-# Build architecture-independent files here.
binary-indep:
- dh_installdirs
- dh_installchangelogs
- dh_installdocs
- dh_install
+ dh_installdirs
+ dh_installchangelogs
+ dh_installdocs
+ dh_install
dh_compress
- dh_fixperms
- dh_gencontrol
+ dh_fixperms
+ dh_gencontrol
dh_md5sums
- dh_builddeb
+ dh_builddeb
-
-
-# Build architecture-dependent files here.
binary-arch: build
- cd modules/nvidia-kernel; \
- cp ../../control.template debian ; \
- sed -e 's/^Source.*$$/Source: nvidia-graphics-modules-i386/' debian/control.template > debian/control.template.new; \
- mv debian/control.template.new debian/control.template ; \
- for i in $(flavours); do \
+ cp control.template modules/nvidia-kernel/debian/
+ set -e; cd modules/nvidia-kernel; \
+ for i in $(flavours); do \
if [ "$$i" = "amd64" ]; then \
- cp nv-kernel.o.x86_64 nv-kernel.o ; \
+ cp nv-kernel.o.x86_64 nv-kernel.o ; \
fi ;\
- DO_NOT_PATCH_NV=$(DO_NOT_PATCH_NV) KERNEL_DEPENDS=y MODVERS=$(revision) KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i KPKG_DEST_DIR=.. debian/rules binary_modules ; \
- KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i HAVECONFIG=y debian/rules clean; \
- done
- mv modules/*.deb .
+ KERNEL_DEPENDS=y MODVERS=$(revision) \
+ KSRC=/usr/src/linux-headers-$(kernel)-$$i \
+ KVERS=$(kernel)-$$i KPKG_DEST_DIR=../.. \
+ debian/rules binary_modules ; \
+ KSRC=/usr/src/linux-headers-$(kernel)-$$i \
+ KVERS=$(kernel)-$$i HAVECONFIG=y debian/rules clean; \
+ done
for p in *.deb; do \
- dpkg-distaddfile $$p "non-free/kernel" optional; \
+ dpkg-distaddfile $$p "non-free/kernel" optional; \
done
mv *.deb ..
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary unpack
-
+.PHONY: build build-arch build-indep clean binary binary-arch binary-indep
More information about the Pkg-nvidia-devel
mailing list