--- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdsl/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdsl/src/Makefile @@ -34,7 +34,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: ; $(RM) $(OBJECTS) $(RM) $(CARD).o $(CARD).ko --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdsl/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdsl/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslsl/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslsl/src/Makefile @@ -34,7 +34,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslsl/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslsl/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslslusb/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslslusb/src/Makefile @@ -35,7 +35,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslslusb/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslslusb/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslslusb/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslslusb/src/main.c @@ -92,7 +92,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusb/1/fritz/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusb/1/fritz/src/Makefile @@ -33,7 +33,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusb/1/fritz/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusb/1/fritz/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ extern int tools_init (void); --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusb/1/fritz/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusb/1/fritz/src/main.c @@ -77,7 +77,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusb/2/fritz/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusb/2/fritz/src/Makefile @@ -35,7 +35,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusb/2/fritz/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusb/2/fritz/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusb/2/fritz/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusb/2/fritz/src/main.c @@ -92,7 +92,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusba/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusba/src/Makefile @@ -35,7 +35,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusba/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusba/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdslusba/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdslusba/src/main.c @@ -92,7 +92,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdsl2/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdsl2/src/Makefile @@ -34,7 +34,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcdsl2/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcdsl2/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcpci/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcpci/src/Makefile @@ -41,7 +41,7 @@ $(CARD).ko: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules $(CARD)_cs.ko: $(CARD)_cs.c $(CARD).ko --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcpci/src/fcpcmcia_cs.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcpci/src/fcpcmcia_cs.c @@ -546,7 +546,7 @@ } /* cs_event */ static struct pcmcia_driver cs_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .drv = { .name = "fcpcmcia_cs", }, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcpci/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcpci/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcusb/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcusb/src/Makefile @@ -33,7 +33,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcusb/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcusb/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fcusb/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fcusb/src/main.c @@ -82,7 +82,7 @@ struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fxusb/src/Makefile +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fxusb/src/Makefile @@ -33,7 +33,7 @@ $(CARD).o: $(LIBDIR) $(SOURCES) $(HEADERS) @cp -f ../lib/$(CARD)-lib.o $(LIBDIR) - $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) modules + $(MAKE) -C $(KDIR) SUBDIRS=$$PWD modules clean: $(RM) $(OBJECTS) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fxusb/src/tools.h +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fxusb/src/tools.h @@ -71,13 +71,14 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ +#ifndef atomic_xchg static inline unsigned long atomic_xchg ( volatile atomic_t * v, unsigned value ) { return __xchg (value, &v->counter, sizeof (unsigned)); } /* atomic_xchg */ - +#endif /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ #ifndef NDEBUG --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz/fxusb/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz/fxusb/src/main.c @@ -82,7 +82,7 @@ struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/copyright +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/copyright @@ -0,0 +1,195 @@ +This package was debianized by Randall Donald on +Sat, 11 Aug 2001 14:27:28 -0700. + +It was downloaded from +#URL# + +Upstream Author: NVIDIA + +Copyright: + +Packaging Scripts Copyright (c) 2003 Randall Donald +Based on packages by Christopher Cheney +These scripts are covered under the GNU GPL, the text of the license +is available here /usr/share/common-licenses/GPL . + + +First a note from the README file + +Q: Why does NVIDIA not provide rpms anymore? + +A: Not every Linux distribution uses rpm, and NVIDIA wanted a single + solution that would work across all Linux distributions. As indicated + in the NVIDIA Software License, Linux distributions are welcome to + repackage and redistribute the NVIDIA Linux driver in whatever package + format they wish. + + +Furthermore an email from NVIDIA: + +Greetings, Randall! Comments below: + +On 30 Jul 2003, Randall Donald wrote: + +> To whom it may concern, +> +> My name is Randall Donald and I am the maintainer for the Debian +> downloader packages nvidia-glx-src and nvidia-kernel-src. +> As stated in your license and the README file +> ( "As indicated in the NVIDIA Software License, Linux distributions +> are welcome to repackage and redistribute the NVIDIA Linux driver in +> whatever package format they wish." ) +> I wish to include packages containing the Linux driver files in the Debian archive. +> I'd like to know if it is legally permitted to distribute binary kernel modules +> compiled from the NVIDIA kernel module source and Debian kernel headers. + +This is fine; thanks for asking. + +> I am also wondering if the "No Separation of Components" clause +> ( No Separation of Components. The SOFTWARE is licensed as a +> single product. Its component parts may not be separated for use +> on more than one computer, nor otherwise used separately from the +> other parts.) applies to splitting the glx driver and kernel module source into +> multiple binary packages. + +This is also fine. I believe this section of the license was +intended to prevent users from doing things like using our Windows +control panel with a competitor's display driver (that's not actually +possible, but you get the idea...). In the case of separating the +driver into a glx package and a kernel package (like we used to +do ourselves), this is simply a packaging issue; of course users +will use the packages together when they install. + +Please feel free to redistribute the NVIDIA graphics driver. + +Thank you for doing this for the NVIDIA+Debian community! + +- Andy + + +--- + +License: +http://www.nvidia.com/view.asp?IO=nv_swlicense + + License For Customer Use of NVIDIA Software + + +IMPORTANT NOTICE -- READ CAREFULLY: This License For Customer Use of +NVIDIA Software ("LICENSE") is the agreement which governs use of +the software of NVIDIA Corporation and its subsidiaries ("NVIDIA") +downloadable herefrom, including computer software and associated +printed materials ("SOFTWARE"). By downloading, installing, copying, +or otherwise using the SOFTWARE, you agree to be bound by the terms +of this LICENSE. If you do not agree to the terms of this LICENSE, +do not download the SOFTWARE. + +RECITALS + +Use of NVIDIA's products requires three elements: the SOFTWARE, the +hardware on a graphics controller board, and a personal computer. The +SOFTWARE is protected by copyright laws and international copyright +treaties, as well as other intellectual property laws and treaties. +The SOFTWARE is not sold, and instead is only licensed for use, +strictly in accordance with this document. The hardware is protected +by various patents, and is sold, but this agreement does not cover +that sale, since it may not necessarily be sold as a package with +the SOFTWARE. This agreement sets forth the terms and conditions +of the SOFTWARE LICENSE only. + +1. DEFINITIONS + +1.1 Customer. Customer means the entity or individual that +downloads the SOFTWARE. + +2. GRANT OF LICENSE + +2.1 Rights and Limitations of Grant. NVIDIA hereby grants Customer +the following non-exclusive, non-transferable right to use the +SOFTWARE, with the following limitations: + +2.1.1 Rights. Customer may install and use one copy of the SOFTWARE +on a single computer, and except for making one back-up copy of +the Software, may not otherwise copy the SOFTWARE. This LICENSE +of SOFTWARE may not be shared or used concurrently on different +computers. + +2.1.2 Linux Exception. Notwithstanding the foregoing terms of +Section 2.1.1, SOFTWARE designed exclusively for use on the Linux +operating system may be copied and redistributed, provided that +the binary files thereof are not modified in any way (except for +unzipping of compressed files). + +2.1.3 Limitations. + +No Reverse Engineering. Customer may not reverse engineer, +decompile, or disassemble the SOFTWARE, nor attempt in any other +manner to obtain the source code. + +No Separation of Components. The SOFTWARE is licensed as a +single product. Its component parts may not be separated for use +on more than one computer, nor otherwise used separately from the +other parts. + +No Rental. Customer may not rent or lease the SOFTWARE to someone +else. + +3. TERMINATION + +This LICENSE will automatically terminate if Customer fails to +comply with any of the terms and conditions hereof. In such event, +Customer must destroy all copies of the SOFTWARE and all of its +component parts. + +4. COPYRIGHT + +All title and copyrights in and to the SOFTWARE (including but +not limited to all images, photographs, animations, video, audio, +music, text, and other information incorporated into the SOFTWARE), +the accompanying printed materials, and any copies of the SOFTWARE, +are owned by NVIDIA, or its suppliers. The SOFTWARE is protected +by copyright laws and international treaty provisions. Accordingly, +Customer is required to treat the SOFTWARE like any other copyrighted +material, except as otherwise allowed pursuant to this LICENSE +and that it may make one copy of the SOFTWARE solely for backup or +archive purposes. + +5. APPLICABLE LAW + +This agreement shall be deemed to have been made in, and shall be +construed pursuant to, the laws of the State of California. + +6. DISCLAIMER OF WARRANTIES AND LIMITATION ON LIABILITY + +6.1 No Warranties. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE +LAW, THE SOFTWARE IS PROVIDED "AS IS" AND NVIDIA AND ITS SUPPLIERS +DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT +NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + +6.2 No Liability for Consequential Damages. TO THE MAXIMUM +EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NVIDIA OR +ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR +CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, +DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS +OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT +OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. MISCELLANEOUS + +The United Nations Convention on Contracts for the International +Sale of Goods is specifically disclaimed. If any provision of this +LICENSE is inconsistent with, or cannot be fully enforced under, +the law, such provision will be construed as limited to the extent +necessary to be consistent with and fully enforceable under the law. +This agreement is the final, complete and exclusive agreement between +the parties relating to the subject matter hereof, and supersedes +all prior or contemporaneous understandings and agreements relating +to such subject matter, whether oral or written. Customer agrees +that it will not ship, transfer or export the SOFTWARE into any +country, or use the SOFTWARE in any manner, prohibited by the +United States Bureau of Export Administration or any export laws, +restrictions or regulations. This LICENSE may only be modified in +writing signed by an authorized officer of NVIDIA. + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/control.template +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/control.template @@ -0,0 +1,23 @@ +Source: nvidia-kernel +Section: restricted +Priority: optional +Maintainer: Randall Donald +Build-Depends: debhelper (>> 3.0.0), make, libc6-dev +Standards-Version: 3.6.0 + +Package: nvidia-kernel-#KVERS# +Architecture: i386 amd64 ia64 +Provides: nvidia-kernel-#VERSION# +Depends: nvidia-kernel-common (>= #VERSION#) +Recommends: linux-image-#KVERS# +Description: NVIDIA binary kernel module for Linux #KVERS# + These XFree86/X.Org 4.x binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the TNT, + TNT2, TNT Ultra, GeForce, nForce and Quadro chipsets. AGP and flat panel + displays are also supported. + . + This package contains the NVIDIA binary kernel module needed by + nvidia-glx. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/rules +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/rules @@ -0,0 +1,285 @@ +#!/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 + +# This is the debhelper compatability version to use. +export DH_COMPAT=2 + + +upstreamversion=#UPSTREAMVERSION# +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/") + +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 + + +%.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_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 + + #nothing here anymore + + 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)" $(ROOT_CMD) $(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 + + 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 + + dh_installdirs + + + install -m 0644 $(CURDIR)/debian/override $(CURDIR)/debian/nvidia-kernel-$(KVERS)/usr/share/lintian/overrides/nvidia-kernel-$(KVERS) + if [ "$(PATCHLEVEL)" = "6" ] ; then \ + install -m 0644 $(CURDIR)/$(dirname)/nvidia.ko $(CURDIR)/debian/nvidia-kernel-$(KVERS)/lib/modules/$(KVERS)/nvidia/nvidia.ko ; \ + else \ + install -m 0644 $(CURDIR)/$(dirname)/nvidia.o $(CURDIR)/debian/nvidia-kernel-$(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_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_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 +clean: clean.Makefile unpatch + if [ -f $(CURDIR)/debian/control.template ]; then \ + cp $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \ + fi + + dh_testroot + rm -f build-stamp configure-stamp + + + $(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 + + -dh_clean + + -rm $(CURDIR)/debian/control + -rm $(CURDIR)/debian/dirs + -rm $(CURDIR)/debian/override + + +unpatch: + if [ -e patch-stamp ]; then \ + dpatch deapply-all ; \ + rm -rf patch-stamp debian/patched ; \ + 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 + + + +# 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 + +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 + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/changelog +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/changelog @@ -0,0 +1,349 @@ +nvidia-kernel (#VERSION#-0ubuntu3) breezy; urgency=low + + * Update to 1.0.7667 for i386/amd64, ia64 has been dropped. + * Introduce a new nvidia-legacy-kernel-source package at 1.0.7174, for older + chipset revisions that are no longer supported by new upstream releases. + + -- Adam Conrad Fri, 23 Sep 2005 15:54:22 +1000 + +nvidia-kernel (#VERSION#-0ubuntu2) hoary; urgency=low + + * Updated to 1.0.7167 for i386/amd64. + + -- Fabio M. Di Nitto Thu, 31 Mar 2005 14:46:01 +0200 + +nvidia-kernel (#VERSION#-0ubuntu1) hoary; urgency=low + + * Updated to 1.0.6629 for i386/amd64 and 1.0.5336 for ia64. + + -- Daniel Stone Sat, 27 Nov 2004 12:50:23 +0000 + +nvidia-kernel (1.0.6111-1ubuntu5) warty; urgency=low + + * Fixed acx100 firmware filenames. + + -- Herbert Xu Fri, 8 Oct 2004 09:07:29 +1000 + +nvidia-kernel (1.0.6111-1ubuntu4) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Herbert Xu Fri, 8 Oct 2004 07:27:07 +1000 + +nvidia-kernel (1.0.6111-1ubuntu3) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Matt Zimmerman Mon, 27 Sep 2004 11:57:13 -0700 + +nvidia-kernel (1.0.6111-1ubuntu2) warty; urgency=low + + * Added nvidia-glx-config script (Fabio M. Di Nitto) + + -- Herbert Xu Sat, 18 Sep 2004 14:23:49 +1000 + +nvidia-kernel (1.0.6111-1ubuntu1) warty; urgency=low + + * Switch to use linux-image. + + -- Fabio M. Di Nitto Fri, 10 Sep 2004 14:54:56 +0200 + +nvidia-kernel (1.0.6111-1) unstable; urgency=low + + * New upstream. + * add executable check for update-devfsd. + + -- Randall Donald Thu, 5 Aug 2004 11:43:28 -0700 + +nvidia-kernel (1.0.6106-4) unstable; urgency=low + + * Use init script patch by Arthur de Jong + (closes: #243308, #261165) + * Add read-only check to init script. (closes: #262176) + + -- Randall Donald Sat, 31 Jul 2004 14:40:59 -0700 + +nvidia-kernel (1.0.6106-3) unstable; urgency=low + + * Remove libglx.so.version symlink cleaning now that it is an actual file + again. + + -- Randall Donald Wed, 30 Jun 2004 22:00:09 -0700 + +nvidia-kernel (1.0.6106-2) unstable; urgency=low + + * Remove package nvidia-settings so I can use the GPL source in a separate + source package in contrib. + * Fix nvidia-glx-dev depends on nvidia-glx version. + + -- Randall Donald Wed, 30 Jun 2004 17:48:06 -0700 + +nvidia-kernel (1.0.6106-1) unstable; urgency=low + + * New upstream. + fixed GL library symbols (closes: #242525) + * new nvidia-settings package. + * remolded TLS handling for new libnvidia-tls.so + * sysfs support now builtin, both dpatches disabled. + + -- Randall Donald Wed, 30 Jun 2004 11:35:08 -0700 + +nvidia-kernel (1.0.5336-12) unstable; urgency=low + + * Include newer sysfs patch by Martin Schlemmer which + should now create udev nodes. + (closes: #248451) + + -- Randall Donald Tue, 29 Jun 2004 23:46:22 -0700 + +nvidia-kernel (1.0.5336-11) unstable; urgency=low + + * Correct nvidia-glx.shlibs. (closes: #249194) + * New init script from Arthur de Jong . + (closes: #243308, #252569) + + -- Randall Donald Tue, 8 Jun 2004 19:04:42 -0700 + +nvidia-kernel (1.0.5336-10) unstable; urgency=low + + * remove immediate exit in nvida-glx init.d so tls detection doesn't exit. + (closes: #247188) + + -- Randall Donald Sat, 8 May 2004 13:44:21 -0700 + +nvidia-kernel (1.0.5336-9) unstable; urgency=low + + * use corrected 02_pcialias patch from Juergen Kreileder + + -- Randall Donald Fri, 30 Apr 2004 19:38:57 -0700 + +nvidia-kernel (1.0.5336-8) unstable; urgency=low + + * Allow for presence of 01_sysfs fuzz in 02_pcialias. (closes: #246773) + * Document in n-k-s.README.Debian about IGNORE_PCI_CLASS_DISPLAY + (closes: #246775) + + -- Randall Donald Fri, 30 Apr 2004 18:52:47 -0700 + +nvidia-kernel (1.0.5336-7) unstable; urgency=low + + * also detect uppercase "GCC" in compiler detection. (closes: #243988) + * version dpatch at >= 2.0.0. (closes: #242465) + * patch for hotplugging. Thanks to Juergen Kreileder + (closes: #239992) + * move libtool files to nvidia-glx-dev. (closes: #229110) + * apply patch from Joachim Breitner for init script. + (closes: #243308) + * change shlibs to xlibmesa-gl | libgl1 + + -- Randall Donald Sat, 17 Apr 2004 16:40:26 -0700 + +nvidia-kernel (1.0.5336-6) unstable; urgency=low + + * Introduce a boot init script for TLS detection. With this we can get rid + of the debconf prompting. (closes: #234612, #231397, #234323) + * Provide patch for sysfs. (closes: #236714, #234150) + * depend on dpatch for above patch. + * fix typo in clean target for SYSSRC. (closes: #237793) + * modify debian.binary/rules for patching and Makefile existance. + + -- Randall Donald Fri, 19 Mar 2004 14:39:56 -0800 + +nvidia-kernel (1.0.5336-5) unstable; urgency=low + + * add SYSRC to clean target. (closes: #232313) + * Make GL depends more X 4.3 friendly. (closes: #188189) + * pass KPKG_EXTRAV_ARG in for proper 2.6 EXTRAVERSIONing + * version kernel-package at >=8.082. + * add root_cmd. (closes: #162323) + + -- Randall Donald Sat, 21 Feb 2004 15:04:42 -0800 + +nvidia-kernel (1.0.5336-4) unstable; urgency=low + + * Add glext.h to nvidia-glx-dev. (closes: #231169) + * Add Makefile to clean target in nvidia-kernel-source rules file. + + -- Randall Donald Wed, 4 Feb 2004 16:03:42 -0800 + +nvidia-kernel (1.0.5336-3) unstable; urgency=low + + * Depend on libc6-dev for KBUILD building. (closes: #230307) + + -- Randall Donald Sat, 31 Jan 2004 14:26:02 -0800 + +nvidia-kernel (1.0.5336-2) unstable; urgency=low + + * Bypass NVIDIA's select_makefile (closes: #230307) + * Remove patch from nvidia-kernel-source Depends and add sed. + * Remove dangling libglx.so.VERSION symlink. + + -- Randall Donald Fri, 30 Jan 2004 14:54:32 -0800 + +nvidia-kernel (1.0.5336-1) unstable; urgency=low + + * New upstream. + * generate nvidia-kernel changelog from nvidia-graphics-drivers at build. + * change nvidia-kernel-source arch to i386. (closes: #229060) + * remove 2.6 patch as it is now provided upstream. + * create a makefile selector and change the patchlevel detection to be based + on KERNEL_VERSION_CODE. + * switch back to Makefile.kbuild for 2.6.x. + * remove no longer needed apm patch. (closes: #228487) + * reflect 2.6 changes in nvidia-kernel-source.README.Debian. + + -- Randall Donald Tue, 27 Jan 2004 00:01:32 -0800 + +nvidia-kernel (1.0.5328-4) unstable; urgency=low + + * Provide fixed .la files. (closes: #228677) + + -- Randall Donald Mon, 19 Jan 2004 23:05:20 -0800 + +nvidia-kernel (1.0.5328-3) unstable; urgency=low + + * Remove bad/broken LibGL.la files for now. (closes: #228499) + + -- Randall Donald Mon, 19 Jan 2004 14:56:14 -0800 + +nvidia-kernel (1.0.5328-2) unstable; urgency=low + + * Fix typo in nvidia-glx.README.Debian + + -- Randall Donald Fri, 16 Jan 2004 23:53:35 -0800 + +nvidia-kernel (1.0.5328-1) unstable; urgency=low + + * New upstream. (closes #227066) + * Apply 2.6 patch in nvidia-kernel building with env override. + Manual patching no longer required!!! (closes: #193379) + * Change text of TLS question to a positive tone. (closes: #221963) + * Quote $(CC) for a multi word compiler e.g. distcc (closes: #222390) + * Change reportbug script to use (lspci --version) instead of which. + * Add tls/libGL.so to nvidia-glx (so one can switch with only one step) + * Make note about reconfiguring for TLS switching. + * fix gcc detection again for kernel compiler. (closes: #227412) + * fix typo in nvidia-kernel-source.README.Debian (closes: #226991) + + -- Randall Donald Mon, 22 Dec 2003 01:21:58 -0800 + +nvidia-kernel (1.0.4496-10) unstable; urgency=low + + * TLS problems related to installation of TLS libs on 2.4 systems. + Solution: provide a debconf note and set a default based on runtime + detection of a TLS/2.6 system. Hopefully this will solve most of the + tls bugs. + * Add note about nvidia-kernel-source in nvidia-glx description. + (closes: #220038) + + -- Randall Donald Wed, 19 Nov 2003 13:17:50 -0800 + +nvidia-kernel (1.0.4496-9) unstable; urgency=low + + * Change nvidia-kernel-source.README.Debian.in to reflect 2.6 makefile + change. (closes: #219003) + * Note the difference in KSRC for 2.6 headers (closes: #220452) + + -- Randall Donald Mon, 17 Nov 2003 20:47:20 -0800 + +nvidia-kernel (1.0.4496-8) unstable; urgency=low + + * Correctly install tls libglx. + + -- Randall Donald Sat, 1 Nov 2003 12:46:04 -0800 + +nvidia-kernel (1.0.4496-7) unstable; urgency=low + + * add tls files. (closes: #218408, #218417, #218434, #218487) + + -- Randall Donald Fri, 31 Oct 2003 21:01:18 -0800 + +nvidia-kernel (1.0.4496-6) unstable; urgency=low + + * use Makefile.nvidia instead of Makefile.kbuild so the 2.6 support + can use kernel-headers. Manual patching still required. + README.Debian changed to instruct this change. + (closes: #208535, #203369) + * remove wget build-dep from kernel module (closes: #212742) + * install kernel module to /lib/modules/KVERS/nvidia. (closes: #207290) + * re-fix GCC detection from compile.h (closes: #205871) + + -- Randall Donald Mon, 6 Oct 2003 21:41:13 -0700 + +nvidia-kernel (1.0.4496-5) unstable; urgency=low + + * Add symlink instruction to nvidia-kernel-source.README.Debian + * Fix patchlevel version detection. + + -- Randall Donald Tue, 23 Sep 2003 01:21:29 -0700 + +nvidia-kernel (1.0.4496-4) unstable; urgency=low + + * Add Provides: nvidia-kernel-src to nvidia-kernel-source (closes: #211713) + * Upload new diversions and 2.6 support to unstable packages. + * change == to = in kernel rules file. + + -- Randall Donald Mon, 22 Sep 2003 15:34:32 -0700 + +nvidia-kernel (1.0.4496-3) experimental; urgency=low + + * Fix nvidia-kernel-source.README.Debian about installing + nvidia-kernel-common first. + * Fix typo in nvidia-kernel-source.README.Debian regarding + modules/nvidia-kernel-1.0.4496 directory. (closes: #205684) + * Change diversions to stay within /usr/lib and /usr/X11R6/lib. + This allows for installs on systems of /usr split between several + partitions. (closes: #205955) + * Move nvidia-glx dependancy on nvidia-kernel-source to a recommends. + * Fix part of gcc 3.3.1 detection that I missed last time. (closes: #205871) + * Update nvidia-kernel-source.README.Debian to reflect 2.4.21-4-k7. + * Add preliminary 2.6 support. See README.Debian for details (closes: #203369, #193379) + * Include CONFIG_APM_MODULE patch file in nvidia-kernel-source. + * Upload to experimental due to diversion changes and preliminary 2.6 + support + * Incorporate the NMU by martin f. krafft + + -- Randall Donald Tue, 26 Aug 2003 14:42:57 -0700 + +nvidia-kernel (1.0.4496-2.1) unstable; urgency=low + + * debian.binary/rules used the -a flag to copy the control.template file + to debian-binary/control. If the former was a symlink, this would result + in the erasure of the template file as the destionation of the copy would + also be a symlink to the same file. Removed the -a, now it works just + fine. + Closes: Bug#206445, Bug#206449 + + -- martin f. krafft Tue, 26 Aug 2003 08:50:46 +0200 + +nvidia-kernel (1.0.4496-2) unstable; urgency=low + + * Add email from NVIDIA to copyright file. + + -- Randall Donald Thu, 31 Jul 2003 15:18:25 -0700 + +nvidia-kernel (1.0.4496-1) unstable; urgency=low + + * New upstream. + * include shlibs file. + * Re-split nvidia-glx-dev by request. + + -- Randall Donald Mon, 28 Jul 2003 14:18:45 -0700 + +nvidia-kernel (1.0.4363-1) unstable; urgency=low + + * Put nvidia drivers into one source package + * Move from contrib to non-free + * Rename nvidia-kernel-src to nvidia-kernel-source + * Include driver files in nvidia-glx and nvidia-kernel-source instead of + downloading. + * Put nvidia-glx-dev files back into nvidia-glx. + * Separate out modules and devfs files into nvidia-kernel-common. + * Drop .deb in builder-specified location. Thanks David B Harris + (closes: #192112) + * Lose the version number in modules directory. (closes: #199509) + * Use automation of versioning based on patches by Marcello Magallon + . Thanks. (closes: #192312, #192311) + + -- Randall Donald Fri, 9 May 2003 14:51:15 -0700 + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/dirs.template +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/dirs.template @@ -0,0 +1,2 @@ +lib/modules/#KVERS#/nvidia +usr/share/lintian/overrides --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/README.Debian +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/README.Debian @@ -0,0 +1,10 @@ +nvidia-kernel for Debian +------------------------ + +Please report any actual driver related bugs (not packaging related) to +NVIDIA directly. + +List of known bugs is in Appendix G: +http://www.nvidia.com/view.asp?IO=linux_readme_install + + -- Randall Donald , Tue, 4 Sep 2001 23:30:00 -0700 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/override.template +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/override.template @@ -0,0 +1,3 @@ +nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:32 +nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:41 +nvidia-kernel-#KVERS#: unstripped-binary-or-object ./lib/modules/#KVERS#/kernel/drivers/video/nvidia.o --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/postinst +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/postinst @@ -0,0 +1,80 @@ +#! /bin/sh +# postinst script for nvidia-kernel +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + + + +case "$1" in + configure) + major=195 + + if [ ! -f /dev/.devfsd ] ; then + + for i in 0 1 2 3; do + devfile="/dev/nvidia$i" + if [ ! -c "$devfile" ]; then + mknod $devfile c $major $i + chown root:video $devfile + chmod 0660 $devfile + fi + done + + devfile=/dev/nvidiactl + + if [ ! -c "$devfile" ]; then + mknod $devfile c $major 255 + chown root:video $devfile + chmod 0660 $devfile + fi + fi + if [ -x /usr/sbin/update-devfsd ] ; then + /usr/sbin/update-devfsd + fi + +;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + +if [ -x /sbin/update-modules ]; then + update-modules >/dev/null +fi + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/debian.binary/postrm +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/debian.binary/postrm @@ -0,0 +1,7 @@ +#!/bin/sh + + +if [ -x /sbin/update-modules ]; then + update-modules >/dev/null +fi + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/patches/0000-add-include-linux-config.h-for-conftest.sh.diff +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/patches/0000-add-include-linux-config.h-for-conftest.sh.diff @@ -0,0 +1,11 @@ +--- usr/src/nv/conftest.sh~ 2006-06-28 04:26:43.000000000 +0000 ++++ usr/src/nv/conftest.sh 2006-06-28 04:31:09.000000000 +0000 +@@ -23,7 +23,7 @@ + + CFLAGS="-D__KERNEL__ \ + -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ +--nostdinc -isystem $ISYSTEM" ++-nostdinc -isystem $ISYSTEM -include $HEADERS/linux/config.h" + + if [ "$OUTPUT" != "$SOURCES" ]; then + ARCH=`uname -m | sed -e 's/i.86/i386/'` --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/patches-legacy/0000-add-include-linux-config.h-for-conftest.sh.diff +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/patches-legacy/0000-add-include-linux-config.h-for-conftest.sh.diff @@ -0,0 +1,11 @@ +--- usr/src/nv/conftest.sh~ 2006-06-28 04:26:43.000000000 +0000 ++++ usr/src/nv/conftest.sh 2006-06-28 04:31:09.000000000 +0000 +@@ -23,7 +23,7 @@ + + CFLAGS="-D__KERNEL__ \ + -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ +--nostdinc -isystem $ISYSTEM" ++-nostdinc -isystem $ISYSTEM -include $HEADERS/linux/config.h" + + if [ "$OUTPUT" != "$SOURCES" ]; then + ARCH=`uname -m | sed -e 's/i.86/i386/'` --- linux-restricted-modules-2.6.17-2.6.17.5.orig/nvidia/nvidia-glx-config +++ linux-restricted-modules-2.6.17-2.6.17.5/nvidia/nvidia-glx-config @@ -0,0 +1,178 @@ +#!/bin/sh + +set -e + +if [ "$(whoami)" != "root" ]; then + echo "Error: you must be root or use sudo to execute this command" + exit 1 +fi + +. /usr/share/debconf/confmodule +db_version 2.0 + +usage() { + echo "$0 called with unknown command: $1" + echo "Usage: $0 [enable|disable]" + exit 1 +} + +is_x_running() { + if [ -n "$(find /tmp/.X11-unix -type s)" ]; then + return 0 + else + return 1 + fi +} + +print_xrunning_note() { + if is_x_running; then + echo "" + echo "Warning: your X configuration has been succesfully changed." + echo "In order to take full advantage of the changes, X needs to" + echo "be restarted." + echo "" + fi +} + +print_xconfig_note() { + echo "" + echo "Error: your X configuration has been altered." + echo "This script cannot proceed automatically. If you believe that this" + echo "not correct, you can update the md5sum entry executing the following" + echo "command:" + echo "md5sum /etc/X11/${CONFIGFILE} | sudo tee /var/lib/x11/${CONFIGFILE}.md5sum" + echo "otherwise edit manually /etc/X11/${CONFIGFILE} to change the Driver section" + case "$1" in + enable) + echo "from nv to nvidia." + ;; + disable) + echo "from nvidia to nv." + ;; + *) + echo "this should never happen!" + ;; + esac + exit 1 +} + +print_missing_files() { + echo "" + echo "Error: /etc/X11/${CONFIGFILE} or /var/lib/x11/${CONFIGFILE}.md5sum" + echo "are missing from your system. Please be sure that your xserver package is" + echo "installed correctly." + echo "" + exit 1 +} + +check_config() { + if [ -e /etc/X11/${CONFIGFILE} ] && [ -e /var/lib/x11/${CONFIGFILE}.md5sum ]; then + if [ "$(md5sum /etc/X11/${CONFIGFILE})" = "$(cat /var/lib/x11/${CONFIGFILE}.md5sum)" ]; then + return 0 + else + return 1 + fi + else + print_missing_files + fi +} + +do_debconf() { + case $1 in + enable) + db_set ${SERVER}/config/device/driver nvidia + ;; + disable) + db_set ${SERVER}/config/device/driver nv + ;; + *) + echo "this should NEVER happen!" + exit 1 + ;; + esac +} + +backup_config() { + mkdir -p /var/backups/xorg + data=$(LC_ALL=C date +%F-%H:%M:%S) + cp /etc/X11/$CONFIGFILE /var/backups/xorg/${CONFIGFILE}.$data + echo "" + echo "A backup of ${CONFIGFILE} has been stored as:" + echo "/var/backups/${CONFIGFILE}.$data." + echo "If the new configuration will not work you will be able to" + echo "revert the changes simply using this command:" + echo "cp /var/backups/xorg/${CONFIGFILE}.$data /etc/X11/${CONFIGFILE}" + echo "" +} + +write_x_config() { + backup_config + rm -f /etc/X11/${CONFIGFILE} + dexconf -o /etc/X11/${CONFIGFILE} + md5sum /etc/X11/${CONFIGFILE} > /var/lib/x11/${CONFIGFILE}.md5sum +} + +manage_x_driver() { + if check_config; then + do_debconf $1 + write_x_config + else + print_xconfig_note $1 + fi + print_xrunning_note +} + +manage_kernel_driver() { + tmpfile=$(tempfile) + chmod 644 $tmpfile + case "$1" in + enable) + modprobe nvidia > /dev/null 2>&1 + if [ -z "$(cat /proc/modules | awk '{print $1}' | grep ^nvidia$)" ]; then + echo "Error: unable to load nvidia kernel driver! Be sure to have installed" + echo "the nvidia driver for your running kernel." + exit 1 + fi + #if ! grep -Eq '^nvidia$' /etc/modules && ! grep -Eq '^# nvidia$' /etc/modules; then + # echo nvidia >> /etc/modules + #elif grep -Eq '^# nvidia$' /etc/modules; then + # cat /etc/modules | sed -e 's/^# nvidia$/nvidia/g' > $tmpfile + # mv $tmpfile /etc/modules + #fi + ;; + disable) + if grep -Eq '^nvidia$' /etc/modules && ! grep -Eq '# nvidia$' /etc/modules; then + cat /etc/modules | sed -e 's/^nvidia/# nvidia/g' > $tmpfile + mv $tmpfile /etc/modules + set +e + rmmod nvidia > /dev/null 2>&1 + set -e + fi + ;; + *) + echo "this should NEVER happen!" + exit 1 + ;; + esac + rm -f $tmpfile +} + +if [ -e /etc/X11/xorg.conf ]; then + CONFIGFILE="xorg.conf" + SERVER="xserver-xorg" +else + CONFIGFILE="XF86Config-4" + SERVER="xserver-xfree86" +fi + +case "$1" in + enable|disable) + manage_kernel_driver $1 + manage_x_driver $1 + ;; + *) + usage + ;; +esac + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/make.sh +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/make.sh @@ -0,0 +1,819 @@ +FGL_PUBLIC=firegl +target_define=FGL_RX + + +if [ -z "${CC}" ]; then + CC=gcc +fi + +uname_r=`uname -r` +uname_v=`uname -v` +uname_s=`uname -s` +uname_m=`uname -m` +uname_a=`uname -a` + +XF_ROOT=/usr/X11R6 +XF_BIN=$XF_ROOT/bin +OS_MOD=/lib/modules + + +if [ -z "${SOURCE_PREFIX}" ]; then + SOURCE_PREFIX=. +fi +if [ "${SOURCE_PREFIX}" != "/" ]; then + SOURCE_PREFIX=`echo $SOURCE_PREFIX | sed -e 's,/$,,g'` +fi + +if [ -z "${LIBIP_PREFIX}" ]; then + LIBIP_PREFIX=. +fi +if [ "${LIBIP_PREFIX}" != "/" ]; then + LIBIP_PREFIX=`echo $LIBIP_PREFIX | sed -e 's,/$,,g'` +fi + + +if [ -z "${KSRC}" ]; then +linuxincludes=/usr/src/linux/include + if [ -d /lib/modules/${uname_r}/build/include ]; + then + linuxincludes=/lib/modules/${uname_r}/build/include + fi +else + linuxincludes=${KSRC}/include +fi + +drmincludes=${linuxincludes}/../drivers/char/drm +drmdefines="-DFIREGL_410" + + +if [ $CHECK_P3 -ne 0 ] +then + +$XF_BIN/cpu_check >/dev/null +case "$?" in + 0) iii= ;; + 1) iii= ;; + 2) iii=.iii ;; + 3) iii= ;; + 4) iii= ;; + 5) iii=.iii ;; + 6) iii=.iii ;; + *) iii= ;; +esac + +else + iii= +fi + +src_file=$linuxincludes/linux/agp_backend.h +if [ -e $src_file ]; +then + AGP=1 + def_agp=-D__AGP__ + echo "file $src_file says: AGP=$AGP" >> $logfile +fi + +if [ $AGP = 0 ] +then + echo "assuming default: AGP=$AGP" >> $logfile +fi + +SMP=0 + +# config/smp.h may contain this: #define CONFIG_SMP 1 | #undef CONFIG_SMP +src_file=$linuxincludes/config/smp.h +if [ ! -e $src_file ]; +then + echo "Warning:" >> $logfile + echo "kernel includes at $linuxincludes not found or incomplete" >> $logfile + echo "file: $src_file" >> $logfile + echo "" >> $logfile +else + if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ] + then + SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3` + echo "file $src_file says: SMP=$SMP" >> $logfile + fi +fi + +# 4. +# linux/autoconf.h may contain this: #define CONFIG_SMP 1 +src_file=$linuxincludes/linux/autoconf.h +if [ ! -e $src_file ]; +then + echo "Warning:" >> $logfile + echo "kernel includes at $linuxincludes not found or incomplete" >> $logfile + echo "file: $src_file" >> $logfile + echo "" >> $logfile +else + if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ] + then + SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3` + echo "file $src_file says: SMP=$SMP" >> $logfile + fi +fi + +if [ $SMP = 0 ] +then + echo "assuming default: SMP=$SMP" >> $logfile +fi + +# act on final result +if [ ! $SMP = 0 ] +then + smp="-SMP" + def_smp=-D__SMP__ +fi + + +# ============================================================== +# resolve if we are running a MODVERSIONS enabled kernel + +MODVERSIONS=0 + +if [ $DEMAND_BZIMAGE -gt 0 ] +then + +# 1. +# config/modversions.h may contain this: #define CONFIG_MODVERSIONS 1 | #undef CONFIG_MODVERSIONS +src_file=$linuxincludes/config/modversions.h +if [ ! -e $src_file ]; +then + echo "Warning:" >> $logfile + echo "kernel includes at $linuxincludes not found or incomplete" >> $logfile + echo "file: $src_file" >> $logfile + echo "" >> $logfile +else + if [ 1 -eq 1 ] + then + # create a helper source file and preprocess it + tmp_src_file=tmpsrc.c + tmp_pre_file=tmppre.pre + echo "#include <$src_file>" > $tmp_src_file + ${CC} -E -nostdinc -dM -I$linuxincludes $tmp_src_file > $tmp_pre_file + + if [ `cat $tmp_pre_file | grep "1" | grep "#define" | grep "CONFIG_MODVERSIONS" -c` = 1 ] + then + MODVERSIONS=`cat $tmp_pre_file | grep CONFIG_MODVERSIONS | cut -d' ' -f3` + echo "file $src_file says: MODVERSIONS=$MODVERSIONS" >> $logfile + fi + + rm -f $tmp_src_file $tmp_pre_file + else + if [ `cat $src_file | grep "#undef" | grep "CONFIG_MODVERSIONS" -c` = 0 ] + then + MODVERSIONS=`cat $src_file | grep CONFIG_MODVERSIONS | cut -d' ' -f3` + echo "file $src_file says: MODVERSIONS=$MODVERSIONS" >> $logfile + fi + fi +fi + +fi + +# 2. +# linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1 +src_file=$linuxincludes/linux/autoconf.h +if [ ! -e $src_file ]; +then + echo "Warning:" >> $logfile + echo "kernel includes at $linuxincludes not found or incomplete" >> $logfile + echo "file: $src_file" >> $logfile + echo "" >> $logfile +else + if [ `cat $src_file | grep "#undef" | grep "CONFIG_MODVERSIONS" -c` = 0 ] + then + MODVERSIONS=`cat $src_file | grep CONFIG_MODVERSIONS | cut -d' ' -f3` + echo "file $src_file says: MODVERSIONS=$MODVERSIONS" >> $logfile + fi +fi + +if [ $MODVERSIONS = 0 ] +then + echo "assuming default: MODVERSIONS=$MODVERSIONS" >> $logfile +fi + +# act on final result +if [ ! $MODVERSIONS = 0 ] +then + def_modversions="-DMODVERSIONS -include $linuxincludes/linux/modversions.h" +fi + + +# ============================================================== +# check for required source and lib files + +file=${SOURCE_PREFIX}/${FGL_PUBLIC}_public.c +if [ ! -e $file ]; +then + echo "$file: required file is missing in build directory" | tee -a $logfile + exit 1 +fi +file=${SOURCE_PREFIX}/${FGL_PUBLIC}_public.h +if [ ! -e $file ]; +then + echo "$file: required file is missing in build directory" | tee -a $logfile + exit 1 +fi + +# break down OsRelease string into its components +major=`echo $OsRelease | sed -n -e s/"^\([[:digit:]]*\)\.\([[:digit:]]*\)\.\([[:digit:]]*\)\(.*\)"/"\\1"/p` +minor=`echo $OsRelease | sed -n -e s/"^\([[:digit:]]*\)\.\([[:digit:]]*\)\.\([[:digit:]]*\)\(.*\)"/"\\2"/p` +patch=`echo $OsRelease | sed -n -e s/"^\([[:digit:]]*\)\.\([[:digit:]]*\)\.\([[:digit:]]*\)\(.*\)"/"\\3"/p` +extra=`echo $OsRelease | sed -n -e s/"^\([[:digit:]]*\)\.\([[:digit:]]*\)\.\([[:digit:]]*\)\(.*\)"/"\\4"/p` + +if [ "$1" = "verbose" ] +then + echo OsRelease=$OsRelease | tee -a $logfile + echo major=$major | tee -a $logfile + echo minor=$minor | tee -a $logfile + echo patch=$patch | tee -a $logfile + echo extra=$extra | tee -a $logfile + echo SMP=$SMP | tee -a $logfile + echo smp=$smp | tee -a $logfile + echo iii=$iii | tee -a $logfile + echo AGP=$AGP | tee -a $logfile +fi + +major_minor=$major.$minor. +major_minor_grep=$major[.]$minor[.] + +echo . >>$logfile + +# determine compiler version +cc_version_string=`${CC} -v 2>&1 | grep -v "specs from" -v | grep -v "Thread model" | grep -v "Configured with"` +cc_version=`echo $cc_version_string | sed -e s/egcs-//g | sed -n -e 's/\(^gcc version\)[[:space:]]*\([.0123456789]*\)\(.*\)/\2/'p` +cc_version_major=`echo $cc_version | cut -d'.' -f1` +cc_version_minor=`echo $cc_version | cut -d'.' -f2` + +echo CC=${CC} >> $logfile +echo cc_version=$cc_version >> $logfile +if [ "$1" = "verbose" ] +then + echo CC=${CC} + echo cc_version=$cc_version +fi + +# try to symlink the compiler matching ip-library +lib_ip_base=${LIBIP_PREFIX}/lib${MODULE}_ip.a + +# remove existing symlink first +if [ -L $lib_ip_base ]; +then + # remove that symlink to create a new one in next paragraph + rm -f ${lib_ip_base} +else + if [ -e $lib_ip_base ]; + then + echo "Error: the ip-library is present as some file - thats odd!" | tee -a $logfile + # comment out the below line if you really want to use this local file + if [ -z "${LIBIP_PREFIX}" ]; then + exit 1 + fi + fi +fi + +# if there is no ip-lib file then deterimine which symlink to setup +if [ ! -e $lib_ip_base ]; +then + if [ -e ${lib_ip_base}.GCC$cc_version ]; + then + # we do have an ip-lib that exactly matches the users compiler + ln -s ${lib_ip_base}.GCC$cc_version ${lib_ip_base} + echo "found exact match for ${CC} and the ip-library" >> $logfile + else + # there is no exact match for the users compiler + # try if we just provide a module that matches the compiler major number + for lib_ip_major in `ls -1 ${lib_ip_base}.GCC$cc_version_major* 2>/dev/null`; + do + # just the last matching library does server our purposes - ease of coding + rm -f ${lib_ip_base} + ln -s ${lib_ip_major} ${lib_ip_base} + done + + # after the loop there should be a file or a symlink or whatever + if [ ! -e ${lib_ip_base} ] + then + echo "ls -l ${lib_ip_base}*" >>$logfile + ls -l ${lib_ip_base}* 2>/dev/null >>$logfile + echo "Error: could not resolve matching ip-library." | tee -a $logfile + exit 1 + else + echo "found major but not minor version match for ${CC} and the ip-library" >> $logfile + fi + fi +fi + +# log a few stats +echo "ls -l ${lib_ip_base}" >> $logfile + ls -l ${lib_ip_base} >> $logfile + +# assign result (is not really a variable in current code) +core_lib=${lib_ip_base} + +#echo "lib file name was resolved to: $core_lib" >> $logfile +#if [ "$1" = "verbose" ] +#then +# echo "lib file name was resolved to: $core_lib" +#fi +#if [ ! -e $core_lib ]; +#then +# echo "required lib file is missing in build directory" | tee -a $logfile +# exit 1 +#fi + +echo . >> $logfile + + +# ============================================================== +# make clean +echo cleaning... | tee -a $logfile +if [ -e ${FGL_PUBLIC}_public.o ] +then + rm -f ${FGL_PUBLIC}_public.o 2>&1 | tee -a $logfile +fi +if [ -e ${MODULE}.o ] +then + rm -f ${MODULE}.o 2>&1 | tee -a $logfile +fi + +#if [ -e agpgart_fe.o ] +#then +# rm -f agpgart_fe.o 2>&1 | tee -a $logfile +#fi +if [ -e agpgart_be.o ] +then + rm -f agpgart_be.o 2>&1 | tee -a $logfile +fi +if [ -e agp3.o ] +then + rm -f agp3.o 2>&1 | tee -a $logfile +fi +if [ -e i7505-agp.o ] +then + rm -f i7505-agp.o 2>&1 | tee -a $logfile +fi +if [ -e nvidia-agp.o ] +then + rm -f nvidia-agp.o 2>&1 | tee -a $logfile +fi + +if [ -e patch/linux ] +then + if [ -e patch/linux/highmem.h ] + then + rm -f patch/linux/highmem.h + fi + rmdir patch/linux 2>/dev/null +fi + +if [ -e patch/drivers/char/drm ] +then + if [ -e patch/drivers/char/drm/drm_proc.h ] + then + rm -f patch/drivers/char/drm/drm_proc.h + fi + if [ -e patch/drivers/char/drm/drmP.h ] + then + rm -f patch/drivers/char/drm/drmP.h + fi + if [ -e patch/drivers/char/drm/drm_os_linux.h ] + then + rm -f patch/drivers/char/drm/drm_os_linux.h + fi + # cleanup any patchfile remainder + rm -f patch/drivers/char/drm/*.orig patch/drivers/char/drm/*.rej + # cleanup dirs + rmdir patch/drivers/char/drm + rmdir patch/drivers/char + rmdir patch/drivers +fi + +if [ -e patch ] +then + rmdir patch 2>/dev/null +fi + +# ============================================================== +# apply header file patches +# suppress known warning in specific header file +patch_includes= + +srcfile=${linuxincludes}/linux/highmem.h +if [ -e ${srcfile} ] +then + echo "patching 'highmem.h'..." | tee -a $logfile + mkdir -p patch/include/linux + cat ${srcfile} | sed -e 's/return kmap(bh/return (char*)kmap(bh/g' >patch/include/linux/highmem.h + patch_includes="${patch_includes} -Ipatch/include" +fi + +srcfile=${drmincludes}/drmP.h +if [ -e ${srcfile} ] +then + if [ `cat ${srcfile} | grep -c "\"[\" DRM_NAME \":\" __FUNCTION__ \"] \" fmt ,"` -eq 0 ] + then + echo "skipping patch for 'drmP.h', not needed" | tee -a $logfile + # a local copy is still needed for propper compile of patched drm_os_linux.h + mkdir -p patch/drivers/char/drm + cd patch/drivers/char/drm + if [ -e ${drmincludes}/drm_proc.h ] + then + cp ${drmincludes}/drm_proc.h drm_proc.h + fi + cp ${srcfile} drmP.h + cd ${current_wd} + else + echo "patching 'drmP.h'..." | tee -a $logfile + mkdir -p patch/drivers/char/drm + cd patch/drivers/char/drm + + # we need both of below files, even if we dont apply any changes to the first. + # this will work around the inclusion concept and fix the gcc3.2 warnings + cp ${drmincludes}/drm_proc.h drm_proc.h + cat <<-begin_end | sed -e 's/\\x/\\/g' >drmP.h.patch +--- drmP.h.orig 2002-10-15 20:30:21.000000000 +0200 ++++ drmP.h 2002-10-15 20:31:58.000000000 +0200 +@@ -255,9 +255,9 @@ + + /* Macros to make printk easier */ + #define DRM_ERROR(fmt, arg...) \x +- printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg) ++ printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt, __FUNCTION__ , ##arg) + #define DRM_MEM_ERROR(area, fmt, arg...) \x +- printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \x ++ printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt, __FUNCTION__, \x + DRM(mem_stats)[area].name , ##arg) + #define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg) + +@@ -266,7 +266,7 @@ + do { \x + if ( DRM(flags) & DRM_FLAG_DEBUG ) \x + printk(KERN_DEBUG \x +- "[" DRM_NAME ":" __FUNCTION__ "] " fmt , \x ++ "[" DRM_NAME ":%s] " fmt, __FUNCTION__ , \x + ##arg); \x + } while (0) + #else +begin_end + + cp ${srcfile} drmP.h + patch -p0 -E drm_os_linux.h + cd ${current_wd} + patch_includes="${patch_includes} -Ipatch/drivers/char/drm" + fi +fi + +# ============================================================== +# defines for all targets +def_for_all="-DATI_AGP_HOOK -DATI -DFGL -D${target_define} -DFGL_CUSTOM_MODULE -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX" + +# defines for specific os and cpu platforms +if [ "${uname_m}" = "x86_64" ]; then + def_machine="-mcmodel=kernel" +fi + +if [ "${uname_m}" = "ia64" ]; then + def_machine="-ffixed-r13 -mfixed-range=f12-f15,f32-f127" +fi + +# determine which build system we should use +# note: we do not support development kernel series like the 2.5.xx tree +if [ $major -gt 2 ]; then + kernel_is_26x=1 +else + if [ $major -eq 2 ]; then + if [ $minor -gt 5 ]; then + kernel_is_26x=1 + else + kernel_is_26x=0 + fi + else + kernel_is_26x=0 + fi +fi + +if [ $kernel_is_26x -eq 1 ]; then + kmod_extension=.ko +else + kmod_extension=.o +fi + + +# ============================================================== +# resolve if we are running a kernel with the new VMA API +# that was introduced in linux-2.5.3-pre1 +# or with the previous one that at least was valid for linux-2.4.x + +if [ $kernel_is_26x -gt 0 ]; +then + echo "assuming new VMA API since we do have kernel 2.6.x..." | tee -a $logfile + def_vma_api_version=-DFGL_LINUX253P1_VMA_API + echo "def_vma_api_version=$def_vma_api_version" >> $logfile +else + echo "probing for VMA API version..." | tee -a $logfile + + # create a helper source file and try to compile it into an objeckt file + tmp_src_file=tmp_vmasrc.c + tmp_obj_file_240=tmp_vma240.o + tmp_obj_file_253=tmp_vma253.o + tmp_log_file_240=tmp_vma240.log + tmp_log_file_253=tmp_vma253.log + cat > $tmp_src_file <<-begin_end +/* this is a generated file */ +#define __KERNEL__ +#include + +int probe_vma_api_version(void) { +#ifdef FGL_LINUX253P1_VMA_API + struct vm_area_struct *vma; +#endif + unsigned long from, to, size; + pgprot_t prot; + + return ( + remap_page_range( +#ifdef FGL_LINUX253P1_VMA_API + vma, +#endif + from, to, size, prot) + ); +} +begin_end + + # check for 240 API compatibility + ${CC} -I$linuxincludes $tmp_src_file -c -o $tmp_obj_file_240 &> $tmp_log_file_240 + cc_ret_vma_240=$? + echo "cc_ret_vma_240 = $cc_ret_vma_240" >> $logfile + + # check for 253 API compatibility + ${CC} -I$linuxincludes $tmp_src_file -DFGL_LINUX253P1_VMA_API -c -o $tmp_obj_file_253 &> $tmp_log_file_253 + cc_ret_vma_253=$? + echo "cc_ret_vma_253 = $cc_ret_vma_253" >> $logfile + + # classify and act on results + # (the check is designed so that exactly one version should succeed and the rest should fail) + def_vma_api_version= + if [ $cc_ret_vma_240 -eq 0 ] + then + if [ $cc_ret_vma_253 -eq 0 ] + then + echo "check results are inconsistent!!!" | tee -a $logfile + echo "exactly one check should work, but not multiple checks."| tee -a $logfile + echo "aborting module build." | tee -a $logfile + exit 1 + else + # the kernel tree does contain the 240 vma api version + def_vma_api_version=-DFGL_LINUX240_VMA_API + fi + else + if [ $cc_ret_vma_253 -eq 0 ] + then + # the kernel tree does contain the 253 vma api version + def_vma_api_version=-DFGL_LINUX253P1_VMA_API + else + echo "check results are inconsistent!!!" | tee -a $logfile + echo "none of the probed versions did succeed." | tee -a $logfile + echo "aborting module build." | tee -a $logfile + exit 1 + fi + fi + + echo "def_vma_api_version=$def_vma_api_version" >> $logfile + + # cleanup intermediate files + rm -f $tmp_src_file $tmp_obj_file_240 $tmp_obj_file_253 $tmp_log_file_240 $tmp_log_file_253 +fi + + +# ============================================================== +# make agp kernel module (including object files) and check results + +if [ $kernel_is_26x -gt 0 ]; then + echo "doing Makefile based build for kernel 2.6.x and higher" | tee -a $logfile + cd 2.6.x + make PAGE_ATTR_FIX=$PAGE_ATTR_FIX 2>&1 | tee -a $logfile + res=$? + cd .. + if [ $res -eq 0 ]; then + echo "build succeeded with return value $res" | tee -a $logfile + else + echo "build failed with return value $res" | tee -a $logfile + exit 1 + fi + if [ -e ${MODULE}${kmod_extension} ]; then + rm -f ${MODULE}${kmod_extension} + fi + ln -s 2.6.x/${MODULE}${kmod_extension} + TERMINAL_HINT=0 +else + echo "doing script based build for kernel 2.4.x and similar" | tee -a $logfile + +WARNINGS="-Wall -Wwrite-strings -Wpointer-arith -Wcast-align -Wstrict-prototypes" +if [ $cc_version_major -ge 3 ]; +then + if [ $cc_version_major -eq 3 ]; + then + if [ $cc_version_minor -ge 3 ]; + then + # gcc 3.3 or higher is too verbose for us when using the -Wall option + WARNINGS="-Wwrite-strings -Wpointer-arith -Wcast-align -Wstrict-prototypes" + fi + else + # gcc 3.3 or higher is too verbose for us when using the -Wall option + WARNINGS="-Wwrite-strings -Wpointer-arith -Wcast-align -Wstrict-prototypes" + fi +fi + +#SRC=${SOURCE_PREFIX}/agpgart_fe.c +#DST=agpgart_fe.o +#echo "compiling '$SRC'..." | tee -a $logfile +#cc_cmd="${CC} ${WARNINGS} -O2 -D__KERNEL__ -DMODULE -fomit-frame-pointer $def_for_all -D$MODULE $def_smp $def_modversions $patch_includes -I$linuxincludes -c $SRC -o $DST" +#echo "$cc_cmd" >> $logfile +#$cc_cmd 2>&1 | tee -a $logfile +#if [ ! -e $DST ] ; +#then +# echo "compiling failed - object file was not generated" | tee -a $logfile +# exit 1 +#fi + +SRC=${SOURCE_PREFIX}/agpgart_be.c +DST=agpgart_be.o +echo "compiling '$SRC'..." | tee -a $logfile +cc_cmd="${CC} ${WARNINGS} -O2 -D__KERNEL__ -DMODULE -fomit-frame-pointer $def_for_all $def_machine -D$MODULE $def_smp $def_modversions $patch_includes -I$linuxincludes -c $SRC -o $DST" +echo "$cc_cmd" >> $logfile +$cc_cmd 2>&1 | tee -a $logfile +if [ ! -e $DST ] ; +then + echo "compiling failed - object file was not generated" | tee -a $logfile + exit 1 +fi + +SRC=${SOURCE_PREFIX}/agp3.c +DST=agp3.o +echo "compiling '$SRC'..." | tee -a $logfile +cc_cmd="${CC} ${WARNINGS} -O2 -D__KERNEL__ -DMODULE -fomit-frame-pointer $def_for_all $def_machine -D$MODULE $def_smp $def_modversions $patch_includes -I$linuxincludes -c $SRC -o $DST" +echo "$cc_cmd" >> $logfile +$cc_cmd 2>&1 | tee -a $logfile +if [ ! -e $DST ] ; +then + echo "compiling failed - object file was not generated" | tee -a $logfile + exit 1 +fi + +SRC=${SOURCE_PREFIX}/i7505-agp.c +DST=i7505-agp.o +echo "compiling '$SRC'..." | tee -a $logfile +cc_cmd="${CC} ${WARNINGS} -O2 -D__KERNEL__ -DMODULE -fomit-frame-pointer $def_for_all $def_machine -D$MODULE $def_smp $def_modversions $patch_includes -I$linuxincludes -c $SRC -o $DST" +echo "$cc_cmd" >> $logfile +$cc_cmd 2>&1 | tee -a $logfile +if [ ! -e $DST ] ; +then + echo "compiling failed - object file was not generated" | tee -a $logfile + exit 1 +fi + +SRC=${SOURCE_PREFIX}/nvidia-agp.c +DST=nvidia-agp.o +echo "compiling '$SRC'..." | tee -a $logfile +cc_cmd="${CC} ${WARNINGS} -O2 -D__KERNEL__ -DMODULE -fomit-frame-pointer $def_for_all $def_machine -D$MODULE $def_smp $def_modversions $patch_includes -I$linuxincludes -c $SRC -o $DST" +echo "$cc_cmd" >> $logfile +$cc_cmd 2>&1 | tee -a $logfile +if [ ! -e $DST ] ; +then + echo "compiling failed - object file was not generated" | tee -a $logfile + exit 1 +fi + +# we don't need the agpgart module - skip that thing +# echo "linking agp module..." | tee -a $logfile +# ld="ld -r agpgart_fe.po agpgart_be.po -o agpgart.o" +# echo "$ld" >> $logfile +# $ld 2>&1 | tee -a $logfile +# if [ ! -e ${MODULE}.o ] ; +# then +# echo "linking failed - kernel module was not generated" | tee -a $logfile +# exit 1 +# fi +# +# echo . >> $logfile + + +# ============================================================== +# make custom kernel module and check results + +SRC=${SOURCE_PREFIX}/${FGL_PUBLIC}_public.c +DST=${FGL_PUBLIC}_public.o +echo "compiling '$SRC'..." | tee -a $logfile +cc_cmd="${CC} ${WARNINGS} -O2 -D__KERNEL__ -DMODULE -fomit-frame-pointer $def_for_all $def_machine -D${MODULE} $def_vma_api_version $def_smp $def_modversions $def_agp $patch_includes -I$linuxincludes -I$drmincludes $drmdefines -c $SRC -o $DST" +echo "$cc_cmd" >> $logfile +$cc_cmd 2>&1 | tee -a $logfile | grep -v "warning: pasting would not give a valid preprocessing token" +if [ ! -e $DST ] ; +then + echo "compiling failed - object file was not generated" | tee -a $logfile + exit 1 +fi + +echo "linking of ${MODULE} kernel module..." | tee -a $logfile +if [ ! -z "${MODULE_NAME}" ]; then + module_version=.${MODULE_NAME} +fi +#ld="ld -r ${FGL_PUBLIC}_public.o agpgart_fe.o agpgart_be.o agp3.o i7505-agp.o nvidia-agp.o $core_lib -o ${MODULE}.o" +ld="ld -r ${FGL_PUBLIC}_public.o agpgart_be.o agp3.o i7505-agp.o nvidia-agp.o $core_lib -o ${MODULE}${module_version}.o" +echo "$ld" >> $logfile +$ld 2>&1 | tee -a $logfile +if [ ! -e ${MODULE}${module_version}.o ] ; +then + echo "linking failed - kernel module was not generated" | tee -a $logfile + exit 1 +fi + +# end of `else` for $kernel_is_26x +fi + +echo . >> $logfile + + +# ============================================================== +# install generated file at required location + +TERMINAL_HINT=0 +if [ `pwd | grep "$OS_MOD/${MODULE}/build_mod\$" -c` -gt 0 ] +then + echo duplicating results into driver repository... | tee -a $logfile + # duplicate generated file into respective kernel module subdir + if [ $INSTALL_MODULE_SUBDIRS -eq 1 ]; + then + target_dir=`pwd`/../$OsRelease$iii$smp + else + target_dir=`pwd`/.. + fi + target_dir=`cd $target_dir;pwd` + echo "target location: $target_dir" >> $logfile + if [ ! -e $target_dir ] + then + echo "creating target directory" >> $logfile + mkdir $target_dir | tee -a $logfile + fi + + echo "copying ${MODULE}${kmod_extension}" >> $logfile + if [ $INSTALL_MODULE_SUBDIRS -eq 1 ]; + then + cp -f ${MODULE}${kmod_extension} $target_dir | tee -a $logfile + else + cp -f ${MODULE}${kmod_extension} $target_dir/${MODULE}.$OsRelease$iii${kmod_extension} | tee -a $logfile + fi + + echo "copying logfile of build" >> $logfile + echo "*** end of build log ***" >> $logfile + if [ $INSTALL_MODULE_SUBDIRS -eq 1 ]; + then + cp -f $logfile $target_dir + else + cp -f $logfile $target_dir/make.$OsRelease$iii.log + fi + + # terminal hint message + if [ $INSTALL_MODULE_SUBDIRS -eq 0 ]; + then + TERMINAL_HINT=1 + fi +else + # the build was done from an external location - installation not intended + echo "duplication skipped - generator was not called from regular lib tree" | tee -a $logfile +fi + +# ============================================================== +# finale + +echo done. +echo ============================== + +if [ $OPTIONS_HINTS -ne 0 ]; then + +if [ $TERMINAL_HINT -eq 1 ]; +then + echo "You must change your working directory to $target_dir" + echo "and then call ./make_install.sh in order to install the built module." + echo ============================== +fi + +fi + +#EOF --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/copyright +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/copyright @@ -0,0 +1,72 @@ +This package was debianized by Daniel Stone on +Sat, 27 Nov 12:56:49 +0000. It is heavily based on the nvidia-kernel packaging +by Randall Donald. + +It was downloaded from +#URL# + +Packaging scripts are: +Copyright (C) 2002-2004 Flavio Stanchina +Copyright (C) 2004 Canonical Ltd +Licensed under the GNU GPL + +On Debian GNU/Linux systems, the complete text of the GNU General Public +Licence can be found in /usr/share/common-licenses/GPL. + +ATI Software End User License Agreement + +PLEASE READ THIS LICENSE CAREFULLY BEFORE USING THE SOFTWARE. BY DOWNLOADING, INSTALLING, COPYING OR USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, SIGNIFY YOUR AGREEMENT BY CLICKING THE “AGREE/ACCEPT” BUTTON. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, PROMPTLY RETURN THE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT AND (IF APPLICABLE) YOUR MONEY WILL BE REFUNDED OR IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY CLICK “DISAGREE/DECLINE”. + +1. License. ATI Technologies Inc., on behalf of itself, its subsidiaries and licensors (referred collectively as “ATI”) grants to you the following non-exclusive, right to use the software accompanying this License (hereinafter "Software") subject to the following terms and limitations: + +(a) Regardless of the media upon which it is distributed, the Software is licensed to you for use solely in conjunction with ATI hardware products to which the Software relates ("ATI Hardware"). + +(b) You own the medium on which the Software is recorded, but ATI and, if applicable, its licensors retain title to the Software and related documentation. + +(c) You may: + + i) use the Software solely in connection with the ATI Hardware on a single computer; + + ii) make one copy of the Software in machine-readable form for backup purposes only. You must reproduce on such copy ATI's copyright notice and any other proprietary legends that were on the original copy of the Software; + + iii) transfer all your license rights in the Software provided you must also transfer a copy of this License, the backup copy of the Software, the ATI Hardware and the related documentation and provided the other party reads and agrees to accept the terms and conditions of this License. Upon such transfer your license rights are then terminated. + +(d) In addition to the license terms above, with respect to portions of the Software in source code form designed exclusively for use with the Linux operating system (“ATI Linux Code”), you may use, display, modify, copy, distribute, allow others to re-distribute, package and re-package such ATI Linux Code for commercial and non-commercial purposes, provided that: + +i) all binary components of the ATI Linux Code are not modified in any way; + +ii)the ATI Linux Code is only used as part of the Software and in connection with ATI Hardware; + +iii)all copyright notices of ATI are reproduced and you refer to these license terms; + +iv) you may not offer or impose any terms on the use of ATI Linux Code that alter or restrict this License; and + + if you have modified the ATI Linux Code, such modifications will be made publicly available and are licensed under the same terms provided herein to ATI or any other third party without further restriction, royalty or any other license requirement; + +vi) to the extent there is any ATI sample or control panel source code included in the ATI Linux Code, no rights are granted to modify such code except for portions thereof that may be subject to third party license terms that grant such rights; and + +vii) ATI is not obligated to provide any maintenance or technical support for any code resulting from ATI Linux Code. + +2. Restrictions. The Software contains copyrighted and patented material, trade secrets and other proprietary material. In order to protect them, and except as permitted by this license or applicable legislation, you may not: + + a) decompile, reverse engineer, disassemble or otherwise reduce the Software to a human-perceivable form; + + b) modify, network, rent, lend, loan, distribute or create derivative works based upon the Software in whole or in part; or + + c) electronically transmit the Software from one computer to another or over a network or otherwise transfer the Software except as permitted by this License. + +3. Termination. This License is effective until terminated. You may terminate this License at any time by destroying the Software, related documentation and all copies thereof. This License will terminate immediately without notice from ATI if you fail to comply with any provision of this License. Upon termination you must destroy the Software, related documentation and all copies thereof. + +4. Government End Users. If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees the Software and documentation were developed at private expense and are provided with "RESTRICTED RIGHTS". Use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time. In the event that this License, or any part thereof, is deemed inconsistent with the minimum rights identified in the Restricted Rights provisions, the minimum rights shall prevail. + +5. No Other License. No rights or licenses are granted by ATI under this License, expressly or by implication, with respect to any proprietary information or patent, copyright, trade secret or other intellectual property right owned or controlled by ATI, except as expressly provided in this License. + +6. Additional Licenses. DISTRIBUTION OR USE OF THE SOFTWARE WITH AN OPERATING SYSTEM MAY REQUIRE ADDITIONAL LICENSES FROM THE OPERATING SYSTEM VENDOR. + +7. Disclaimer of Warranty on Software. You expressly acknowledge and agree that use of the Software is at your sole risk. The Software and related documentation are provided "AS IS" and without warranty of any kind and ATI EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE, OF QUALITY, OF QUIET ENJOYMENT AND OF NON-INFRINGEMENT OF THIRD PARTY RIGHTS. ATI DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE SOFTWARE WILL BE CORRECTED. THE ENTIRE RISK AS TO THE RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, ATI DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE ORTHE RESULTS OF THE USE OF THE SOFTWARE OR RELATED DOCUMENTATION IN TERMS OF THEIR CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY ATI OR ATI'S AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU (AND NOT ATI OR ATI'S AUTHORIZED REPRESENTATIVE) ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. THE SOFTWARE IS NOT INTENDED FOR USE IN MEDICAL, LIFE SAVING OR LIFE SUSTAINING APPLICATIONS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT APPLY TO YOU. + +8. Limitation of Liability. TO THE MAXIMUM EXTENT PERMITTED BY LAW, UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL ATI, OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS, BE LIABLE TO YOU FOR ANY INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESSINFORMATION, AND THE LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE OR RELATED DOCUMENTATION, BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT, BY ATI, EVEN IF ATI OR ATI'S AUTHORIZED REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. ATI will not be liable for 1) loss of, or damage to, your records or data or 2) any damages claimed by you based on any third party claim. In no event shall ATI's total liability to you for all damages, losses, and causes of action (whether in contract, tort (including negligence) or otherwise) exceed the amount paid by you for the Software. The foregoing limitations will apply even if the above stated limitation fails of its essential purpose. + +9. Controlling Law and Severability. This License shall be governed by and construed under the laws of the Province of Ontario, Canada without reference to its conflict of law principles. Any dispute related hereto will be brought only in the courts in Toronto, Ontario, Canada and such courts are agreed to be the convenient forum. In the event of any conflicts between foreign law, rules, and regulations, and Canadian law, rules, and regulations, Canadian law, rules and regulations shall prevail and govern. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this License. If for any reason a court of competent jurisdiction finds any provision of this License or portion thereof, to be unenforceable, that provision of the License shall be enforced to the maximum extent permissible so as to effect the intent of the parties, and the remainder of this License shall continue in full force and effect. + +10. Complete Agreement. This License constitutes the entire agreement between the parties with respect to the use of the Software and the related documentation, and supersedes all prior or contemporaneous understandings or agreements, written or oral, regarding such subject matter. No amendment to or modification of this License will be binding unless in writing and signed by a duly authorized representative of ATI. --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/control.template +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/control.template @@ -0,0 +1,22 @@ +Source: fglrx-kernel +Section: restricted +Priority: optional +Maintainer: Daniel Stone +Build-Depends: debhelper (>> 3.0.0), make, libc6-dev +Standards-Version: 3.6.0 + +Package: fglrx-kernel-#KVERS# +Architecture: i386 +Provides: fglrx-kernel-#VERSION# +Depends: fglrx-kernel-common (>= #VERSION#) +Recommends: linux-image-#KVERS# +Description: ATI binary kernel module for Linux #KVERS# + These XFree86/X.Org 4.x binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the Radeon + r2xx/r3xx/r4xx (RADEON 8500 and above) chipsets. + . + This package contains the ATI binary kernel module needed by + fglrx-driver. + . + For more information on this source package visit ATI's homepage + at http://www.ati.com/ . --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/rules +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/rules @@ -0,0 +1,261 @@ +#!/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 + +# This is the debhelper compatability version to use. +export DH_COMPAT=2 + + +upstreamversion=#UPSTREAMVERSION# +dirname=fglrx/build_mod/2.6.x + +# 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)" +KPKG_EXTRAV_ARG := "KDIR=/usr/src/linux-headers-$$i" + +#### 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) +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)/../../fglrx-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 + + +%.Makefile : + # select which makefile to use. + rm -f $(CURDIR)/$(dirname)/Makefile || true + cd $(CURDIR)/$(dirname) ; \ + ln -s Makefile.kbuild Makefile ; \ + cd .. ; \ + + +.PHONY: configure configure-stamp +configure: configure-stamp +configure-stamp: config.Makefile + + #nothing here anymore + + 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 ATI 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)" $(ROOT_CMD) $(MAKE) -C $(CURDIR)/$(dirname) -f Makefile SYSSRC=$(KSRC) $(KPKG_EXTRAV_ARG) KBUILD_PARAMS=$(KBUILD_PARAMS) + + touch build-stamp + + +.PHONY: install +install: build + dh_testdir + dh_testroot + dh_clean -k + + 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 + + dh_installdirs + + + install -m 0644 $(CURDIR)/debian/override $(CURDIR)/debian/fglrx-kernel-$(KVERS)/usr/share/lintian/overrides/fglrx-kernel-$(KVERS) + if [ "$(PATCHLEVEL)" = "6" ] ; then \ + install -m 0644 $(CURDIR)/$(dirname)/fglrx.ko $(CURDIR)/debian/fglrx-kernel-$(KVERS)/lib/modules/$(KVERS)/fglrx/fglrx.ko ; \ + else \ + install -m 0644 $(CURDIR)/$(dirname)/fglrx.o $(CURDIR)/debian/fglrx-kernel-$(KVERS)/lib/modules/$(KVERS)/fglrx/fglrx.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_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_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 +clean: clean.Makefile unpatch + if [ -f $(CURDIR)/debian/control.template ]; then \ + cp $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \ + fi + + dh_testroot + rm -f build-stamp configure-stamp + + + $(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 + + -dh_clean + + -rm $(CURDIR)/debian/control + -rm $(CURDIR)/debian/dirs + -rm $(CURDIR)/debian/override + + +unpatch: + if [ -e patch-stamp ]; then \ + dpatch deapply-all ; \ + rm -rf patch-stamp debian/patched ; \ + 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 + + + +# 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 + +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 + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/changelog +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/changelog @@ -0,0 +1,335 @@ +fglrx-kernel (3.14.6-0ubuntu1) hoary; urgency=low + + * First release; packaging derived from nvidia-kernel-source. + + -- Daniel Stone Sat, 27 Nov 2004 12:52:32 +0000 + +nvidia-kernel (1.0.6111-1ubuntu5) warty; urgency=low + + * Fixed acx100 firmware filenames. + + -- Herbert Xu Fri, 8 Oct 2004 09:07:29 +1000 + +nvidia-kernel (1.0.6111-1ubuntu4) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Herbert Xu Fri, 8 Oct 2004 07:27:07 +1000 + +nvidia-kernel (1.0.6111-1ubuntu3) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Matt Zimmerman Mon, 27 Sep 2004 11:57:13 -0700 + +nvidia-kernel (1.0.6111-1ubuntu2) warty; urgency=low + + * Added nvidia-glx-config script (Fabio M. Di Nitto) + + -- Herbert Xu Sat, 18 Sep 2004 14:23:49 +1000 + +nvidia-kernel (1.0.6111-1ubuntu1) warty; urgency=low + + * Switch to use linux-image. + + -- Fabio M. Di Nitto Fri, 10 Sep 2004 14:54:56 +0200 + +nvidia-kernel (1.0.6111-1) unstable; urgency=low + + * New upstream. + * add executable check for update-devfsd. + + -- Randall Donald Thu, 5 Aug 2004 11:43:28 -0700 + +nvidia-kernel (1.0.6106-4) unstable; urgency=low + + * Use init script patch by Arthur de Jong + (closes: #243308, #261165) + * Add read-only check to init script. (closes: #262176) + + -- Randall Donald Sat, 31 Jul 2004 14:40:59 -0700 + +nvidia-kernel (1.0.6106-3) unstable; urgency=low + + * Remove libglx.so.version symlink cleaning now that it is an actual file + again. + + -- Randall Donald Wed, 30 Jun 2004 22:00:09 -0700 + +nvidia-kernel (1.0.6106-2) unstable; urgency=low + + * Remove package nvidia-settings so I can use the GPL source in a separate + source package in contrib. + * Fix nvidia-glx-dev depends on nvidia-glx version. + + -- Randall Donald Wed, 30 Jun 2004 17:48:06 -0700 + +nvidia-kernel (1.0.6106-1) unstable; urgency=low + + * New upstream. + fixed GL library symbols (closes: #242525) + * new nvidia-settings package. + * remolded TLS handling for new libnvidia-tls.so + * sysfs support now builtin, both dpatches disabled. + + -- Randall Donald Wed, 30 Jun 2004 11:35:08 -0700 + +nvidia-kernel (1.0.5336-12) unstable; urgency=low + + * Include newer sysfs patch by Martin Schlemmer which + should now create udev nodes. + (closes: #248451) + + -- Randall Donald Tue, 29 Jun 2004 23:46:22 -0700 + +nvidia-kernel (1.0.5336-11) unstable; urgency=low + + * Correct nvidia-glx.shlibs. (closes: #249194) + * New init script from Arthur de Jong . + (closes: #243308, #252569) + + -- Randall Donald Tue, 8 Jun 2004 19:04:42 -0700 + +nvidia-kernel (1.0.5336-10) unstable; urgency=low + + * remove immediate exit in nvida-glx init.d so tls detection doesn't exit. + (closes: #247188) + + -- Randall Donald Sat, 8 May 2004 13:44:21 -0700 + +nvidia-kernel (1.0.5336-9) unstable; urgency=low + + * use corrected 02_pcialias patch from Juergen Kreileder + + -- Randall Donald Fri, 30 Apr 2004 19:38:57 -0700 + +nvidia-kernel (1.0.5336-8) unstable; urgency=low + + * Allow for presence of 01_sysfs fuzz in 02_pcialias. (closes: #246773) + * Document in n-k-s.README.Debian about IGNORE_PCI_CLASS_DISPLAY + (closes: #246775) + + -- Randall Donald Fri, 30 Apr 2004 18:52:47 -0700 + +nvidia-kernel (1.0.5336-7) unstable; urgency=low + + * also detect uppercase "GCC" in compiler detection. (closes: #243988) + * version dpatch at >= 2.0.0. (closes: #242465) + * patch for hotplugging. Thanks to Juergen Kreileder + (closes: #239992) + * move libtool files to nvidia-glx-dev. (closes: #229110) + * apply patch from Joachim Breitner for init script. + (closes: #243308) + * change shlibs to xlibmesa-gl | libgl1 + + -- Randall Donald Sat, 17 Apr 2004 16:40:26 -0700 + +nvidia-kernel (1.0.5336-6) unstable; urgency=low + + * Introduce a boot init script for TLS detection. With this we can get rid + of the debconf prompting. (closes: #234612, #231397, #234323) + * Provide patch for sysfs. (closes: #236714, #234150) + * depend on dpatch for above patch. + * fix typo in clean target for SYSSRC. (closes: #237793) + * modify debian.binary/rules for patching and Makefile existance. + + -- Randall Donald Fri, 19 Mar 2004 14:39:56 -0800 + +nvidia-kernel (1.0.5336-5) unstable; urgency=low + + * add SYSRC to clean target. (closes: #232313) + * Make GL depends more X 4.3 friendly. (closes: #188189) + * pass KPKG_EXTRAV_ARG in for proper 2.6 EXTRAVERSIONing + * version kernel-package at >=8.082. + * add root_cmd. (closes: #162323) + + -- Randall Donald Sat, 21 Feb 2004 15:04:42 -0800 + +nvidia-kernel (1.0.5336-4) unstable; urgency=low + + * Add glext.h to nvidia-glx-dev. (closes: #231169) + * Add Makefile to clean target in nvidia-kernel-source rules file. + + -- Randall Donald Wed, 4 Feb 2004 16:03:42 -0800 + +nvidia-kernel (1.0.5336-3) unstable; urgency=low + + * Depend on libc6-dev for KBUILD building. (closes: #230307) + + -- Randall Donald Sat, 31 Jan 2004 14:26:02 -0800 + +nvidia-kernel (1.0.5336-2) unstable; urgency=low + + * Bypass NVIDIA's select_makefile (closes: #230307) + * Remove patch from nvidia-kernel-source Depends and add sed. + * Remove dangling libglx.so.VERSION symlink. + + -- Randall Donald Fri, 30 Jan 2004 14:54:32 -0800 + +nvidia-kernel (1.0.5336-1) unstable; urgency=low + + * New upstream. + * generate nvidia-kernel changelog from nvidia-graphics-drivers at build. + * change nvidia-kernel-source arch to i386. (closes: #229060) + * remove 2.6 patch as it is now provided upstream. + * create a makefile selector and change the patchlevel detection to be based + on KERNEL_VERSION_CODE. + * switch back to Makefile.kbuild for 2.6.x. + * remove no longer needed apm patch. (closes: #228487) + * reflect 2.6 changes in nvidia-kernel-source.README.Debian. + + -- Randall Donald Tue, 27 Jan 2004 00:01:32 -0800 + +nvidia-kernel (1.0.5328-4) unstable; urgency=low + + * Provide fixed .la files. (closes: #228677) + + -- Randall Donald Mon, 19 Jan 2004 23:05:20 -0800 + +nvidia-kernel (1.0.5328-3) unstable; urgency=low + + * Remove bad/broken LibGL.la files for now. (closes: #228499) + + -- Randall Donald Mon, 19 Jan 2004 14:56:14 -0800 + +nvidia-kernel (1.0.5328-2) unstable; urgency=low + + * Fix typo in nvidia-glx.README.Debian + + -- Randall Donald Fri, 16 Jan 2004 23:53:35 -0800 + +nvidia-kernel (1.0.5328-1) unstable; urgency=low + + * New upstream. (closes #227066) + * Apply 2.6 patch in nvidia-kernel building with env override. + Manual patching no longer required!!! (closes: #193379) + * Change text of TLS question to a positive tone. (closes: #221963) + * Quote $(CC) for a multi word compiler e.g. distcc (closes: #222390) + * Change reportbug script to use (lspci --version) instead of which. + * Add tls/libGL.so to nvidia-glx (so one can switch with only one step) + * Make note about reconfiguring for TLS switching. + * fix gcc detection again for kernel compiler. (closes: #227412) + * fix typo in nvidia-kernel-source.README.Debian (closes: #226991) + + -- Randall Donald Mon, 22 Dec 2003 01:21:58 -0800 + +nvidia-kernel (1.0.4496-10) unstable; urgency=low + + * TLS problems related to installation of TLS libs on 2.4 systems. + Solution: provide a debconf note and set a default based on runtime + detection of a TLS/2.6 system. Hopefully this will solve most of the + tls bugs. + * Add note about nvidia-kernel-source in nvidia-glx description. + (closes: #220038) + + -- Randall Donald Wed, 19 Nov 2003 13:17:50 -0800 + +nvidia-kernel (1.0.4496-9) unstable; urgency=low + + * Change nvidia-kernel-source.README.Debian.in to reflect 2.6 makefile + change. (closes: #219003) + * Note the difference in KSRC for 2.6 headers (closes: #220452) + + -- Randall Donald Mon, 17 Nov 2003 20:47:20 -0800 + +nvidia-kernel (1.0.4496-8) unstable; urgency=low + + * Correctly install tls libglx. + + -- Randall Donald Sat, 1 Nov 2003 12:46:04 -0800 + +nvidia-kernel (1.0.4496-7) unstable; urgency=low + + * add tls files. (closes: #218408, #218417, #218434, #218487) + + -- Randall Donald Fri, 31 Oct 2003 21:01:18 -0800 + +nvidia-kernel (1.0.4496-6) unstable; urgency=low + + * use Makefile.nvidia instead of Makefile.kbuild so the 2.6 support + can use kernel-headers. Manual patching still required. + README.Debian changed to instruct this change. + (closes: #208535, #203369) + * remove wget build-dep from kernel module (closes: #212742) + * install kernel module to /lib/modules/KVERS/nvidia. (closes: #207290) + * re-fix GCC detection from compile.h (closes: #205871) + + -- Randall Donald Mon, 6 Oct 2003 21:41:13 -0700 + +nvidia-kernel (1.0.4496-5) unstable; urgency=low + + * Add symlink instruction to nvidia-kernel-source.README.Debian + * Fix patchlevel version detection. + + -- Randall Donald Tue, 23 Sep 2003 01:21:29 -0700 + +nvidia-kernel (1.0.4496-4) unstable; urgency=low + + * Add Provides: nvidia-kernel-src to nvidia-kernel-source (closes: #211713) + * Upload new diversions and 2.6 support to unstable packages. + * change == to = in kernel rules file. + + -- Randall Donald Mon, 22 Sep 2003 15:34:32 -0700 + +nvidia-kernel (1.0.4496-3) experimental; urgency=low + + * Fix nvidia-kernel-source.README.Debian about installing + nvidia-kernel-common first. + * Fix typo in nvidia-kernel-source.README.Debian regarding + modules/nvidia-kernel-1.0.4496 directory. (closes: #205684) + * Change diversions to stay within /usr/lib and /usr/X11R6/lib. + This allows for installs on systems of /usr split between several + partitions. (closes: #205955) + * Move nvidia-glx dependancy on nvidia-kernel-source to a recommends. + * Fix part of gcc 3.3.1 detection that I missed last time. (closes: #205871) + * Update nvidia-kernel-source.README.Debian to reflect 2.4.21-4-k7. + * Add preliminary 2.6 support. See README.Debian for details (closes: #203369, #193379) + * Include CONFIG_APM_MODULE patch file in nvidia-kernel-source. + * Upload to experimental due to diversion changes and preliminary 2.6 + support + * Incorporate the NMU by martin f. krafft + + -- Randall Donald Tue, 26 Aug 2003 14:42:57 -0700 + +nvidia-kernel (1.0.4496-2.1) unstable; urgency=low + + * debian.binary/rules used the -a flag to copy the control.template file + to debian-binary/control. If the former was a symlink, this would result + in the erasure of the template file as the destionation of the copy would + also be a symlink to the same file. Removed the -a, now it works just + fine. + Closes: Bug#206445, Bug#206449 + + -- martin f. krafft Tue, 26 Aug 2003 08:50:46 +0200 + +nvidia-kernel (1.0.4496-2) unstable; urgency=low + + * Add email from NVIDIA to copyright file. + + -- Randall Donald Thu, 31 Jul 2003 15:18:25 -0700 + +nvidia-kernel (1.0.4496-1) unstable; urgency=low + + * New upstream. + * include shlibs file. + * Re-split nvidia-glx-dev by request. + + -- Randall Donald Mon, 28 Jul 2003 14:18:45 -0700 + +nvidia-kernel (1.0.4363-1) unstable; urgency=low + + * Put nvidia drivers into one source package + * Move from contrib to non-free + * Rename nvidia-kernel-src to nvidia-kernel-source + * Include driver files in nvidia-glx and nvidia-kernel-source instead of + downloading. + * Put nvidia-glx-dev files back into nvidia-glx. + * Separate out modules and devfs files into nvidia-kernel-common. + * Drop .deb in builder-specified location. Thanks David B Harris + (closes: #192112) + * Lose the version number in modules directory. (closes: #199509) + * Use automation of versioning based on patches by Marcello Magallon + . Thanks. (closes: #192312, #192311) + + -- Randall Donald Fri, 9 May 2003 14:51:15 -0700 + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/dirs.template +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/dirs.template @@ -0,0 +1,2 @@ +lib/modules/#KVERS#/nvidia +usr/share/lintian/overrides --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/override.template +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/override.template @@ -0,0 +1,3 @@ +nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:32 +nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:41 +nvidia-kernel-#KVERS#: unstripped-binary-or-object ./lib/modules/#KVERS#/kernel/drivers/video/nvidia.o --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/postinst +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/postinst @@ -0,0 +1,80 @@ +#! /bin/sh +# postinst script for nvidia-kernel +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + + + +case "$1" in + configure) + major=195 + + if [ ! -f /dev/.devfsd ] ; then + + for i in 0 1 2 3; do + devfile="/dev/nvidia$i" + if [ ! -c "$devfile" ]; then + mknod $devfile c $major $i + chown root:video $devfile + chmod 0660 $devfile + fi + done + + devfile=/dev/nvidiactl + + if [ ! -c "$devfile" ]; then + mknod $devfile c $major 255 + chown root:video $devfile + chmod 0660 $devfile + fi + fi + if [ -x /usr/sbin/update-devfsd ] ; then + /usr/sbin/update-devfsd + fi + +;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + +if [ -x /sbin/update-modules ]; then + update-modules >/dev/null +fi + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/debian.binary/postrm +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/debian.binary/postrm @@ -0,0 +1,7 @@ +#!/bin/sh + + +if [ -x /sbin/update-modules ]; then + update-modules >/dev/null +fi + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/fireglcontrol_kde3.desktop +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/fireglcontrol_kde3.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=ATI Control +Comment=ATI graphics adapter settings +Icon=/usr/share/icons/ati.xpm +Exec=/usr/bin/fireglcontrol +Path=/usr/bin +Terminal=0 +TerminalOptions= +Type=Application +X-KDE-SubstituteUID=false +X-KDE-Username= --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/fglrx.xsession +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/fglrx.xsession @@ -0,0 +1,3 @@ +if [ -d /usr/X11R6/lib32/modules/dri ]; then + export LIBGL_DRIVER_PATH=/usr/X11R6/lib/modules/dri:/usr/X11R6/lib32/modules/dri +fi --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/patches/fglrx-public.diff +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/patches/fglrx-public.diff @@ -0,0 +1,13 @@ +--- lib/modules/fglrx/build_mod/firegl_public.c 2006-04-11 21:02:22.000000000 +0000 ++++ lib/modules/fglrx/build_mod/firegl_public.c 2006-05-24 02:15:02.000000000 +0000 +@@ -2349,6 +2349,10 @@ + #endif /* !CONFIG_GART_IOMMU */ + } + ++#if defined(CONFIG_GART_IOMMU) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) ++#include // for no_iommu ++#endif ++ + int ATI_API_CALL __ke_no_iommu(void) + { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/patches/fglrx-panel-style.diff +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/patches/fglrx-panel-style.diff @@ -0,0 +1,21 @@ +--- extra_src/panel/main.cpp 2005-09-06 12:00:53.000000000 +1000 ++++ extra_src/panel/main.cpp 2005-09-06 12:01:01.000000000 +1000 +@@ -28,8 +28,6 @@ + // printf ( "%s\n", lpath.data() ) ; + // printf ( "%s\n", lfile.data() ) ; + +- QApplication::setStyle ( new QWindowsStyle ) ; +- + QApplication a( argc, argv ); + + if ( fi.exists() ) +--- extra_src/panel/FireGLControl.h 2005-09-06 12:01:13.000000000 +1000 ++++ extra_src/panel/FireGLControl.h 2005-09-06 12:01:19.000000000 +1000 +@@ -1,7 +1,6 @@ + #include + + #include +-#include + #include + #include + #include --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/patches/fglrx-makefile.patch +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/patches/fglrx-makefile.patch @@ -0,0 +1,8 @@ +--- lib/modules/fglrx/build_mod/2.6.x/Makefile 2005-09-06 11:45:05.000000000 +1000 ++++ lib/modules/fglrx/build_mod/2.6.x/Makefile 2005-09-06 11:47:48.000000000 +1000 +@@ -1,4 +1,4 @@ +-GCC_VER_MAJ = $(shell $(CC) --version | head -n 1 | sed -e 's/[^0-9. ]//g;s/^ *//;s/^\(.\)\..*$$/\1/') ++GCC_VER_MAJ = $(shell $$CC -dumpversion | cut -f1 -d.) + + obj-m += fglrx.o + fglrx-libs += libfglrx_ip.a.GCC$(GCC_VER_MAJ) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/patches/panel.patch +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/patches/panel.patch @@ -0,0 +1,90 @@ +--- extra_src/panel/ATITVOExtensions.c 2004-09-12 10:48:59.000000000 +0300 ++++ extra_src/panel/ATITVOExtensions.c 2004-09-12 10:49:18.000000000 +0300 +@@ -24,7 +24,7 @@ + + #include + #include +-#include "extutil.h" ++#include + + #include + +diff -Nur panel.orig/FGLRXExtensions.c panel/FGLRXExtensions.c +--- extra_src/panel/FGLRXExtensions.c 2004-09-12 10:48:59.000000000 +0300 ++++ extra_src/panel/FGLRXExtensions.c 2004-09-12 10:49:18.000000000 +0300 +@@ -18,7 +18,7 @@ + + #include + #include +-#include "extutil.h" ++#include + + #include + +diff -Nur panel.orig/Makefile panel/Makefile +--- extra_src/panel/Makefile 2004-09-12 10:48:59.000000000 +0300 ++++ extra_src/panel/Makefile 2004-09-12 10:49:52.000000000 +0300 +@@ -37,28 +37,16 @@ + # resolve target platform + # (on cross compiles this must be a commandline parameter) + PLATFORMTYPE = $(shell uname -m) +-ifeq ($(PLATFORMTYPE), ia64) +-LIBQT_STATIC = libqt64.a +-LIBQT_DYN = qt +-LIB_DIR = lib +-else +-ifneq ($(findstring $(PLATFORMTYPE), i386 i486 i586 i686), ) ++ifneq ($(findstring $(PLATFORMTYPE), ia64 x86_64 i386 i486 i586 i686), ) + LIBQT_STATIC = libqt.a +-LIBQT_DYN = qt +-LIB_DIR = lib +-else +-ifeq ($(PLATFORMTYPE), x86_64) +-LIBQT_STATIC = libqtx86_64.a + LIBQT_DYN = qt-mt +-LIB_DIR = lib64 ++LIB_DIR = lib + else + LIBQT_STATIC = libunknownplatform.a + LIBQT_DYN = qtunknown + LIB_DIR = unknowndir + $(error Unknown Platform) + endif +-endif +-endif + + + # ======================================== +@@ -343,7 +331,7 @@ + $(STRIP) $@ + bzip2 -c $@ >$@.bz2 + rm -f $(BASENAME) +- ln -s $@ $(BASENAME) ++ ln $@ $(BASENAME) + + + $(TARGET1): $(TARGET1_OBJECTS) +@@ -401,20 +389,9 @@ + + + install:: +- cp $(TARGET0) /usr/X11R6/bin/. +- cd /usr/X11R6/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME) +- cp LICENSE.GPL /usr/X11R6/bin/. +- cp LICENSE.QPL /usr/X11R6/bin/. +- if [ $KDEDIR ]; then\ +- cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\ +- cp ati.xpm $(KDEDIR)/share/icons/. ;\ +- fi +- if test -d /usr/share/gnome/apps; then \ +- cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\ +- if test -d /usr/share/pixmaps; then \ +- cp ati.xpm /usr/share/pixmaps/. ;\ +- fi ;\ +- fi ++ cp $(BASENAME) $(DESTDIR)/usr/bin/. ++ cp ati.xpm $(DESTDIR)/usr/share/icons/. ; \ ++ cp ati.xpm $(DESTDIR)/usr/share/pixmaps/. ; \ + + source_package:: + @if [ -f $(PACKET_NAME).tar ]; then \ --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ati/fireglcontrol.desktop +++ linux-restricted-modules-2.6.17-2.6.17.5/ati/fireglcontrol.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Name=ATI Control +Comment=ATI graphics adapter settings +SwallowExec= +BinaryPattern= +Icon=ati.xpm +MiniIcon=ati.xpm +Protocols= +MimeType= +Exec=/usr/bin/fireglcontrol +TerminalOptions= +Path=/usr/bin +DocPath= +Type=Application +Terminal=0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ltmodem/lt_modem.c +++ linux-restricted-modules-2.6.17-2.6.17.5/ltmodem/lt_modem.c @@ -120,14 +120,14 @@ static int vendor_id = 0; static int device_id = 0; -MODULE_PARM(vendor_id, "i"); +module_param(vendor_id, int, 0400); MODULE_PARM_DESC(vendor_id, "Vendor ID of the Lucent Modem e.g. vendor_id=0x11c1"); -MODULE_PARM(device_id, "i"); +module_param(device_id, int, 0400); MODULE_PARM_DESC(device_id, "Device ID of the Lucent Modem e.g. device_id=0x0440"); static int Forced[4] = {-1,-1,-1,0}; -MODULE_PARM(Forced, "4i"); +module_param_array(Forced, int, NULL, 0400); MODULE_PARM_DESC(Forced, "Forced Irq,BaseAddress,ComAddress[,NoDetect] of the Lucent Modem e.g. Forced=3,0x130,0x2f8"); static --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz64/fcdslslusb/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz64/fcdslslusb/src/main.c @@ -92,7 +92,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz64/fcdslusb/1/fritz/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz64/fcdslusb/1/fritz/src/main.c @@ -77,7 +77,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz64/fcdslusb/2/fritz/src/main.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz64/fcdslusb/2/fritz/src/main.c @@ -92,7 +92,7 @@ static struct usb_driver usb_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .name = TARGET, .id_table = usb_id_table, .probe = usb_probe, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/fritz64/fcpci/src/fcpcmcia_cs.c +++ linux-restricted-modules-2.6.17-2.6.17.5/fritz64/fcpci/src/fcpcmcia_cs.c @@ -546,7 +546,7 @@ } /* cs_event */ static struct pcmcia_driver cs_driver = { - .owner = THIS_MODULE, +// .owner = THIS_MODULE, .drv = { .name = "fcpcmcia_cs", }, --- linux-restricted-modules-2.6.17-2.6.17.5.orig/ipw3945/ipw3945.modprobe +++ linux-restricted-modules-2.6.17-2.6.17.5/ipw3945/ipw3945.modprobe @@ -0,0 +1,4 @@ +install ipw3945 /sbin/modprobe --ignore-install ipw3945 ; sleep 0.5 ; \ + /sbin/ipw3945d-$(uname -r) --quiet +remove ipw3945 /sbin/ipw3945d-$(uname -r) --kill ; \ + /sbin/modprobe -r --ignore-remove ipw3945 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/changelog +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/changelog @@ -0,0 +1,1254 @@ +linux-restricted-modules-2.6.17 (2.6.17.5-3) edgy; urgency=low + + * Temporary fixup for default acx111 v16 and v17 firmware. Set default to + 1.2.1.34. Next time the .orig.tar.gz is recreated, remove the default + symlinks, and we'll always generate them in the rules file. + + -- Ben Collins Tue, 19 Sep 2006 12:17:37 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-2) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-8.21. + + -- Ben Collins Mon, 18 Sep 2006 11:02:00 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-1) edgy; urgency=low + + * ABI bump. + * Include vmware-player modules. vmware-server modules coming soon. + * Rework package names based on recent kernel changes. + * Add vmware-player vmmon and vmnet kernel modules. These are from + vmware-player 1.0.2. + + -- Ben Collins Wed, 30 Aug 2006 13:00:06 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.4-1) edgy; urgency=low + + * Repack the orig with the correct nvidia-legacy package for amd64, this + time including 32-bit libraries. Revert the previous change to cope. + + -- Adam Conrad Wed, 30 Aug 2006 19:01:32 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.3-2) edgy; urgency=low + + * Adjust some static strings in debian/rules to cope with nvidia changing + the filename for the amd64 nvidia-legacy package, resolving amd64 FTBFS. + + -- Adam Conrad Wed, 30 Aug 2006 11:09:14 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.3-1) edgy; urgency=low + + * Update fglrx to new upstream 8.28.8, required to support edgy's Xorg 7.1: + - Include links in xorg-driver-fglrx for the new libfglrx_tvout library. + - Include binaries from /usr/sbin and manpages from /usr/share/man/man8. + * Update non-legacy NVIDIA driver to new upstream 1.0.8774 and legacy NVIDIA + driver to new upstream 1.0.7184, both required for Xorg 7.1 support. + * Bump xserver-xorg-core dependencies to (>= 1:1.1.1) for the above changes. + + -- Adam Conrad Tue, 29 Aug 2006 22:16:27 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.2-1) edgy; urgency=low + + * ipw3945: Update ipw3945d to 1.7.22. + * madwifi: Remove legacy and ng drivers. Replace with stock madwifi-ng 0.9.2 + driver. + * dvb: Added dvb firmware. + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-6.17. + + -- Ben Collins Wed, 9 Aug 2006 14:37:41 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.1-6) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-5.9. + + -- Colin Watson Sat, 15 Jul 2006 18:42:13 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.1-5) edgy; urgency=low + + * Provides: xserver-xorg-video instead of xserver-xorg-driver. + + -- Fabio M. Di Nitto Thu, 13 Jul 2006 13:58:25 +0200 + +linux-restricted-modules-2.6.17 (2.6.17.1-4) edgy; urgency=low + + * debian/nvidia-glx.dirs.in: Add missing /usr/lib32/nvidia to fix ia32-libs + installation breakage when nvidia-glx is installed (otherwise the + libGL.so.1.2 diversion points into a nonexisting directory). + + -- Martin Pitt Thu, 13 Jul 2006 10:36:35 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-3) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-4.5. + + -- Ben Collins Fri, 30 Jun 2006 14:54:34 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-2) edgy; urgency=low + + * Work around buggy binutils by not stripping pre-build nvidia libs. + + -- Ben Collins Thu, 29 Jun 2006 18:14:21 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-1) edgy; urgency=low + + * 2.6.17 kernel, glad to meet ya. + * s/ia32-libs/libc6-i386/ on amd64 build-deps. + * Use gcc on non-hppa, instead of gcc-4.0. + * ATI + - Add patch to fix no_iommu missing error. + - Add patch to rework the makefile, since it's targets were clashing + somehow with kbuil built-in targets. + * Nvidia + - Update legacy driver to 7182 + * Fritz + - Disable fcpcmcia and fcpcmcia_cs. No longer build, no longer supported. + + -- Ben Collins Tue, 27 Jun 2006 21:05:50 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.11-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-24. + + -- Ben Collins Fri, 9 Jun 2006 15:36:34 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.11-1) dapper; urgency=low + + * Update non-legacy NVIDIA driver to 1.0.8762, legacy still at 1.0.7174: + - Added support for QuadroFX 4500 X2, FX 5500, FX 3500, and FX 1500. + - Confirmed that it fixes dual DVI connections, which weren't working + at all in the last driver, on any card (closes: launchpad.net/42258) + - Confirmed that this new version can drive several laptops sporting + 5x00go chipsets that both the previous drivers refused to work with. + * Update fglrx to 8.25.18, now claiming to "officially" support Xorg 7.0: + - Add support for FireGL V7350, V7300, V7200, V5200, V3400, V3350, V2200. + - Confirmed that running two simultaneous Xservers no longer hardlocks. + - Fixes segfaults on Xserver init with several of the new X1xxx cards. + - Confirmed fix for shutdown hangs on at least two different machines. + - Confirmed fix for hangs on VT switch on my ATI Radeon Mobility M300. + * Make nvidia-glx and xorg-driver-fglrx provide xserver-xorg-driver, so + people can remove all their other drivers and streamline their systems. + * Only build ltmodem on the 386 kernel, as it's been shown to not behave + on SMP kernels, causing kernels to panic (closes: launchpad.net/46685) + * Mangle the *modnames structs in madwifi-ng, fixing the internal module + system, so the driver isn't stillborn (closes: launchpad.net/47137) + + -- Adam Conrad Mon, 29 May 2006 02:30:08 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.10-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-23. + + -- Ben Collins Thu, 18 May 2006 12:31:19 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.10-1) dapper; urgency=low + + * Add madwifi-ng support + + -- Matthew Garrett Tue, 16 May 2006 13:45:04 +0100 + +linux-restricted-modules-2.6.15 (2.6.15.9-4) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-22. + + -- Adam Conrad Mon, 8 May 2006 11:42:20 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-3) dapper; urgency=low + + * Add patch from madwifi upstream to fix usage of the pm_message_t type + on recent kernels (version 2.6.11 and higher), which eliminates some + compiler warnings, and may make suspend/resume happier with madwifi. + * Brown paper bag fix: add a missing semicolon in the build-udebs rule. + + -- Adam Conrad Mon, 24 Apr 2006 00:29:32 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-2) dapper; urgency=low + + * Mangle the build-udebs target in debian/rules to conditionalise it to + only try to copy the bits we want when we have them, fixing the build + failure introduced on powerpc when I added ipw3945d to the nic udeb. + + -- Adam Conrad Sun, 23 Apr 2006 23:49:22 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-1) dapper; urgency=low + + * Update fglrx to 8.24.8, which includes support for the Radeon X1n00 series + and the Mobility Radeon X1n00 series cards (closes: launchpad.net/39924) + * Include the binary-only ipw3945 daemon to go with the driver that has been + added to the latest Ubuntu kernel series (closes: launchpad.net/36684) + * Include a modprobe.d file for ipw3945 that loads the ipw3945d daemon when + the module is loaded, and kills it off before the module is unloaded. + * Add the above ipw3945d hacks to the nic-restricted-modules udebs for d-i. + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-21. + + -- Adam Conrad Sat, 22 Apr 2006 02:23:52 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.8-1) dapper; urgency=low + + * Update non-legacy NVIDIA driver to 1.0.8756, legacy still at 1.0.7174: + - Drop patches 001 through 006, all incorporated in the new version. + - Includes improved power management support, and support for all the + latest/shiniest NVIDIA hardware, (closes: launchpad.net/{38637,35628}) + * Fix whitespace in fglrx rules file (closes: launchpad.net/{32576,23250}) + * Stop having nvidia-glx-enable add the nvidia kernel modules to the end + of /etc/modules, since it is properly autoloaded by the X server. This + stops us breaking /etc/modules as a bonus (closes: launchpad.net/27579) + + -- Adam Conrad Mon, 10 Apr 2006 14:51:39 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.7-4) dapper; urgency=low + + * Test for /sbin/lrm-manager in our init script, for the case where we + have been removed, rather than purged (closes: launchpad.net/36705) + * Call ld with the '-d' switch in lrm-manager, to assign space in the + final ltmodem object for common symbols (closes: launchpad.net/37321) + * Install the missing libnvidia-cfg.so.1 (closes: launchpad.net/34912) + * Kernel ABI bump for linux-source-2.6.15 2.6.15-20. + + -- Adam Conrad Wed, 5 Apr 2006 14:15:27 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.7-3) dapper; urgency=low + + * Incorporate patch by Robert Love and Dan Williams needed for WPA support + in NetworkManager 0.6.0, backported to madwifi-old by Johan Kiviniemi. + * nvidia-glx (but not -legacy) needs to conflict with nvidia-xconfig, as + we've recently absorbed that binary as well (closes: launchpad.net/6600) + + -- Adam Conrad Sat, 18 Mar 2006 04:36:08 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.7-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-19. + + -- Ben Collins Mon, 20 Mar 2006 16:21:45 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.7-1) dapper; urgency=low + + * Update to fglrx 8.23.7, including support for a wide range of desktop + and mobile Radeon X800 and X850 series video cards, as well as FSAA. + * Freshen AVM Fritz drivers to the latest upstream builds (still 3.11) + * Kernel ABI bump for linux-source-2.6.15 2.6.15-18. + + -- Adam Conrad Fri, 10 Mar 2006 11:51:14 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.6-3) dapper; urgency=low + + * Stop using the hideous "mangle TLS symlinks on boot" hack, which was + second-guessing our linker (which appears to do the right thing anyway) + - Removed the init script and /etc/default fragment from nvidia-glx + - Install TLS libraries directly to /usr/lib/tls and /usr/lib32/tls. + * Make nvidia-glx-config use /var/lib/x11 instead of /var/lib/xfree86. + * These changes fix launchpad.net/33456 and launchpad.net/{32878,29234} + + -- Adam Conrad Tue, 7 Mar 2006 14:21:22 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.6-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-17. + + -- Ben Collins Fri, 3 Mar 2006 07:30:19 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.6-1) dapper; urgency=low + + * Update fglrx to 8.22.5 (UVF exception granted by mdz) which, among + other things, finally claims to "officially" support kernel 2.6.15. + * Drop ati/patches/fglrx-2.6.15.patch, which is no longer necessary. + * Add proper symlinks and shlibs for the new libfglrx_dm library. + * Add .so symlinks to xorg-driver-fglrx-dev for the libraries we ship. + * Kernel ABI bump for linux-source-2.6.15 2.6.15-16. + + -- Adam Conrad Tue, 21 Feb 2006 17:51:20 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.5-2) dapper; urgency=low + + * Change boot-time message. + + -- Scott James Remnant Wed, 8 Feb 2006 14:54:08 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.5-1) dapper; urgency=low + + * Change maintainer to the Ubuntu Kernel Team, in an attempt to do a + soft transition from sole maintenance to handing over to Ben and Co. + * Update fglrx to version 8.21.7, which claims to support OpenGL 2.0. + * Adjust for the corrected SONAMEs (thanks, ATI!) of libfglrx_gamma.so.1 + and libfglrx_pp.so.1 (used to be libfglrx_pp.1 and libfglrx_gamma.1) + * Drop ati/patches/panel_fglrx_pp_proto.patch, fixed in upstream source. + * nvidia-glx conflicts with nvidia-settings, as we now ship that binary + ourselves directly from upstream sources (Closes launchpad.net/27040) + * Add nvidia/patches/003_NVIDIA_kernel-1.0-8178-change_page_attr.patch, + resolving crashes with some broken implementations of change_page_attr() + * Add nvidia/patches/004_NVIDIA_kernel-1.0-8178-gcc-4.1_fix.patch, making + the compiler tests more robust in the face of recent GCC 4.x changes. + * Add nvidia/patches/005_NVIDIA_kernel-1.0-8178-2.6.15-git8.patch, fixing + a build failure with certain versions of the linux source (not ours) + * Add nvidia/patches/006_NVIDIA_kernel-1.0-8178-PAT_fix.patch, which + makes us fall back to using MTRRs if our CPU does not support PAT. + * Kernel ABI bump for linux-source-2.6.15 2.6.15-15. + + -- Adam Conrad Wed, 8 Feb 2006 20:20:16 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.4-4) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-14. + + -- Ben Collins Wed, 25 Jan 2006 23:17:24 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.4-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-13 (Look Adam!! I got it + right the first time!!). + + -- Ben Collins Thu, 19 Jan 2006 17:47:14 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.4-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-12. + + -- Adam Conrad Fri, 13 Jan 2006 16:20:42 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.4-1) dapper; urgency=low + + * Include a config file, /etc/default/linux-restricted-modules-common, + allowing users to disable link-on-boot for individual drivers, thus + making it easier to keep linux-restricted-modules installed while also + installing updates from 3rd parties (like those nvidia or ati provide) + * Update non-legacy NVIDIA driver to 1.0.8174, legacy still at 1.0.7174: + - Drop incorporated patches (AGP_kernel_BUG.patch and broken_paths.patch) + - Carry forward unfixed patches (pm_fixes.patch and vm_insert_page.patch) + - Add libgtk2.0-dev to our build-deps to get proper GTKish dependencies + for the nvidia-settings binary, which is installed to nvidia-glx. + * Mangle fglrx sources and how we build them to make things actually work: + - Rearrange basedir of fglrx patches and unpack target in debian/rules to + not require individual patch calls in debian/rules for each new patch + - Very carefully edit libGL.so.1.2 (x3) with a hex editor (original files + are saved in the tarball as .orig, for comparison) to point at the new + path at /usr/lib{,32}/dri instead of /usr/X11R6/lib{,64}/modules/dri + - Add a shlibs file for xorg-driver-fglrx to cover the two shared libs + that we ship in that package (libfglrx_pp.1 and libfglrx_gamma.1) + - Apply fglrx-2.6.15.patch, which should make fglrx happy on new kernels. + * Update ltmodem drivers to 8.31+2.6-alk-8: + - Works around some broken versions of wvdial which fail if they are + unable to change baud rate (which makes no sense with softmodems) + - Drop our patch to compile correctly on 2.6.15, incorporated upstream. + * Fix acx/readme.txt to use the correct module parameter (firmware_ver=XXX) + + -- Adam Conrad Thu, 5 Jan 2006 23:01:48 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.3-5) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-11. + + -- Ben Collins Wed, 4 Jan 2006 07:36:57 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-4) dapper; urgency=low + + * Really bump the ABI this time. + + -- Ben Collins Tue, 27 Dec 2005 17:22:49 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-10. + * No more amd64-k8-smp. + * Fix acx/readme.txt (fixed in diff, needs to be fixed in .orig.tar.gz + someday). + + -- Ben Collins Tue, 27 Dec 2005 11:48:22 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-2) dapper; urgency=low + + * Another kernel ABI bump, this time for linux-source-2.6.15 2.6.15-9. + * NOTE/WARNING: Yes, there is a fix for fglrx DRI, but I'm intentionally + not enabling it until fglrx on 2.6.15 is fixed somewhat, since enabling + DRI causes every machine I've seen so far to kernel panic constantly. + + -- Adam Conrad Wed, 21 Dec 2005 05:19:08 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.3-1) dapper; urgency=low + + * Include new firmware for acx100 USB, acx100 PCI and acx111 PCI to match + the layout that our shiny new driver expects to see, courtesy of BenC. + * Update non-legacy NVIDIA driver to 1.0.8174, legacy still at 1.0.7174. + - Install /usr/bin/nvidia-settings, /usr/bin/nvidia-xconfig, and their + manpages in nvidia-glx. nvidia-xconfig is provided to allow you to + create sample configs and customise your xorg.conf should you want to, + however, it's recommended most people don't use it as it conflicts + with how we currently configure X (nvidia-glx-config), and with how + we plan to do it in the future (re-seed debconf and re-run dexconf) + - Add NVIDIA_kernel-1.0-7174-global_flush_tlb.patch to work around + tickling buggy behaviour in global_flush_tlb on some amd64 kernels. + - Add NVIDIA_kernel-1.0-8174-pm_fixes.patch to fix power management + support in line with changes in the kernel as of version 2.6.14. + - Add NVIDIA_kernel-1.0-8174-broken_paths.patch to resolve a failure + to find the correct version of the kernel header tree built against. + - Add NVIDIA_kernel-1.0-8174-vm_insert_page.patch, adding support for + the new vm_insert_page() kernel interface introduced in 2.6.15-rc5. + - Add NVIDIA_kernel-1.0-8174-AGP_kernel_BUG.patch, resolving a situation + where the nvidia module can throw a kernel BUG on some AGP systems. + * Update ATI fglrx driver to version 8.20.8, now with PowerPlay support. + - Add panel_fglrx_pp_proto.patch to bring back the fglrx_pp_proto.h + header that seems to have mysteriously gone missing from this update. + - NOTE: This driver still DOES NOT correctly support kernel 2.6.15, + which is what we are shipping. If you use it, your system WILL crash, + very likely while in use, definitely when shutting down. We are + hoping to get this issue resolved upstream as soon as we possibly can. + * Another kernel ABI bump, this time for linux-source-2.6.15 2.6.15-8. + + -- Adam Conrad Tue, 13 Dec 2005 15:04:42 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.2-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-7 + + -- Ben Collins Tue, 6 Dec 2005 12:29:22 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.2-2) dapper; urgency=low + + * Make lrm-manager check for ld_static before running it; kernel-wedge + makes it hard for nic-restricted-modules-* to depend on + binutils-static-udeb, but for the moment I've just set the latter's + priority so that it will usually be there. + * d-i doesn't have /boot/System.map-*. If that isn't there but udpkg is (a + sanity check), just run 'depmod -a -q'. + + -- Colin Watson Mon, 5 Dec 2005 23:22:25 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.2-1) dapper; urgency=low + + * Update ltmodem drivers with Aleksey Kondratenko's hacked sources from + linmodems.technion.ac.il, which actually build on modern kernels. + * Add ltmodem/patches/pci_id.patch to locally define the PCI ID for the + PCI_DEVICE_ID_ATT_L56XMF device, which went away in recent 2.6.15-rcX. + * Fix generation of xorg-driver-fglrx-dev's deps to make it installable. + + -- Adam Conrad Mon, 5 Dec 2005 17:36:33 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.1-2) dapper; urgency=low + + * Brown paper bag fix: s,#/bin/sh,#!/bin/sh, in postinst (Ubuntu #20350) + + -- Adam Conrad Fri, 2 Dec 2005 15:18:04 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.1-1) dapper; urgency=low + + * Update madwifi driver to the trunk of the "madwifi-old" branch in the + madwifi.org SVN. Not sure if "madwifi-ng" is yet stable enough to trust. + * Stop cleaning away the postinst of linux-restricted-modules-common during + clean, so we actually get the init script migration from the last upload. + * Restore buildability on powerpc by changing KARCH from ppc to powerpc + and exporting TARGET=powerpc-be-eabi while doing madwifi's split-modules. + * Give nvidia-glx, nvidia-glx-legacy, and xorg-driver-fglrx versioned deps + on xserver-xorg-core (>= 1:0.99.0-1), since we use the new Xorg paths. + * Kernel ABI bump to 2.6.15-6 for linux-source-2.6.15_2.6.15-6.8. + + -- Adam Conrad Thu, 1 Dec 2005 18:35:31 +1100 + +linux-restricted-modules-2.6.15 (2.6.15-1) dapper; urgency=low + + * First linux-restricted-modules upload for Dapper's 2.6.15 kernel series. + * Update NVIDIA driver (non-legacy) to 1.0.7676, legacy still at 1.0.7174. + - Add NVIDIA_kernel-1.0-7174-bigram.patch, resolving an issue with the + legacy driver's inability to load on systems with 4GB of RAM or more. + - Add NVIDIA_kernel-1.0-7174-register_ioctl32.patch to get the legacy + driver to actually load on modern kernels, rather than erroring out. + - Add NVIDIA_kernel-1.0-7676-IOMMU-SWIOTLB.patch, resolving an issue + where the nvidia driver can trigger a kernel BUG() on amd64 systems + using either the IOMMU or the SWIOTLB. + - Add NVIDIA_kernel-1.0-{7174,7676}-change_page_attr.patch, working + around differing implementations of the change_page_attr() interface. + - Add NVIDIA_kernel-1.0-{7174,7676}-no-execute-page.patch, resolving + issues with amd64 system that don't support no-execute page protection. + * Update ATI fglrx driver to version 8.19.10, using the Xorg 6.9.0 loader. + - Drop ati/patches/fglrx-2.6.12-x86-64.patch, incorporated upstream + * Move a LOT of files around to accomodate two fundamental changes: + - Xorg has eliminated X11R6, and files now go to /usr/lib/{,xorg} + - firmware from /lib/hotplug/firmware/$FW-$KV to /lib/firmware/$KV/$FW + * Autogenerate debian/control better than we already did, by removing all + kernel versions and ABI versions from debian/control and have them + specified in debian/rules instead. + * Autogenerate d-i/kernel-versions as well, using the above mechanism. + * Drop linux-restricted-modules-nvidia-legacy package, and instead ship + the nvidia_legacy module in the main linux-restricted-modules package. + * Make nvidia-glx-legacy employ a modprobe.d hack to have the above work. + * Attempt to document which hardware is supported in nvidia-glx versus + nvidia-glx-legacy in the package descriptions. + * Stop using crazy *_minor versioning scheme, and just have the oddball + packages use a scheme of UpstreamVer+SourceVer (ie: 1.0.7676+2.6.15-1) + * Change the logic we use for diversions to divert lib32 stuff on arches + that MAY have lib32 directories, rather than testing for one on disk. + This eliminates weird issues seen when we're installed before ia32-libs. + * Move LRM init script from S15 to S07 in accordance with Scott's master + plan for faster boot times in dapper. + + -- Adam Conrad Wed, 30 Nov 2005 23:13:32 +1100 + +linux-restricted-modules-2.6.12 (2.6.12.4-14) dapper; urgency=low + + * Add a --kver=KERNEL_VERSION option to lrm-manager, so it can be asked to + act on specific kernel versions (handy for invocation in our postinst) + * Add --help to lrm-manager to document the fact that we now have two args. + * Replace "lrm-manager; depmod" with "lrm-manager --kver=@@KVERSION@@" in + the linux-restricted-modules and lrm-nvidia-legacy postinst scripts. + * Remove the touch --date call from lrm-manager. Since we're not running + depmod on boot anymore, this hack is no longer necessary. + + -- Adam Conrad Wed, 9 Nov 2005 23:01:12 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-13) dapper; urgency=low + + * Restore lrm-manager's depmod usage, but make both the init script and the + postinst use "lrm-manager --quick", so the previous changes still achieve + their goals, while the nic-restricted-modules postinst continues to work. + + -- Adam Conrad Wed, 9 Nov 2005 22:13:57 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-12) dapper; urgency=low + + * After installing, upgrading or removing any package we ship that + contains modules run depmod against the symbols and version of the + kernel that we ship them for. + * Drop support for lrm-manager to run depmod, as this would run it for + the current kernel rather than the installing one. Run depmod + yourself now. + + -- Scott James Remnant Wed, 9 Nov 2005 19:23:03 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-11) breezy; urgency=low + + * Enable atheros in debian-installer, by making lrm-manager the postinst + for nic-restricted-modules (fails gracefully if ld_static isn't around) + + -- Adam Conrad Tue, 11 Oct 2005 19:40:36 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-10) breezy; urgency=low + + * Increment all those evil *_minor versions yet again. + + -- Adam Conrad Tue, 11 Oct 2005 12:14:22 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-9) breezy; urgency=low + + * Mount the volatile tmpfs with mode 0755 + + -- Matt Zimmerman Mon, 10 Oct 2005 18:00:46 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.4-8) breezy; urgency=low + + * Have lrm-manager touch everything in /lib/modules/"$KVER"/volatile/ to + a timestamp one day in the future, to account for possible timestamp + and timezone skews, so the later call to depmod --quick will work. + * Shrink the nic-restricted-modules udeb to only contain madwifi. Even + if we don't end up using this in the installer, the udeb was HUGE and + needed to be shrunk, so lowmem installs can extract it without dying. + * Remove the volatile mount and directory on removal/purge. (#16310) + + -- Adam Conrad Wed, 5 Oct 2005 14:53:12 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-7) breezy; urgency=low + + * Increment *_minor. + + -- Colin Watson Fri, 23 Sep 2005 13:01:21 +0100 + +linux-restricted-modules-2.6.12 (2.6.12.4-6) breezy; urgency=low + + * Fix the ABI versioning for the avm-fritz-firmware-2.6.12 stuff. Oops. + + -- Adam Conrad Fri, 23 Sep 2005 19:55:22 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-5) breezy; urgency=low + + * Kernel ABI bump from -8- to -9- for all kernel module packages and udebs. + * Fix FTBFS on architectures that aren't building nvidia packages. + * Make sure nvidia-legacy-kernel-source actually ships files, and refresh + the outdated nvidia*kernel-source debian directory while we're in there. + * Adjust some more to the new reality that libGL now lives in /usr/lib + and /usr/lib32, rather than /usr/X11R6/lib{,32} (should fix bug #15473) + + -- Adam Conrad Fri, 23 Sep 2005 15:01:39 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-4) breezy; urgency=low + + * Re-work the nvidia-glx/nvidia-glx-legacy split to make all our debian/* + files autogenerated in debian/rules, so we can do clever things, like get + the right directories and package names in maintainer scripts and such. + * Make sure that diversions are happening, and are owned by the correct + packages, to avoid overwrite errors (as seen in Ubuntu bug #15962) + * Remove old broken diversions made by the preinst of the first uploads + of the nvidia-glx-legacy packages, so we don't get diversion conflicts. + * Stop having nvidia-glx-legacy replace nvidia-glx, as this is hideously + broken and incorrect, and dpkg will take interesting shortcuts with + Conflicts/Provides/Replaces triplets that can lead to diversions blowing + up when we try to install one and we already have the other installed. + * Make nvidia-glx-legacy-dev conflict with nvidia-glx-dev to ensure that + the latter is always deconfigured before the former is (pre)installed. + * Fix up some instances where files weren't being installed to the -legacy + packages, like the TLS libraries and nvidia-glx-config (Ubuntu #15828) + * Fix the clean target to actually clean all the *legacy* generated files. + * Build-dep on libstdc++5, rather than hardcoding our library dependencies. + * Put myself in the maintainer field, may god have mercy on my soul. + + -- Adam Conrad Tue, 20 Sep 2005 18:17:15 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-3) breezy; urgency=low + + * Really add xorg-driver-fglrx Depends: libstdc++5 + + -- Fabio M. Di Nitto Mon, 19 Sep 2005 14:50:45 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.4-2) breezy; urgency=low + + * Fix build-deps for SCC architectures. + * And another *_minor dance, of course. + + -- LaMont Jones Fri, 16 Sep 2005 17:43:56 -0600 + +linux-restricted-modules-2.6.12 (2.6.12.4-1) breezy; urgency=low + + * New tarball to remove madwifi cruft (Ubuntu Bugzilla #15592) + * Do the *_minor dance + + -- Matt Zimmerman Fri, 16 Sep 2005 15:46:03 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.3-6) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Fix xorg-driver-fglrx-dev Depends: + (Closes: #15561) + + * Make nvidia-glx{,-legacy} Conflicts with xorg-driver-fglrx since all of + them provides diversion for libGL and they can't be installed at the same + time. + + -- Fabio M. Di Nitto Fri, 16 Sep 2005 09:31:08 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-5) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * fglrx-control /usr/X11R6/bin -> /usr/bin transition. + + -- Fabio M. Di Nitto Fri, 16 Sep 2005 06:41:47 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-4) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * readd ati minors in version generation. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 14:00:34 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-3) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * The "When can we get root and chroots?" ;) aka B-D ia32-libs on amd64. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 13:27:37 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-2) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Fix (AGAIN) nvidia-legacy install target for amd64. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 11:03:33 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-1) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Reimport madwifi patches to build on ppc. + + * Readd patch fglrx-2.6.12-x86_64.diff still required to build on amd64. + + * Fix nvidia-legacy install target for amd64. + + Changes by Daniel Stone: + + * Bump to new fglrx upstream version 8.16.20. + + Adds support for mobile chipsets which were previously only supported in + 8.13 and not 8.14. + + Switches to version built against DRI protocol 5.0.0, making it usable + with our current server (closes: Ubuntu#13538). Since this is built for + a server using dlloader, relink fglrx_drv.so -> fglrx_drv.o and + libfglrxdrm.so -> libfglrxdrm.a. + + Remove fglrx-2.6.12-new-agpgart.diff, fglrx-2.6.12-inter_module_get.diff + and fglrx-2.6.12-x86_64.diff, since the new upstream version already + supports 2.6.12. + + Remove fglrx-2.6-agpgart.diff, which has already been applied upstream. + + Add fglrx-panel-style.diff, which removes the call to force the style fo + the Windows style, as it is no longer built in to our version of Qt. + + Add dependency on libstdc++5, since the DRI modules are built against + that version (closes: Ubuntu#14255). + + Revert change from 2.6.12.1-2. ati_base_xorg_version is now 6.8.0 + instead of 6_8_0. ati_xorg_package_version no longer exists. + + Move utilities to /usr/bin (closes: Ubuntu#14383). + * Add nvidia legacy driver support, which is currently just the old driver + version (1.0-7174) (closes: Ubuntu#14210). Since it still uses the + 'nvidia' kernel module, ship + linux-restricted-modules-2.6.12-*-nvidia-legacy. Add + nvidia-glx{,-dev}-legacy and nvidia-kernel-source-legacy. + * Remove support for multiple nvidia driver versions, as they do not seem to + be releasing any ia64 drivers any more (i.e. no more support for 5336). + * Call lrm-manager from postinst, and use ld-static in lrm-manager, instead + of ld (closes: Ubuntu#14115, Ubuntu#13952). + * Fix clean target: remove nic-restricted-*. + * Add ltmodem licence to debian/copyright (closes: Ubuntu#13830). + * Remove nonsensical 'Provides: xserver' from nvidia-glx. + * Change dependencies on xserver-xorg to -core, and nvidia's xserver-common + dependency to one of -xorg-core, -xorg, or -xfree86; having xserver-common + installed is no guarantee that we'll have a working server which supports + the nvidia driver. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 09:55:59 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-12) breezy; urgency=low + + * Man, this package is bringing out the worst in me. Let's try to + get the minor's and stuff working this time. + + -- Ben Collins Tue, 30 Aug 2005 23:22:59 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-11) breezy; urgency=low + + * Increment *_minor + + -- Ben Collins Tue, 30 Aug 2005 20:54:03 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-10) breezy; urgency=low + + * Bump kernel ABI. + + -- Ben Collins Tue, 30 Aug 2005 17:21:20 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-9) breezy; urgency=low + + * Increment *_minor + + -- Matt Zimmerman Mon, 29 Aug 2005 13:40:00 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-8) breezy; urgency=low + + * Skip depmod invocation if lrm-manager is invoked with --quick + * Invoke lrm-manager with --quick in the init script + + -- Matt Zimmerman Mon, 29 Aug 2005 11:29:04 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-7) breezy; urgency=low + + * Add LSB status messages to init script + + -- Matt Zimmerman Mon, 29 Aug 2005 11:23:55 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-6) breezy; urgency=low + + * hppa, ia64, sparc fixes. + + -- LaMont Jones Fri, 26 Aug 2005 14:53:48 -0600 + +linux-restricted-modules-2.6.12 (2.6.12.2-5) breezy; urgency=low + + * And remember to update all the minor revisions for the binary packages. + + -- Adam Conrad Sun, 21 Aug 2005 21:17:18 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.2-4) breezy; urgency=low + + * Fix dependencies for nvidia-glx{,-dev} for the xorg -> mesa transition. + + -- Adam Conrad Sun, 21 Aug 2005 19:02:34 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.2-3) breezy; urgency=low + + * Bump Kernel ABI. + + -- Fabio M. Di Nitto Fri, 19 Aug 2005 07:38:23 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-2) breezy; urgency=low + + * Always divert the libGL.so.* files, else installing ia32-libs after + xorg-driver-fglrx will fail. + + -- Tollef Fog Heen Mon, 15 Aug 2005 14:42:51 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-1) breezy; urgency=low + + * Fritz drivers: + - Update fritz drivers. + - Add fritz drivers for amd64. + - Remove fcpnp driver, which FTBFS, not supported anymore. + - Fix linking of pcmcia_cs module. + * Increment *_minor. + + -- Matthias Klose Thu, 11 Aug 2005 12:18:46 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.1-8) breezy; urgency=low + + * Ensure that KERNELPATH is passed to the madwifi Makefile + + -- Matt Zimmerman Sun, 7 Aug 2005 21:58:47 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-7) breezy; urgency=low + + * Use the faster depmod -A rather than depmod -a + * Fix handling of module names + * Simplify and automate determining which objects make up each module + * Simplify lrm-manager not to require hardcoded lists of objects + * Use /lib/modules/$VER/volatile rather than .../kernel/drivers/volatile + * Increment *_minor + * Add versioned dependencies on linux-restricted-modules-common + * Don't install all of madwifi in volatile, only ath_hal + * Temporarily disable fcpcmcia_cs; it needs more fiddling to work with + the new scheme + + -- Matt Zimmerman Thu, 4 Aug 2005 20:44:01 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-6) breezy; urgency=low + + * Increment all of the minor revisions + + -- Matt Zimmerman Thu, 4 Aug 2005 08:41:00 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-5) breezy; urgency=low + + * Ensure .ko extension for volatile modules + * Update Section to match overrides (restricted/misc) + + -- Matt Zimmerman Wed, 3 Aug 2005 22:25:03 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-4) breezy; urgency=low + + * Fix fglrx version numbering + + -- Matt Zimmerman Wed, 3 Aug 2005 20:13:56 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-3) breezy; urgency=low + + * Get things building again after -2 + + -- Matt Zimmerman Wed, 3 Aug 2005 18:15:22 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-2) breezy; urgency=low + + * Use 6.8.0 rather than 6_8_0 as the xorg base version, as previous versions + did. This change was not documented, so I don't know why it was made, + and underscores are not valid in package version numbers. Hopefully + doesn't break anything. + + -- Matt Zimmerman Wed, 3 Aug 2005 16:41:39 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-1) breezy; urgency=low + + * New upstream releases. + * New object linking infrastructure + + -- Matt Zimmerman Wed, 3 Aug 2005 11:25:35 -0700 + +linux-restricted-modules-2.6.10 (2.6.10.6-1) breezy; urgency=low + + * Update fglrx to 8.12.10, released today. + + Patch to build with 2.6.10 is no longer necessary. + * Reset atiminor to 0ubuntu1; bump minor for everything else. + + -- Daniel Stone Fri, 8 Apr 2005 16:00:19 +1000 + +linux-restricted-modules-2.6.10 (2.6.10.5-1) hoary; urgency=low + + * Update nVidia driver to 1.0-7174, and remove agpgart patch (which has been + merged). + * Reset nvidiaminor to 0ubuntu1; bump minor for everything else. + * Clean up nvidia-glx.examples (generated file). + + -- Daniel Stone Sat, 2 Apr 2005 12:42:49 +1000 + +linux-restricted-modules-2.6.10 (2.6.10.4-1) hoary; urgency=low + + * New NVIDIA upstream release (1.0-7167) + agpart patch. + + * Double bump *_minor to allow all the nice guys that have done testing + for us, to upgrade and be in sync with archive. + + -- Fabio M. Di Nitto Thu, 31 Mar 2005 18:49:31 +0200 + +linux-restricted-modules-2.6.10 (2.6.10.3-8) hoary; urgency=low + + * Bump *_minor. + + -- Fabio M. Di Nitto Tue, 15 Mar 2005 17:44:06 +0100 + +linux-restricted-modules-2.6.10 (2.6.10.3-7) hoary; urgency=low + + * Update for 2.6.10-5. + * Bump *_minor. + * Remove unneeded binary modules from nvidia-kernel-source (closes: + Ubuntu#6785). + + -- Daniel Stone Tue, 15 Mar 2005 22:20:05 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-6) hoary; urgency=low + + * Update AVM copyright text. + * Bump *_minor. + + -- Matthias Klose Sun, 13 Mar 2005 20:07:37 +0100 + +linux-restricted-modules-2.6.10 (2.6.10.3-5) hoary; urgency=low + + * Update for 2.6.10-4. + * Bump *_minor. + + -- LaMont Jones Mon, 21 Feb 2005 20:46:28 -0700 + +linux-restricted-modules-2.6.10 (2.6.10.3-4) hoary; urgency=low + + * Update for 2.6.10-3. + * Bump *_minor. + + -- Colin Watson Tue, 8 Feb 2005 10:42:03 +0000 + +linux-restricted-modules-2.6.10 (2.6.10.3-3) hoary; urgency=low + + * Change --with-kernel-dir to --with-kernel for ltmodem. + * Bump *_minor. + + -- Daniel Stone Thu, 27 Jan 2005 13:27:43 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-2) hoary; urgency=low + + * Bump *_minor. + + -- Daniel Stone Tue, 25 Jan 2005 05:20:01 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-1) hoary; urgency=low + + * Include ltmodem source. + * Make x{org,free86}-driver-fglrx install an Xsession.d file which sets + LIBGL_DRIVER_PATH=/usr/X11R6/lib/modules/dri:/usr/X11R6/lib32/modules/dri + on directories where fglrx is set up with lib and lib64, so 32-bit GL apps + can still work. + + -- Daniel Stone Thu, 20 Jan 2005 11:30:12 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.2-2) hoary; urgency=low + + * Change fglrx-control's Depends to be xorg-driver-fglrx | + xfree86-driver-fglrx. + * Kill off fglrx-driver altogether, and have x{org,free86}-driver-fglrx + Conflicts/Replaces/Provides it; ditto fglrx-driver-dev (closes: + Ubuntu#5630). + * Divert /usr/lib32/libGL.so.* as well in + xorg-driver-fglrx/xfree86-driver-fglrx (closes: Ubuntu#5627). + * Synchronise xorg-driver-fglrx.links* to xfree86-driver-fglrx. + * Update nvidia-glx-config help text (closes: Ubuntu#5320). + * Bump *_minor. + + -- Daniel Stone Tue, 18 Jan 2005 14:30:04 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.2-1) hoary; urgency=low + + * Update fglrx driver to 8.8.25 (new Catalyst series); this version adds + support for X.Org and amd64. Update Build-Depends accordingly; split + fglrx-driver into xfree86-driver-fglrx and xorg-driver-fglrx, and + fglrx-driver-dev into xfree86-driver-fglrx-dev, and xorg-driver-fglrx-dev. + The original packages are retained as dummy packages. Bump versions + accordingly. Change 'grafics' to 'graphics' in ati/*.desktop. Add + 8.08-kernel-2.6.10.patch, an official ATI patch to deal with changed + pci_*() semantics in 2.6.10. Update list of supported cards. Add libGL + diversions for fglrx. + * Fix dependencies between l-r-m-2.6.10-2-power* and l-i-2.6.10-2-power*; this + fix seems to have got lost in a previous revision. + * Change l-r-m -> avm-fritz-firmware from Depends to Recommends. + * Bump nvidia_minor, ati_minor, avm_minor. + + -- Daniel Stone Sat, 8 Jan 2005 05:10:17 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.1-1) hoary; urgency=low + + * Reupload with unpacked avm tarball. + * Bump nvidia_minor, ati_minor, avm_minor. + + -- Matthias Klose Sat, 15 Jan 2005 21:21:15 +0100 + +linux-restricted-modules-2.6.10 (2.6.10-6) hoary; urgency=low + + * Add AVM ISDN drivers (as uuencoded tarball, unpack them for the next upload + of an .orig tarball). + * Bump nvidia_minor and ati_minor. + + -- Matthias Klose Sat, 15 Jan 2005 17:37:18 +0100 + +linux-restricted-modules-2.6.10 (2.6.10-5) hoary; urgency=low + + * Fix minor numbers + + -- LaMont Jones Thu, 13 Jan 2005 17:04:24 -0700 + +linux-restricted-modules-2.6.10 (2.6.10-4) hoary; urgency=low + + * Update for 2.6.10-2-*. + + -- Daniel Stone Thu, 13 Jan 2005 21:21:11 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-3) hoary; urgency=low + + * ati/patches/agpgart_be.patch: add fglrx kernel patch to reflect changed + function name in 2.6.10. + + -- Daniel Stone Sat, 8 Jan 2005 04:57:20 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-2) hoary; urgency=low + + * Bump nvidiaminor and atiminor. + + -- Daniel Stone Sat, 8 Jan 2005 02:02:51 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-1) hoary; urgency=low + + * Update to 2.6.10. + * Update madwifi driver to current CVS, to build with 2.6.10. + * Add two nVidia patches from Thomas Vander (see nvnews.net) to fix + compilation against 2.6.10 for 6629; 5111 (the current latest on ia64) + does not work with .10. + * Change Maintainer field to myself. + * Add /etc/default/nvidia-glx and /etc/init.d/nvidia-glx to nvidia-glx's + conffiles. + + -- Daniel Stone Thu, 6 Jan 2005 01:19:18 +1100 + +linux-restricted-modules-2.6.9 (2.6.9-11) hoary; urgency=low + + * [arch]-style dependencies don't work in the binary package parts of + debian/control. Use substvars instead. + + -- Colin Watson Sun, 26 Dec 2004 02:17:38 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-10) hoary; urgency=low + + * Forgot to bump nvidiaminor and ati_minor in debian/rules. + + -- Colin Watson Fri, 24 Dec 2004 13:28:44 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-9) hoary; urgency=low + + * debian/nvidia-glx.postrm.in: Fix /usr/X11R6/lib32/libGL.so.1 diversion + removal. + + -- Colin Watson Fri, 24 Dec 2004 01:00:59 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-8) hoary; urgency=low + + * Sanitise powerpc l-r-m -> l-i dependencies. + * Fix nvidia-glx sed scripts to catch all the @@VERSION@@ substitutions. + * Divert /usr/X11R6/lib32 GL modules when installing nvidia-glx (closes: + Ubuntu#2500). + * Remove previous patches to nvidia-glx and sync back with Debian patches + from new Debian 6629 packages, fixing segfaults (closes: Ubuntu#4640). + * Create nic-restricted-modules udeb, containing the Atheros driver. + + -- Daniel Stone Sat, 11 Dec 2004 22:29:55 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-7) hoary; urgency=low + + * Create udebs: + - debian/d-i/: Incorporate linux-kernel-restricted-di-2.6 version 0.3. + - debian/control: Move to debian/control.stub; kernel-wedge will + generate the real control file. + - debian/control.stub: Build-depend on kernel-wedge. + - debian/rules: Update to copy /lib/modules and /lib/hotplug/firmware to + a temporary tree and generate udebs from them. + * debian/d-i/kernel-versions: Remove superfluous build-dependency fields. + * debian/d-i/firmware/: Add amd64 and powerpc nic-restricted-firmware + packages. + + -- Colin Watson Tue, 14 Dec 2004 18:40:37 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-6) hoary; urgency=low + + * Bump nvidiaminor and atiminor in debian/rules; this must be done every + revision! + * Add Build-Depends on libxinerama-dev. + + -- Daniel Stone Sat, 11 Dec 2004 13:16:57 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-5) hoary; urgency=low + + * Fix kernel boot failure on powerpc: l-r-m-2.6.9-1-powerpc[-smp] now + depends on linux-image-2.6.9-1-powerpc, not on -power3 + + -- Martin Pitt Sat, 11 Dec 2004 12:11:32 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-4) hoary; urgency=low + + * Really add libxxf86vm-dev B-D; the last upload only added libxtst-dev. + + -- Daniel Stone Fri, 10 Dec 2004 17:12:15 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-3) hoary; urgency=low + + * Add libxxf86vm-dev Build-Depends. + + -- Daniel Stone Fri, 10 Dec 2004 13:58:35 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-2) hoary; urgency=low + + * Add Build-Depends on libxtst-dev and libxxf86misc-dev, fixing i386 FTBFS. + * Temporarily remove ia64 from the nvidia-* architecture list until I get it + building properly on halley, which involves splitting the patch system. + + -- Daniel Stone Fri, 10 Dec 2004 12:58:03 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-1) hoary; urgency=low + + * Updated to 2.6.9. + * Add nvidia-glx 1.0.6629 (i386/amd64), and nvidia-glx 1.0.5336 (ia64). + + Added two patches from zander in nVidia forums to fix several issues + with 6629 (nvidia/patches). + * Add fglrx 3.14.6 (still only for XFree86 4.3.0/X.Org 6.7.0). + + Add fglrx-kernel-source, for people building their own kernels. + * Updated madwifi to CVS from 20041124, and enable building on amd64 and + powerpc (closes: Ubuntu#3010). + + New linux-restricted-modules-2.6.9-1-power{3,4,pc}{,-smp} packages. + + Removed default setting of TOOLPREFIX in + madwifi/hal/linux/{x86_64-elf,powerpc-be-eapi}.inc, as we compile + natively. + * Rewrite large swathes of debian/rules to have a greater segregation + between drivers; e.g, use $(nv_dirname), et al, for nVidia driver. + * Make nvidia-glx-config aware of X.Org. + + -- Daniel Stone Fri, 3 Dec 2004 10:58:53 +0000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-4) warty; urgency=low + + * Fix nvidia-glx call to date. (Closes: #2429) + + -- Fabio M. Di Nitto Mon, 18 Oct 2004 05:37:36 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-3) warty; urgency=low + + * .. and bump the version number of nvidia-glx. + + -- Tollef Fog Heen Mon, 11 Oct 2004 21:01:22 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-2) warty; urgency=low + + * Brown paper bug -- too much copy&paste in debian/rules is not a + good idea. Actually copy the madwifi directory to build it. + * amd64-xeon is amd64, not i386. + + -- Tollef Fog Heen Mon, 11 Oct 2004 18:19:51 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-1) warty; urgency=low + + * s/Debian/Ubuntu/ in some readme files + * Add nvidia amd64 modules + + -- Tollef Fog Heen Sat, 09 Oct 2004 14:24:18 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-3) warty; urgency=low + + * Fixed acx100 firmware filenames. + + -- Herbert Xu Fri, 8 Oct 2004 09:07:29 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-2) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Herbert Xu Fri, 8 Oct 2004 07:27:07 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-1) warty; urgency=low + + * Added acx100 firmware. + + -- Herbert Xu Thu, 7 Oct 2004 21:34:45 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-7) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Matt Zimmerman Mon, 27 Sep 2004 11:57:13 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-6) warty; urgency=low + + * Updated ABI + * Add "Atheros" to description, for keyword searches + * Add note to nvidia-kernel-source description explaining that this package + is not needed in ubuntu + * Add instructions to nvidia-glx description about how to enable the driver + * Remove pointer to nvidia-kernel-source from nvidia-glx description + + -- Matt Zimmerman Mon, 27 Sep 2004 10:48:42 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-5) warty; urgency=low + + * Build-Depends: bzip2 + + -- Matt Zimmerman Mon, 20 Sep 2004 18:58:27 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-4) warty; urgency=low + + * Improved /etc/modules modification in nvidia-glx-config + (Fabio M. Di Nitto). + + -- Herbert Xu Mon, 20 Sep 2004 21:00:03 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-3) warty; urgency=low + + * Added nvidia-glx-config script (Fabio M. Di Nitto) + + -- Herbert Xu Sat, 18 Sep 2004 14:23:49 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-2) warty; urgency=low + + * Added ATI license to copyright. + + -- Herbert Xu Wed, 15 Sep 2004 19:58:51 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-1) warty; urgency=low + + * Added ATI driver. + * Clarified package descriptions. + + -- Herbert Xu Tue, 14 Sep 2004 20:25:27 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.0-2) warty; urgency=low + + * Build-Depends: sharutils + + -- Matt Zimmerman Fri, 10 Sep 2004 18:38:02 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.0-1) warty; urgency=low + + * Add nvidia kernel and X driver: + + Roll new orig.tar.gz. to add nvidia directory and binary installer. + + Update copyright file to include NVIDIA license and email exchange + between Debian maintainer and upstream to clarify a few points + about the redistribution. + + Build-Depends on debhelper >= 4.0.0 and sed >> 3.0. + + Make flavour regexpr more strict to match only kernel modules packages + and clear pkg var after each match to avoid duplicates. + + Add comments in debian/rules to identify specific drivers operations. + + Make clean: target wipe only linux-restricted*.postinst and postrm. + + Create nvidia-kernel-source, nvidia-glx and nvidia-glx-dev packages + and give them proper version. + + Build nvidia kernel driver and install in linux-restricted-modules-* + + Add nvidia bits to linux-restricted-modules postinst and postrm. + + linux-restricted-modules Depends: nvidia-kernel-common, + Provides: nvidia-kernel-1.0.6111 and Suggests: nvidia-glx + + nvidia-glx Depends: nvidia-kernel-1.0.6111 + + -- Fabio M. Di Nitto Sat, 11 Sep 2004 01:19:12 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1-2) warty; urgency=low + + * Built for linux-source 2.6.8.1-3. + * Replaced the word non-free by restricted. + + -- Herbert Xu Fri, 10 Sep 2004 09:22:59 +1000 + +linux-non-free-modules-2.6.8.1 (2.6.8.1-1) unstable; urgency=low + + * Initial release. + + -- Herbert Xu Sun, 29 Aug 2004 15:06:44 +1000 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/rules +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/rules @@ -0,0 +1,1021 @@ +#!/usr/bin/make -f +# +# Copyright (c) 2004 Herbert Xu +# Copyright (c) 2004-2005 Canonical Ltd. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=4 + +SHELL := sh -e + +prefix := $(CURDIR)/debian/linux-restricted-modules +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +udeb_prefix := $(CURDIR)/debian/d-i-$(DEB_HOST_ARCH) + +ifeq "$(DEB_HOST_ARCH)" "hppa" +export CC=gcc-3.4 +export GCC=gcc-3.4 +else +export CC=gcc +export GCC=gcc +endif + +# kernel +abi_version = 8 +kernel_version = $(shell dpkg-parsechangelog | grep ^Source | sed 's/.*-//') +kernel_abi_version = $(kernel_version)-$(abi_version) +lrm_version = $(shell dpkg-parsechangelog | grep ^Version | awk '{print $$2}') + +# nvidia +nv_base_version=1.0 +nv_release := 8774 +nv_upstreamversion := ${nv_base_version}-${nv_release} +nv_version := ${nv_base_version}.${nv_release} +nv_legacy_release := 7184 +nv_legacy_upstreamversion := ${nv_base_version}-${nv_legacy_release} +nv_legacy_version := ${nv_base_version}.${nv_legacy_release} + +# fglrx +ati_xorg_base_version = 7.1.0 +ati_revision = 8.28.8 +ati_upstreamversion = ${ati_revision} +ati_xorg_version = ${ati_xorg_base_version}-${ati_revision} +ati_tarball = fglrx-$(DEB_HOST_ARCH)-${ati_revision}.tar.gz + +# fritz avm +avm_base_version = 3.11 +#avm_version = ${avm_base_version}-${avm_revision} +avm_version = ${avm_base_version} +pkg_avmfw := $(shell awk '/^Package: avm-fritz-firmware/ {print $$2}' debian/control.stub) +avmfw_dir = $(subst avm-fritz-firmware-,,$(pkg_avmfw)) + +# ltmodem +ltm_base_version = 8.31+2.6-alk-8 +ltm_url = http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/ + +# ipw3945d +ipw3945_version = 1.7.22 + +# madwifi +madwifi_version = 0.9.2 + +# vmware-player +vmplay_dir = $(CURDIR)/debian/vmware-player-kernel-modules-$(kernel_abi_version) + +FGLRX := 1 +NVIDIA := 1 +MADWIFI := 1 +FRITZ := 1 +LTMODEM := 1 +IPW3945 := 1 +VMPLAY := 1 + +ifeq "$(DEB_HOST_ARCH)" "i386" +export karch=i386 +mw_target := TARGET=i386-elf +nv_filename := NVIDIA-Linux-x86-${nv_upstreamversion}-pkg1.run +nv_dirname := nvidia/NVIDIA-Linux-x86-${nv_upstreamversion}-pkg1 +nv_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_upstreamversion}/${nv_filename} +nv_legacy_filename := NVIDIA-Linux-x86-${nv_legacy_upstreamversion}-pkg1.run +nv_legacy_dirname := nvidia/NVIDIA-Linux-x86-${nv_legacy_upstreamversion}-pkg1 +nv_legacy_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_legacy_upstreamversion}/${nv_legacy_filename} +ati_package = fglrx +ati_url = http://www2.ati.com/drivers/linux/fglrx_${ati_revision}.zip +ati_arch = i386 +ati_origlibdir = 32 +fritz_dir := fritz +ipw3945_dir := x86 +split_fritz_modules += \ + fcdsl/src/fcdsl \ + fcdsl2/src/fcdsl2 \ + fcdslsl/src/fcdslsl \ + fcdslslusb/src/fcdslslusb \ + fcdslusb/1/fritz/src/fcdslusb \ + fcdslusb/2/fritz/src/fcdslusb2 \ + fcdslusba/src/fcdslusba \ + fcpci/src/fcpci \ + fcusb/src/fcusb \ + fxusb/src/fxusb +flavours := $(addprefix $(kernel_abi_version)-,generic 386) +endif + +ifeq "$(DEB_HOST_ARCH)" "amd64" +export karch=x86_64 +mw_target := TARGET=x86_64-elf +nv_filename := NVIDIA-Linux-x86_64-${nv_upstreamversion}-pkg2.run +nv_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_upstreamversion}-pkg2 +nv_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_upstreamversion}/${nv_filename} +nv_legacy_filename := NVIDIA-Linux-x86_64-${nv_legacy_upstreamversion}-pkg2.run +nv_legacy_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_legacy_upstreamversion}-pkg2 +nv_legacy_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_legacy_upstreamversion}/${nv_legacy_filename} +ati_package := fglrx64 +ati_url = http://www2.ati.com/drivers/linux/fglrx64_${ati_revision}.zip +ati_arch = x86_64 +ati_origlibdir = 64 +fritz_dir := fritz64 +ipw3945_dir := x86_64 +split_fritz_modules += \ + fcdsl2/src/fcdsl2 \ + fcdslsl/src/fcdslsl \ + fcdslslusb/src/fcdslslusb \ + fcdslusb/1/fritz/src/fcdslusb \ + fcdslusb/2/fritz/src/fcdslusb2 \ + fcpci/src/fcpci +flavours := $(addprefix $(kernel_abi_version)-,generic) +LTMODEM := 0 # no Winmodem support +endif + +ifeq "$(DEB_HOST_ARCH)" "ia64" +export karch=ia64 +mw_target := TARGET=ia64-elf +flavours := $(addprefix $(kernel_abi_version)-,itanium mckinley) + +NVIDIA := 0 # no real upstream nvidia support +FGLRX := 0 # no fireGL support yet +MADWIFI := 0 # no madwifi support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d support +VMPLAY := 0 # no vmware player support +endif + +ifeq "$(DEB_HOST_ARCH)" "powerpc" +export karch=powerpc +mw_target := TARGET=powerpc-be-eabi +flavours := $(addprefix $(kernel_abi_version)-,powerpc powerpc-smp) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d suppor +VMPLAY := 0 # no vmware player supportt +endif + +ifeq "$(DEB_HOST_ARCH)" "hppa" +export karch=hppa +mw_target := TARGET=hppa-be-eabi +flavours := $(addprefix $(kernel_abi_version)-,hppa32 hppa64) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 0 # no madwifi support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d suppor +VMPLAY := 0 # no vmware player supportt +endif + +ifeq "$(DEB_HOST_ARCH)" "sparc" +export karch=sparc +mw_target := TARGET=sparc-be-eabi +flavours := $(addprefix $(kernel_abi_version)-,sparc64 sparc64-smp) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 0 # no madwifi support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +IPW3945 := 0 # no ipw3945d suppor +VMPLAY := 0 # no vmware player supportt +endif + +flavours_udeb := $(shell grep ^$(DEB_HOST_ARCH) debian/d-i/kernel-versions | awk '{print $$4}') + +split_modules := +ifeq "$(FGLRX)" "1" +split_modules += ati/build_mod/2.6.x/fglrx +endif +ifeq "$(NVIDIA)" "1" +split_modules += nv/nvidia +endif +ifeq "$(MADWIFI)" "1" +split_modules += madwifi/ath/ath_hal +endif +ifeq "$(FRITZ)" "1" +split_modules += $(split_fritz_modules) +endif +ifeq "$(LTMODEM)" "1" +split_modules += ltmodem/ltmodem ltmodem/ltserial +endif + +builddir := $(CURDIR)/debian/build +rbuilddir := debian/build + +ifeq "$(ati_origlibdir)" "32" +ati_nativelibdir = lib +endif +ifeq "$(ati_origlibdir)" "64" +ati_nativelibdir = lib64 +endif + +download-avm: + rm -rf fritz fritz64 + python debian/getavmcardware.py + : # cleanup files we don't want in the archive + -find fritz fritz64 -name '*.ko' -o -name '*.rpm' | xargs rm -f + +unpack: unpack-stamp unpack-avm-stamp +unpack-stamp: + dh_testdir + + if [ -e debian/build ]; then \ + mv debian/build debian/build.old; \ + fi + mkdir debian/build + + for i in $(flavours); do \ + mkdir -p debian/build/$$i; \ + done + +ifeq "$(FGLRX)" "1" + mkdir $(builddir)/ati-xorg + cd $(builddir)/ati-xorg; \ + tar zxf $(CURDIR)/ati/${ati_tarball}; \ + mkdir -p extra_src/panel; \ + tar zxfC usr/src/ATI/fglrx_panel_sources.tgz \ + extra_src/panel; \ + if [ -d $(CURDIR)/ati/patches/ ]; then \ + for i in $(CURDIR)/ati/patches/*; do \ + patch -p0 -d $(builddir)/ati-xorg/ < $$i; \ + done; \ + fi; \ + rm -v `find . -name libGL.so.1.2.orig` + + for i in $(flavours); do \ + cp -al $(builddir)/ati-xorg/lib/modules/fglrx $(builddir)/$$i/ati; \ + done +endif + + +ifeq "$(MADWIFI)" "1" + cd $(builddir)/; \ + tar jxf $(CURDIR)/madwifi/madwifi-$(madwifi_version).tar.bz2; \ + if [ -d $(CURDIR)/madwifi/patches/ ]; then \ + for i in $(CURDIR)/madwifi/patches/*; do \ + patch -p0 -d $(builddir)/madwifi-$(madwifi_version) < $$i; \ + done; \ + fi + + for i in $(flavours); do \ + cp -al $(builddir)/madwifi-$(madwifi_version) $(builddir)/$$i/madwifi; \ + done +endif + +ifeq "$(LTMODEM)" "1" + for i in $(kernel_abi_version)-386; do \ + cp -al ltmodem debian/build/$$i; \ + if [ -d $(CURDIR)/ltmodem/patches/ ]; then \ + for j in $(CURDIR)/ltmodem/patches/*; do \ + patch -p0 -d debian/build/$$i/ltmodem/ < $$j; \ + done; \ + fi; \ + done +endif + +ifeq "$(NVIDIA)" "1" + cd nvidia && sh ./$(nv_filename) --extract-only + cd nvidia && sh ./$(nv_legacy_filename) --extract-only + + if [ -d $(CURDIR)/nvidia/patches/ ]; then \ + for i in $(CURDIR)/nvidia/patches/*; do \ + patch -p0 -d ${nv_dirname} < $$i; \ + done; \ + fi + + if [ -d $(CURDIR)/nvidia/patches-legacy/ ]; then \ + for i in $(CURDIR)/nvidia/patches-legacy/*; do \ + patch -p0 -d ${nv_legacy_dirname} < $$i; \ + done; \ + fi + + cd ${nv_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + cd ${nv_legacy_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + + for i in $(flavours); do \ + cp -al ${nv_dirname}/usr/src/nv debian/build/$$i/nv; \ + cp -al ${nv_legacy_dirname}/usr/src/nv debian/build/$$i/nv-legacy; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_version)/g" -e "s/@@NV_LEGACY@@//g" \ + -e "s:@dirname@:$(nv_dirname):" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx$$i; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_legacy_version)/g" -e "s/@@NV_LEGACY@@/-legacy/g" \ + -e "s:@dirname@:$(nv_legacy_dirname):" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx-legacy$$i; \ + done +endif + for i in $(flavours); do \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/linux-restricted-modules.postinst \ + > debian/linux-restricted-modules-$$i.postinst; \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/linux-restricted-modules.postrm \ + > debian/linux-restricted-modules-$$i.postrm; \ + done + +ifeq "$(IPW3945)" "1" + mkdir $(builddir)/ipw3945 + cd $(builddir)/ipw3945 && tar zxf $(CURDIR)/ipw3945/ipw3945d-$(ipw3945_version).tgz +endif + +ifeq "$(VMPLAY)" "1" + mkdir $(builddir)/vmware-player + cd $(builddir)/vmware-player; \ + tar xf $(CURDIR)/vmware-player/vmmon.tar; \ + tar xf $(CURDIR)/vmware-player/vmnet.tar; \ + if [ -d $(CURDIR)/vmware-player/patches/ ]; then \ + for i in $(CURDIR)/vmware-player/patches/*; do \ + patch -p0 -d $(builddir)/vmware-player < $$i; \ + done; \ + fi + + for i in $(flavours); do \ + cp -al $(builddir)/vmware-player $(builddir)/$$i/; \ + done + + cp debian/vmware-player-kernel-modules.postinst \ + debian/vmware-player-kernel-modules-$(kernel_abi_version).postinst + cp debian/vmware-player-kernel-modules.postrm \ + debian/vmware-player-kernel-modules-$(kernel_abi_version).postrm +endif + + touch unpack-stamp + +unpack-avm-stamp: +ifeq "$(FRITZ)" "1" + for i in $(flavours); do \ + mkdir -p debian/build/$$i; \ + for f in $(fritz_dir)/*; do \ + cp -al $$f debian/build/$$i; \ + done; \ + done +endif + touch unpack-avm-stamp + +build-kernel: build-kernel-stamp +build-kernel-stamp: unpack-stamp + dh_testdir + dh_testroot + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_release)}g;' \ + -e 's{#VERSION#}{$(nv_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches + cp -al $(nv_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_legacy_release)}g;' \ + -e 's{#VERSION#}{$(nv_legacy_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_legacy_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_legacy_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/patches + cp -al $(nv_legacy_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-legacy-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/fglrx-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/fglrx-kernel/fglrx + cp -r $(CURDIR)/ati/debian.binary/* $(CURDIR)/debian/temp/modules/fglrx-kernel/debian + set +e && for f in `ls $(CURDIR)/ati/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(ati_xorg_base_version)}g;' \ + -e 's{#REVISION#}{$(ati_revision)}g;' \ + -e 's{#VERSION#}{$(ati_xorg_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(ati_upstreamversion)}g;' \ + -e 's{#URL#}{$(ati_url)}g' \ + < $(CURDIR)/ati/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/$$f ; \ + done + cp -al debian/build/ati-xorg/lib/modules/fglrx $(CURDIR)/debian/temp/modules/fglrx-kernel || true + chmod 755 $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + tar -zcvf $(CURDIR)/fglrx-kernel-source.tar.gz -C debian/temp modules + rm -rf debian/temp + + touch build-kernel-stamp + +build: build-stamp build-avm-stamp +build-stamp: unpack-stamp + dh_testdir + +ifeq "$(FGLRX)" "1" + make -C debian/build/ati-xorg/extra_src/panel QTDIR=/usr/share/qt3 +endif + + # NOTE: we only support kernel 2.6 for nvidia and only with nvidia 6111 or higher + +ifeq "$(MADWIFI)" "1" + for i in $(flavours); do \ + cd debian/build/$$i; \ + make karch=$(karch) -C madwifi KERNELPATH=/usr/src/linux-headers-$$i $(mw_target); \ + cd - > /dev/null; \ + done +endif + +ifeq "$(VMPLAY)" "1" + for i in $(flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-player/vmmon-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-player/vmnet-only VM_UNAME=$$i; \ + done +endif + +ifeq "$(LTMODEM)" "1" + for i in $(kernel_abi_version)-386; do \ + cd debian/build/$$i/ltmodem; \ + make KERNEL_DIR=/usr/src/linux-headers-$$i module; \ + cd - > /dev/null; \ + done +endif + +ifeq "$(FGLRX)" "1" + for i in $(flavours); do \ + cd debian/build/$$i; \ + make -C ati/build_mod/2.6.x KDIR=/usr/src/linux-headers-$$i; \ + cd - > /dev/null; \ + done +endif + +ifeq "$(NVIDIA)" "1" + for i in $(flavours); do \ + cd debian/build/$$i; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv" module; \ + cd - > /dev/null; \ + cd debian/build/$$i; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv-legacy \ + -f Makefile SYSSRC=/usr/src/linux-headers-$$i \ + KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv-legacy" \ + module; \ + cd - > /dev/null; \ + done +endif + + touch build-stamp + +build-avm-stamp: unpack-avm-stamp + dh_testdir +ifeq "$(FRITZ)" "1" + for i in $(flavours); do \ + for d in debian/build/$$i/f*; do \ + m=$$(basename $$d); \ + echo building for flavour $$i, module $$m; \ + if [ -d $$d/src.drv ]; then \ + make -C $$d/src.drv \ + `cat $$d/make.card` \ + KRNLINCL=/usr/src/linux-headers-$$i \ + || true; \ + else \ + if [ -f $$d/ID ]; then \ + mkdir -p $$d/tmp; \ + echo make -C $$d/src `cat $$d/ID` KDIR=/usr/src/linux-headers-$$i; \ + make -C $$d/src \ + `cat $$d/ID` \ + KDIR=/usr/src/linux-headers-$$i \ + LIBDIR=$(CURDIR)/$$d/tmp; \ + rm -rf $$d/tmp; \ + else \ + for d2 in $$d/?/fritz; do \ + mkdir -p $$d2/tmp; \ + echo make -C $$d2/src `cat $$d2/ID` KDIR=/usr/src/linux-headers-$$i; \ + make -C $$d2/src \ + `cat $$d2/ID` \ + KDIR=/usr/src/linux-headers-$$i \ + LIBDIR=$(CURDIR)/$$d2/tmp; \ + rm -rf $$d2/tmp; \ + done; \ + fi; \ + fi; \ + done; \ + done +endif + touch build-avm-stamp + +debian/control: + echo '# THIS FILE IS AUTO-GENERATED FROM control.stub.in' > debian/control.stub + sed -e 's/@@NV_VERSION@@/$(nv_version)/g' \ + -e 's/@@NV_LEGACY_VERSION@@/$(nv_legacy_version)/g' \ + -e 's/@@KVERSION@@/$(kernel_version)/g' \ + -e 's/@@ABIVER@@/$(kernel_abi_version)/g' \ + debian/control.stub.in >> debian/control.stub + echo '# THIS FILE IS AUTO-GENERATED FROM kernel-versions.in' > debian/d-i/kernel-versions + sed -e 's/@@ABIVER@@/$(kernel_abi_version)/g' \ + debian/d-i/kernel-versions.in >> debian/d-i/kernel-versions + rm -rf $(udeb_prefix) + mkdir -p $(udeb_prefix) + cp -a debian/d-i/* $(udeb_prefix)/ + ln -s .. $(udeb_prefix)/debian + (cd $(udeb_prefix) && kernel-wedge gen-control) > debian/control + rm -rf $(udeb_prefix) + +clean: debian/control + dh_testdir + dh_testroot + rm -f unpack-stamp build-stamp build-kernel-stamp + rm -rf debian/build* debian/temp/ + rm -f debian/vmware-player-kernel-modules-[0-9]*.postinst + rm -f debian/vmware-player-kernel-modules.postinst-[0-9]*.postrm + rm -f debian/linux-restricted-modules-[0-9]*.postinst + rm -f debian/linux-restricted-modules-*.postrm + rm -f debian/linux-restricted-modules-*.preinst + rm -f debian/linux-restricted-modules-*.prerm + rm -f debian/nic-restricted-modules-*.postinst + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do rm -f debian/nvidia-glx$$i debian/nvidia-glx-legacy$$i; \ + done + rm -rf $(nv_dirname) $(nv_legacy_dirname) + rm -f nvidia-kernel-source.tar.gz nvidia-legacy-kernel-source.tar.gz + rm -f fglrx-kernel-source.tar.gz + dh_clean `find debian/d-i/modules debian/d-i/firmware -type l 2>/dev/null` + rm -rf $(udeb_prefix) + rm -rf avm-download build-avm-stamp unpack-avm-stamp + rm -rf debian/nic-restricted-modules-*-di \ + debian/nic-restricted-firmware-*-di + +install: build build-kernel + dh_testdir + dh_clean -k + dh_installdirs + + # Split modules for install + chmod u+rx debian/split-module + for flavour in $(flavours); do \ + export KERNELPATH=/usr/src/linux-headers-$$flavour; \ + export $(mw_target); \ + for module in $(split_modules); do \ + if [ "$$module" = "ltmodem/ltmodem" ] \ + || [ "$$module" = "ltmodem/ltserial" ] \ + && [ "$$flavour" != "$(kernel_abi_version)-386" ]; then \ + echo "No $module driver for $$flavour"; \ + else \ + debian/split-module $$(basename $$module) \ + debian/build/$$flavour/$$(dirname $$module) \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour; \ + fi; \ + done; \ + done + +ifeq "$(NVIDIA)" "1" + for flavour in $(flavours); do \ + export KERNELPATH=/usr/src/linux-headers-$$flavour; \ + debian/split-module nvidia \ + debian/build/$$flavour/nv-legacy \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy; \ + mv $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy/nvidia \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nvidia_legacy; \ + rm -rf $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy; \ + done +endif + +ifeq "$(MADWIFI)" "1" + for flavour in $(flavours); do \ + install -d $(prefix)-$$flavour/lib/modules/$$flavour/madwifi; \ + find debian/build/$$flavour/madwifi -name '*.ko' ! -name 'ath_hal.ko' | \ + xargs cp --target=$(prefix)-$$flavour/lib/modules/$$flavour/madwifi; \ + done +endif + +ifeq "$(VMPLAY)" "1" + for flavour in $(flavours); do \ + install -d $(vmplay_dir)/lib/modules/$$flavour/vmware-player; \ + find debian/build/$$flavour/vmware-player -name '*.ko' | \ + xargs cp --target=$(vmplay_dir)/lib/modules/$$flavour/vmware-player; \ + done +endif + + # fglrx +ifeq "$(FGLRX)" "1" + dh_installdirs -pfglrx-control \ + usr/bin \ + usr/share/applnk \ + usr/share/gnome \ + usr/share/icons \ + usr/share/pixmaps + + make -C $(builddir)/ati-xorg/extra_src/panel QTDIR=/usr/share/qt3 \ + DESTDIR=$(CURDIR)/debian/fglrx-control install + dh_install -pfglrx-control ati/fireglcontrol.desktop usr/share/gnome + dh_install -pfglrx-control ati/fireglcontrol_kde3.desktop \ + usr/share/applnk + +# lib32 vs lib64 braindamage +ifeq "$(ati_origlibdir)" "32" + dh_installdirs -p xorg-driver-fglrx usr/bin usr/lib/xorg/modules \ + usr/sbin usr/share/man/man8 + dh_installdirs -p xorg-driver-fglrx-dev usr/include usr/lib + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/bin/* \ + usr/bin + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/bin/* \ + usr/bin + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/sbin/* \ + usr/sbin + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/share/man/man8/* \ + usr/share/man/man8 + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/lib/*.so* \ + usr/lib + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/lib/modules/* \ + usr/lib/xorg/modules + mv debian/xorg-driver-fglrx/usr/lib/xorg/modules/dri debian/xorg-driver-fglrx/usr/lib/ + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/X11R6/lib/*.a \ + usr/lib + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/X11R6/include/* \ + usr/include + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/include/* \ + usr/include +endif +ifeq "$(ati_origlibdir)" "64" + dh_installdirs -p xorg-driver-fglrx usr/bin usr/lib/xorg/modules \ + usr/sbin usr/share/man/man8 + dh_installdirs -p xorg-driver-fglrx-dev usr/include usr/lib32 usr/lib + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/bin/* \ + usr/bin + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/bin/* \ + usr/bin + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/sbin/* \ + usr/sbin + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/share/man/man8/* \ + usr/share/man/man8 + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/lib64/*.so* \ + usr/lib + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/lib/*.so* \ + usr/lib32 + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/lib64/modules/* \ + usr/lib/xorg/modules + mv debian/xorg-driver-fglrx/usr/lib/xorg/modules/dri debian/xorg-driver-fglrx/usr/lib/ + dh_install -pxorg-driver-fglrx $(rbuilddir)/ati-xorg/usr/X11R6/lib/modules/* \ + usr/lib32/xorg/modules + mv debian/xorg-driver-fglrx/usr/lib32/xorg/modules/dri debian/xorg-driver-fglrx/usr/lib32/ + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/X11R6/lib64/*.a \ + usr/lib + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/X11R6/lib/*.a \ + usr/lib32 + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/X11R6/include/* \ + usr/include + dh_install -pxorg-driver-fglrx-dev $(rbuilddir)/ati-xorg/usr/include/* \ + usr/include + dh_installdirs -pxorg-driver-fglrx etc/X11/Xsession.d + dh_install -pxorg-driver-fglrx ati/fglrx.xsession \ + etc/X11/Xsession.d/70fglrx_32bit_dri +endif + + install -m 644 $(CURDIR)/fglrx-kernel-source.tar.gz $(CURDIR)/debian/fglrx-kernel-source/usr/src +endif + + # madwifi + +ifeq "$(NVIDIA)" "1" + + # nvidia-kernel-source + install -m 644 $(CURDIR)/nvidia-kernel-source.tar.gz $(CURDIR)/debian/nvidia-kernel-source/usr/src + install -m 644 $(CURDIR)/nvidia-legacy-kernel-source.tar.gz $(CURDIR)/debian/nvidia-legacy-kernel-source/usr/src + + # nvidia-glx{-dev} + + install -m 0644 $(nv_dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.o \ + $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/drivers/ + + install $(nv_dirname)/usr/X11R6/lib/libXvMCNVIDIA.a \ + $(CURDIR)/debian/nvidia-glx-dev/usr/lib/libXvMCNVIDIA.a + install $(nv_dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib/libXvMCNVIDIA.so.${nv_version} + + # move gl headers into /usr/share so we can use the mesa headers + install -m 0644 $(nv_dirname)/usr/include/GL/gl.h \ + $(CURDIR)/debian/nvidia-glx-dev/usr/share/doc/nvidia-glx-dev/include/GL + install -m 0644 $(nv_dirname)/usr/include/GL/glext.h \ + $(CURDIR)/debian/nvidia-glx-dev/usr/share/doc/nvidia-glx-dev/include/GL + + install -m 0644 $(nv_dirname)/usr/include/GL/glx.h \ + $(CURDIR)/debian/nvidia-glx-dev/usr/share/doc/nvidia-glx-dev/include/GL + install -m 0644 $(nv_dirname)/usr/include/GL/glxext.h \ + $(CURDIR)/debian/nvidia-glx-dev/usr/share/doc/nvidia-glx-dev/include/GL + + install -m 0644 $(nv_dirname)/usr/lib/libGL.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib + install -m 0644 $(nv_dirname)/usr/lib/libGLcore.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib + install -m 0644 $(nv_dirname)/usr/lib/libnvidia-cfg.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib + + sed "s/__GENERATED_BY__/Ubuntu nvidia-graphics-drivers/" $(nv_dirname)/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" > $(CURDIR)/debian/nvidia-glx-dev/usr/lib/libGL.la + + install -m 0644 $(nv_legacy_dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.o \ + $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/xorg/modules/drivers + + install $(nv_legacy_dirname)/usr/X11R6/lib/libXvMCNVIDIA.a \ + $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/lib/libXvMCNVIDIA.a + install $(nv_legacy_dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${nv_legacy_version} \ + $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/libXvMCNVIDIA.so.${nv_legacy_version} + + # move gl headers into /usr/share so we can use the mesa headers + install -m 0644 $(nv_legacy_dirname)/usr/include/GL/gl.h \ + $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/share/doc/nvidia-glx-legacy-dev/include/GL + install -m 0644 $(nv_legacy_dirname)/usr/include/GL/glext.h \ + $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/share/doc/nvidia-glx-legacy-dev/include/GL + + install -m 0644 $(nv_legacy_dirname)/usr/include/GL/glx.h \ + $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/share/doc/nvidia-glx-legacy-dev/include/GL + # glxext.h doesn't exist in the current (7147) -legacy package, but + # it may show up later, so leaving this here as a reminder to check + #install -m 0644 $(nv_legacy_dirname)/usr/include/GL/glxext.h \ + # $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/share/doc/nvidia-glx-legacy-dev/include/GL + + install -m 0644 $(nv_legacy_dirname)/usr/lib/libGL.so.${nv_legacy_version} \ + $(CURDIR)/debian/nvidia-glx-legacy/usr/lib + install -m 0644 $(nv_legacy_dirname)/usr/lib/libGLcore.so.${nv_legacy_version} \ + $(CURDIR)/debian/nvidia-glx-legacy/usr/lib + # Not yet shipped in the legacy driver, check again later: + #install -m 0644 $(nv_legacy_dirname)/usr/lib/libnvidia-cfg.so.${nv_version} \ + # $(CURDIR)/debian/nvidia-glx-legacy/usr/lib + + sed "s/__GENERATED_BY__/Ubuntu nvidia-legacy-graphics-drivers/" $(nv_legacy_dirname)/usr/lib/libGL.la | \ + sed "s/__LIBGL_PATH__/\/usr\/lib/" > $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/lib/libGL.la + +ifeq "$(DEB_HOST_ARCH)" "amd64" + install -d $(CURDIR)/debian/nvidia-glx/usr/lib32 \ + $(CURDIR)/debian/nvidia-glx-dev/usr/lib32 + install -m 0644 $(nv_dirname)/usr/lib32/libGL.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib32 + install -m 0644 $(nv_dirname)/usr/lib32/libGLcore.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib32 + install -m 0644 $(nv_dirname)/usr/lib32/libnvidia-cfg.so.${nv_version} \ + $(CURDIR)/debian/nvidia-glx/usr/lib32 + + sed "s/__GENERATED_BY__/Ubuntu nvidia-graphics-drivers/" $(nv_dirname)/usr/lib32/libGL.la | \ + sed "s/__LIBGL_PATH__/\/usr\/lib32/" > $(CURDIR)/debian/nvidia-glx-dev/usr/lib32/libGL.la + + install -d $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32 \ + $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/lib32 + install -m 0644 $(nv_legacy_dirname)/usr/lib32/libGL.so.${nv_legacy_version} \ + $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32 + install -m 0644 $(nv_legacy_dirname)/usr/lib32/libGLcore.so.${nv_legacy_version} \ + $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32 + # Not yet shipped by the legacy driver, check again later: + #install -m 0644 $(nv_legacy_dirname)/usr/lib32/libnvidia-cfg.so.${nv_version} \ + # $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32 + + sed "s/__GENERATED_BY__/Ubuntu nvidia-legacy-graphics-drivers/" $(nv_legacy_dirname)/usr/lib32/libGL.la | \ + sed "s/__LIBGL_PATH__/\/usr\/lib32/" > $(CURDIR)/debian/nvidia-glx-legacy-dev/usr/lib32/libGL.la + +endif + + install nvidia/nvidia-glx-config $(CURDIR)/debian/nvidia-glx/usr/sbin + install nvidia/nvidia-glx-config $(CURDIR)/debian/nvidia-glx-legacy/usr/sbin + + # TLS (nvidia-tls new for 6106) + install $(nv_dirname)/usr/lib/libnvidia-tls.so.${nv_version} $(CURDIR)/debian/nvidia-glx/usr/lib/ + + install $(nv_dirname)/usr/lib/tls/libnvidia-tls.so.${nv_version} $(CURDIR)/debian/nvidia-glx/usr/lib/tls/ + + install $(nv_legacy_dirname)/usr/lib/libnvidia-tls.so.${nv_legacy_version} $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/ + + install $(nv_legacy_dirname)/usr/lib/tls/libnvidia-tls.so.${nv_legacy_version} $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/tls/ + +ifeq "$(DEB_HOST_ARCH)" "amd64" + install $(nv_dirname)/usr/lib32/libnvidia-tls.so.${nv_version} $(CURDIR)/debian/nvidia-glx/usr/lib32/ + + install $(nv_legacy_dirname)/usr/lib32/libnvidia-tls.so.${nv_legacy_version} $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32/ + + install -d $(CURDIR)/debian/nvidia-glx/usr/lib32/tls + install $(nv_dirname)/usr/lib32/tls/libnvidia-tls.so.${nv_version} $(CURDIR)/debian/nvidia-glx/usr/lib32/tls/ + + install -d $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32/tls + install $(nv_legacy_dirname)/usr/lib32/tls/libnvidia-tls.so.${nv_legacy_version} $(CURDIR)/debian/nvidia-glx-legacy/usr/lib32/tls/ +endif + + install $(nv_dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${nv_version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/ + + install $(nv_legacy_dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${nv_legacy_version} $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/xorg/modules/ + + install $(nv_dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia + install $(nv_dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia + + install $(nv_legacy_dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/nvidia + install $(nv_legacy_dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx-legacy/usr/lib/nvidia + + install -d $(CURDIR)/debian/nvidia-glx/usr/share/lintian/overrides + install -m 0644 debian/nvidia-glx.override \ + $(CURDIR)/debian/nvidia-glx/usr/share/lintian/overrides/nvidia-glx + + 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 + + install -m 755 $(nv_dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx/usr/bin/ + + install -m 755 $(nv_legacy_dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx-legacy/usr/bin/ + + # These two apps don't exist in nvidia-glx-legacy (yet) + install -m 755 $(nv_dirname)/usr/bin/nvidia-settings $(CURDIR)/debian/nvidia-glx/usr/bin/ + install -m 755 $(nv_dirname)/usr/bin/nvidia-xconfig $(CURDIR)/debian/nvidia-glx/usr/bin/ + install -m 644 $(nv_dirname)/usr/share/man/man1/nvidia-settings.1.gz $(CURDIR)/debian/nvidia-glx/usr/share/man/man1/ + install -m 644 $(nv_dirname)/usr/share/man/man1/nvidia-xconfig.1.gz $(CURDIR)/debian/nvidia-glx/usr/share/man/man1/ + + install $(CURDIR)/debian/nvidia-glx.reportbug $(CURDIR)/debian/nvidia-glx/usr/share/bug/nvidia-glx/script + install $(CURDIR)/debian/nvidia-glx-legacy.reportbug $(CURDIR)/debian/nvidia-glx-legacy/usr/share/bug/nvidia-glx-legacy/script +endif + +# XXX We change the default here to avoid recreating the tarball. Fix up +# next time .orig.tar.gz is regenerated. +# acx100/acx111 and dvb firmware + for i in $(flavours); do \ + mkdir -p $(prefix)-$$i/lib/firmware/$$i; \ + cp -a acx $(prefix)-$$i/lib/firmware/$$i/; \ + rm -f $(prefix)-$$i/lib/firmware/$$i/acx/default/tiacx111c16; \ + rm -f $(prefix)-$$i/lib/firmware/$$i/acx/default/tiacx111c17; \ + ln -s ../1.2.1.34/tiacx111c16 $(prefix)-$$i/lib/firmware/$$i/acx/default/; \ + ln -s ../1.2.1.34/tiacx111c17 $(prefix)-$$i/lib/firmware/$$i/acx/default/; \ + cp -a dvb/* $(prefix)-$$i/lib/firmware/$$i/; \ + done + +# avm fritz + +ifeq "$(FRITZ)" "1" + dh_installdirs -p$(pkg_avmfw) usr/share/isdn/$(avmfw_dir) + for d in $(fritz_dir)/*; do \ + for f in $$d/*.bin $$d/*.frm $$d/?/fritz/*.bin $$d/?/fritz/*.frm; do \ + [ -f $$f ] || continue; \ + cp -p $$f debian/$(pkg_avmfw)/usr/share/isdn/$(avmfw_dir)/; \ + done; \ + done + for i in $(flavours); do \ + install -d $(prefix)-$$i/usr/share/isdn; \ + ln -s $(avmfw_dir) $(prefix)-$$i/usr/share/isdn/$$i; \ + done; \ + + dh_installdirs -pavm-fritz-kernel-source usr/src + tar cfz debian/avm-fritz-kernel-source/usr/src/avm-fritz.tgz \ + $(fritz_dir)/*/license.txt \ + $(fritz_dir)/*/Makefile \ + $(fritz_dir)/*/ID \ + $(fritz_dir)/*/lib \ + $(fritz_dir)/*/src \ + $(fritz_dir)/*/?/fritz/license.txt \ + $(fritz_dir)/*/?/fritz/Makefile \ + $(fritz_dir)/*/?/fritz/ID \ + $(fritz_dir)/*/?/fritz/lib \ + $(fritz_dir)/*/?/fritz/src + dh_installdocs -p avm-fritz-kernel-source $(fritz_dir)/fcdsl2/*.html $(fritz_dir)/fcdsl2/*.txt +endif + +ifeq "$(IPW3945)" "1" + for i in $(flavours); do \ + mkdir -p $(prefix)-$$i/sbin; \ + cp $(builddir)/ipw3945/ipw3945d-$(ipw3945_version)/$(ipw3945_dir)/ipw3945d \ + $(prefix)-$$i/sbin/ipw3945d-$$i; \ + done +endif + +# Copy modules to a temporary tree for use in udebs. +build-udebs: install + dh_testdir + dh_testroot + + for i in $(flavours_udeb); do \ + mkdir -p debian/nic-restricted-firmware-$$i-di/lib/firmware/$$i; \ + cp -a $(prefix)-$$i/lib/firmware/$$i/* \ + debian/nic-restricted-firmware-$$i-di/lib/firmware/$$i/; \ + cp debian/lrm-manager debian/nic-restricted-modules-$$i-di.postinst; \ + done + +ifeq "$(MADWIFI)" "1" + for i in $(flavours_udeb); do \ + mkdir -p debian/nic-restricted-modules-$$i-di/lib/linux-restricted-modules/$$i/ \ + debian/nic-restricted-modules-$$i-di/lib/modules/$$i/; \ + cp -a $(prefix)-$$i/lib/linux-restricted-modules/$$i/ath_hal \ + debian/nic-restricted-modules-$$i-di/lib/linux-restricted-modules/$$i/; \ + cp -a $(prefix)-$$i/lib/modules/$$i/madwifi \ + debian/nic-restricted-modules-$$i-di/lib/modules/$$i/; \ + done +endif + +ifeq "$(IPW3945)" "1" + for i in $(flavours_udeb); do \ + mkdir -p debian/nic-restricted-modules-$$i-di/sbin/ \ + debian/nic-restricted-modules-$$i-di/etc/modprobe.d/; \ + cp -a ipw3945/ipw3945.modprobe \ + debian/nic-restricted-modules-$$i-di/etc/modprobe.d/ipw3945; \ + cp -a $(prefix)-$$i/sbin/ipw3945d-$$i \ + debian/nic-restricted-modules-$$i-di/sbin/; \ + done +endif + +# Build architecture-independent files here. +binary-indep: + dh_testdir + + install -d debian/linux-restricted-modules-common/sbin + install -m 755 debian/lrm-manager debian/linux-restricted-modules-common/sbin/lrm-manager + install -d debian/linux-restricted-modules-common/etc/default + install -m 644 debian/linux-restricted-modules-common.default \ + debian/linux-restricted-modules-common/etc/default/linux-restricted-modules-common + install -d debian/linux-restricted-modules-common/etc/modprobe.d + install -m 644 ipw3945/ipw3945.modprobe \ + debian/linux-restricted-modules-common/etc/modprobe.d/ipw3945 + + dh_installchangelogs -i + dh_installinit -p linux-restricted-modules-common --no-start -- start 7 S . start 1 0 6 . + dh_fixperms -i + dh_compress -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: install build-udebs + dh_testdir + + dh_installchangelogs -s + dh_installdocs -s + dh_installexamples -s + dh_installman -s + dh_installinit -s + dh_link -s + # FIXME: Remove this when -legacy supports this library: + rm -f debian/nvidia-glx-legacy/usr/lib/libnvidia-cfg.so.1 + rm -f debian/nvidia-glx-legacy/usr/lib32/libnvidia-cfg.so.1 + dh_strip -s -X1.0.$(nv_release) -X1.0.$(nv_legacy_release) -Xtls_test + dh_compress -X.h -s + dh_fixperms -s + dh_installdeb -s + dh_shlibdeps -X'*tls*' -X'*lib32*' -X'*lib64*' -s \ + -l$(CURDIR)/debian/nvidia-glx/usr/lib:$(CURDIR)/debian/xorg-driver-fglrx/usr/lib +ifeq "$(NVIDIA)" "1" + # this is a dirty hack, but we don't want -glx-legacy to depend on -glx + sed -i -e 's/, nvidia-glx//' debian/nvidia-glx-legacy.substvars +endif + dh_gencontrol -s + # fglrx, nVidia and ACM build with different version numbers +ifeq "$(FGLRX)" "1" + dh_gencontrol -v -pxorg-driver-fglrx -- -v${ati_xorg_version}+${lrm_version} -Vati:Revision=${ati_revision} + dh_gencontrol -v -pxorg-driver-fglrx-dev -- -v${ati_xorg_version}+${lrm_version} -Vati:Revision=${ati_revision} -Vati:XOrgFullVersion=${ati_xorg_version}+${lrm_version} + dh_gencontrol -v -pfglrx-kernel-source -- -v${ati_revision}+${lrm_version} -Vati:XOrgVersion=${ati_xorg_version} -Vati:XFree86Version=${ati_xf86_version} + dh_gencontrol -v -pfglrx-control -- -v${ati_revision}+${lrm_version} -Vati:Revision=${ati_revision} +endif +ifeq "$(NVIDIA)" "1" + dh_gencontrol -v -pnvidia-glx -- -v${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-glx-dev -- -v${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-kernel-source -- -v${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-glx-legacy -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} + dh_gencontrol -v -pnvidia-glx-legacy-dev -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} + dh_gencontrol -v -pnvidia-legacy-kernel-source -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} +endif +ifeq "$(FRITZ)" "1" + dh_gencontrol -v -pavm-fritz-kernel-source -- -v${avm_version}+${lrm_version} -Vavm:Version=${avm_version} + dh_gencontrol -v -p$(pkg_avmfw) -- -v${avm_version}+${lrm_version} -Vavm:Version=${avm_version} +endif + dh_md5sums -s + dh_builddeb -s + +printenv: + @echo "DEB_HOST_ARCH: $(DEB_HOST_ARCH)" + @echo "flavours: $(flavours)" + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install unpack build-kernel +.PHONY: debian/control build-udebs --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/control.stub.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/control.stub.in @@ -0,0 +1,328 @@ +Source: linux-restricted-modules-@@KVERSION@@ +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Kernel Team +Uploaders: Adam Conrad , Ben Collins +Standards-Version: 3.6.1 +Build-Depends: cpio, debhelper (>= 4.0.0), gcc-3.4 [hppa], libc6-i386 [amd64], libqt3-mt-dev [i386 amd64], kernel-wedge (>= 2.05ubuntu2), linux-headers-@@ABIVER@@-386 [i386], linux-headers-@@ABIVER@@-generic [amd64 i386], linux-headers-@@ABIVER@@-powerpc [powerpc], linux-headers-@@ABIVER@@-powerpc-smp [powerpc], linux-headers-@@ABIVER@@-mckinley [ia64], linux-headers-@@ABIVER@@-itanium [ia64], linux-headers-@@ABIVER@@-hppa32 [hppa], linux-headers-@@ABIVER@@-hppa64 [hppa], linux-headers-@@ABIVER@@-sparc64-smp [sparc], linux-headers-@@ABIVER@@-sparc64 [sparc], module-init-tools, rpm, sed (>> 3.0), sharutils, bzip2, libgtk2.0-dev [i386 amd64], libxxf86misc-dev [i386 amd64], libxtst-dev [i386 amd64], libxxf86vm-dev [i386 amd64], libxinerama-dev [i386 amd64], libstdc++5 [i386 amd64] + +Package: linux-restricted-modules-common +Architecture: all +Priority: optional +Depends: binutils-static +Description: Non-free Linux @@KVERSION@@ modules helper script + This package provides only a set of helper scripts to handle + linux-restricted-modules. + +Package: linux-restricted-modules-@@ABIVER@@-386 +Architecture: i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@ +Depends: linux-image-@@ABIVER@@-386, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on 386 + This package provides restricted modules for Linux version @@KVERSION@@ on + 386. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl, fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcdslusba, + fcpci, fcusb, fxusb (AVM ISDN) + - ltmodem (Winmodem) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: nvidia-glx +Architecture: i386 amd64 +Depends: nvidia-kernel-${nvidia:Version}, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-kernel-source (>= ${nvidia:Version}) +Conflicts: nvidia-glx-src, nvidia-settings, nvidia-xconfig +Replaces: nvidia-glx-src +Provides: xserver-xorg-video +Description: NVIDIA binary XFree86 4.x/X.Org driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. + . + To enable the driver, run "sudo nvidia-glx-config enable". + +Package: nvidia-glx-dev +Architecture: i386 amd64 +Depends: nvidia-glx (>= ${nvidia:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Description: NVIDIA binary XFree86 4.x/X.Org driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src +Replaces: nvidia-kernel-src +Description: NVIDIA binary kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: nvidia-glx-legacy +Architecture: i386 amd64 +Depends: nvidia-kernel-${nvidia:LegacyVersion}, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-settings, nvidia-legacy-kernel-source (>= ${nvidia:LegacyVersion}) +Conflicts: nvidia-glx-src, nvidia-glx +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the TNT, + TNT2, TNT Ultra, GeForce, and GeForce2 chipsets. AGP, TV-out and flat panel + displays are also supported. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the above paragraph, please use the nvidia-glx driver, + which is much more up to date. + . + To enable the driver, run "sudo nvidia-glx-config enable". + +Package: nvidia-glx-legacy-dev +Architecture: i386 amd64 +Depends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + development files. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-legacy-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'legacy' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + +Package: fglrx-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: xorg-driver-fglrx (>= ${ati:XOrgVersion}), kernel-package (>= 8.082), devscripts +Description: ATI binary kernel module source + This package builds the ATI XFree86 4.x/X.Org binary kernel module needed + by xorg-driver-fglrx. This package is not needed on an + Ubuntu system because a pre-compiled kernel module is supplied by the + linux-restricted-modules packages. + +Package: xorg-driver-fglrx +Architecture: i386 amd64 +Depends: xserver-xorg-core (>= 1:0.99.0-1), ${shlibs:Depends} +Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy +Replaces: fglrx-driver, xfree86-driver-fglrx +Provides: fglrx-driver, xserver-xorg-video +Description: Video driver for ATI graphics accelerators + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This version of the ATI driver officially supports: + * ATI Radeon 8500, 9000, 9100, 9200, 9250 (R2xx) + * ATI Radeon 9500, 9550, 9600, 9700, 9800, X300, X400, X600 (R3xx) + * ATI Radeon X700, X800 (R4xx) + * ATI Mobility 9000, 9600, 9800 + * ATI FireGL 8700, 8800, E1, E2, X1, X2, X3, Z1, T2, 5100, 7100, 7200 + * ATI Mobility FireGL 9000, T2, T2e + . + This package provides 2D display drivers and hardware accelerated OpenGL. + +Package: xorg-driver-fglrx-dev +Architecture: i386 amd64 +Depends: xorg-driver-fglrx (= ${ati:XOrgFullVersion}) +Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev +Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev +Provides: fglrx-driver-dev +Description: Video driver for ATI graphics accelerators (devel files) + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This package provides definitions for the GL and GLX extensions + and the FGLRXGAMMA extension interface library. + +Package: fglrx-control +Architecture: i386 amd64 +Depends: xorg-driver-fglrx, ${shlibs:Depends} +Description: Control panel for the ATI graphics accelerators + Control panel for the ATI Radeon and FireGL graphics accelerators. + . + This package provides the control panel compiled for Qt3. + +Package: avm-fritz-kernel-source +Architecture: amd64 i386 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: kernel-package (>= 8.082), devscripts +Description: AVM Fritz! binary kernel module source + This package builds the binary kernel modules needed for the AVM FRITZ! + ISDN hardware. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: avm-fritz-firmware-@@ABIVER@@ +Architecture: amd64 i386 +Depends: capiutils (>= 1:3.6.2005-01-03-3ubuntu1) +Recommends: drdsl +Description: Firmware for AVM Fritz! ISDN hardware + This package contains firmware binaries needed for various Fritz! ISDN cards + made by AVM. The firmware is installed in a kernel specific directory to + match driver and firmware version, if more than one kernel installed. + +Package: linux-restricted-modules-@@ABIVER@@-generic +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@ +Depends: linux-image-@@ABIVER@@-generic, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on x86_64 generic + This package provides restricted modules for Linux version @@KVERSION@@ on + generic x86/x86_64. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-powerpc +Architecture: powerpc +Priority: optional +Depends: linux-image-@@ABIVER@@-powerpc, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on PowerPC + This package provides restricted modules for Linux version @@KVERSION@@ on + PowerPC. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-powerpc-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-@@ABIVER@@-powerpc-smp, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on PowerPC SMP + This package provides restricted modules for Linux version @@KVERSION@@ on + PowerPC SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-itanium +Architecture: ia64 +Priority: optional +Depends: linux-image-@@ABIVER@@-itanium, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on Itanium + This package provides restricted modules for Linux version @@KVERSION@@ on + Itanium. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-mckinley +Architecture: ia64 +Priority: optional +Depends: linux-image-@@ABIVER@@-mckinley, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on Itanium 2 + This package provides restricted modules for Linux version @@KVERSION@@ on + Itanium 2. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-hppa32 +Architecture: hppa +Priority: optional +Depends: linux-image-@@ABIVER@@-hppa32, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 32-bit HPPA + This package provides restricted modules for Linux version @@KVERSION@@ on + 32-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-hppa64 +Architecture: hppa +Priority: optional +Depends: linux-image-@@ABIVER@@-hppa64, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 64-bit HPPA + This package provides restricted modules for Linux version @@KVERSION@@ on + 64-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-sparc64 +Architecture: sparc +Priority: optional +Depends: linux-image-@@ABIVER@@-sparc64, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 64-bit Sparc + This package provides restricted modules for Linux version @@KVERSION@@ on + 64-bit Sparc. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-sparc64-smp +Architecture: sparc +Priority: optional +Depends: linux-image-@@ABIVER@@-sparc64-smp, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 64-bit Sparc SMP + This package provides restricted modules for Linux version @@KVERSION@@ on + 64-bit Sparc SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: vmware-player-kernel-modules-@@ABIVER@@ +Architecture: i386 amd64 +Priority: optional +Depends: module-init-tools, linux-image-2.6 +Description: vmware-player modules for Linux (kernel @@KVERSION@@) + This package contains the set of loadable kernel modules for + VMware Player. + . + This package contains the compiled kernel modules for @@KVERSION@@. All + supported kernel types for this architecture are included in this single + package. --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.dirs.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.dirs.in @@ -0,0 +1,11 @@ +usr/bin +usr/lib +usr/sbin +usr/share/man/man1 +usr/share/lintian/overrides +usr/lib/xorg/modules/drivers +usr/lib/xorg/modules/extensions +usr/lib/tls +usr/lib/nvidia +usr/lib32/nvidia +usr/share/bug/nvidia-glx@@NV_LEGACY@@ --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx-dev.preinst.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx-dev.preinst.in @@ -0,0 +1,88 @@ +#! /bin/sh +# preinst script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + install|upgrade) + # diversion transition + if [ -d /usr/share/nvidia-glx/diversions/ ] ; then + rm -f /usr/lib/libGL.so + rm -f /usr/lib/libGL.a + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions/ || true + rmdir /usr/share/nvidia-glx || true + + fi + + if [ -d /usr/share/nvidia-glx/diversions-X11R6 ] ; then + rm -f /usr/X11R6/lib/libGL.so + rm -f /usr/X11R6/lib/libGL.a + + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.a /usr/X11R6/lib/libGL.a > /dev/null + + + rmdir /usr/share/nvidia-glx/diversions-X11R6/ || true + rmdir /usr/share/nvidia-glx || true + fi + + + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + if [ ! -d /usr/X11R6/lib/nvidia ]; then + mkdir -p /usr/X11R6/lib/nvidia || true + fi + +# to remove old old old gl header diversions + + if [ -e /usr/share/nvidia-glx/diversions-X11R6/gl.h ]; then + if [ -e /usr/include/GL/gl.h ]; then + rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h + fi + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glxtokens.h /usr/X11R6/include/GL/glxtokens.h > /dev/null + + fi + + # remove the old nvidia-glx diversion before re-creating it, since our + # first nvidia-glx-legacy upload was broken, argh: + if [ -n "@@NV_LEGACY@@" ] && dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev$' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + fi + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/objtable.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/objtable.in @@ -0,0 +1,25 @@ +ath_hal_objs="madwifi/ath_hal/ah_osdep.o madwifi/ath_hal/hal.o" +ath_rate_sample_objs="madwifi/ath_rate/sample/sample.o" +wlan_objs="madwifi/net80211/if_media.o madwifi/net80211/rc4.o madwifi/net80211/ieee80211.o madwifi/net80211/ieee80211_crypto.o madwifi/net80211/ieee80211_input.o madwifi/net80211/ieee80211_node.o madwifi/net80211/ieee80211_output.o madwifi/net80211/ieee80211_proto.o madwifi/net80211/ieee80211_wireless.o madwifi/net80211/ieee80211_linux.o madwifi/net80211/ieee80211_crypto_none.o" +wlan_wep_objs="madwifi/net80211/ieee80211_crypto_wep.o" +wlan_tkip_objs="madwifi/net80211/ieee80211_crypto_tkip.o" +wlan_ccmp_objs="madwifi/net80211/ieee80211_crypto_ccmp.o" +wlan_acl_objs="madwifi/net80211/ieee80211_acl.o" +wlan_xauth_objs="madwifi/net80211/ieee80211_xauth.o" +ath_pci_objs="madwifi/ath/if_ath.o madwifi/ath/if_ath_pci.o madwifi/ath/radar.o" +fglrx_objs="ati/build_mod/2.6.x/agp3.o ati/build_mod/2.6.x/nvidia-agp.o ati/build_mod/2.6.x/agpgart_be.o ati/build_mod/2.6.x/i7505-agp.o ati/build_mod/2.6.x/firegl_public.o ati/build_mod/libfglrx_ip.a.GCC3" +nvidia_objs="nv/nv-kernel.o nv/nv.o nv/nv-vm.o nv/os-agp.o nv/os-interface.o nv/os-registry.o" +fcdsl_objs="fcdsl/lib/fcdsl-lib.o fcdsl/src/main.o fcdsl/src/driver.o fcdsl/src/tools.o fcdsl/src/dbgif.o fcdsl/src/tables.o fcdsl/src/queue.o fcdsl/src/lib.o" +fcdsl2_objs="fcdsl2/lib/fcdsl2-lib.o fcdsl2/src/main.o fcdsl2/src/driver.o fcdsl2/src/tools.o fcdsl2/src/devif.o fcdsl2/src/tables.o fcdsl2/src/queue.o fcdsl2/src/lib.o" +fcdslsl_objs="fcdslsl/lib/fcdslsl-lib.o fcdslsl/src/main.o fcdslsl/src/driver.o fcdslsl/src/tools.o fcdslsl/src/devif.o fcdslsl/src/tables.o fcdslsl/src/queue.o fcdslsl/src/lib.o" +fcdslslusb_objs="fcdslslusb/lib/fcdslslusb-lib.o fcdslslusb/src/main.o fcdslslusb/src/driver.o fcdslslusb/src/tools.o fcdslslusb/src/devif.o fcdslslusb/src/tables.o fcdslslusb/src/queue.o fcdslslusb/src/lib.o fcdslslusb/src/buffers.o" +fcdslusb_objs="fcdslusb/lib/fcdslusb-lib.o fcdslusb/src/main.o fcdslusb/src/driver.o fcdslusb/src/tools.o fcdslusb/src/tables.o fcdslusb/src/queue.o fcdslusb/src/lib.o" +fcdslusba_objs="fcdslusba/lib/fcdslusba-lib.o fcdslusba/src/main.o fcdslusba/src/driver.o fcdslusba/src/tools.o fcdslusba/src/devif.o fcdslusba/src/tables.o fcdslusba/src/queue.o fcdslusba/src/lib.o fcdslusba/src/buffers.o" +fcpci_objs="fcpci/lib/fcpci-lib.o fcpci/src/main.o fcpci/src/driver.o fcpci/src/tools.o fcpci/src/tables.o fcpci/src/queue.o fcpci/src/lib.o" +fcpcmcia_objs="fcpcmcia/lib/fcpcmcia-lib.o fcpcmcia/src/main.o fcpcmcia/src/driver.o fcpcmcia/src/tools.o fcpcmcia/src/tables.o fcpcmcia/src/queue.o fcpcmcia/src/lib.o" +fcpcmcia_cs_objs="fcpcmcia/src/fcpcmcia_cs.o" +fcusb_objs="fcusb/lib/fcusb-lib.o fcusb/src/main.o fcusb/src/driver.o fcusb/src/tools.o fcusb/src/tables.o fcusb/src/queue.o fcusb/src/lib.o" +fxusb_objs="fxusb/lib/fxusb-lib.o fxusb/src/main.o fxusb/src/driver.o fxusb/src/tools.o fxusb/src/tables.o fxusb/src/queue.o fxusb/src/lib.o" + +MODULES="ath_hal ath_rate_sample wlan wlan_wep wlan_tkip wlan_ccmp wlan_acl wlan_xauth ath_pci fglrx nvidia fcdsl fcdsl2 fcdslsl fcdslslusb fcdslusb fcdslusba fcpci fcusb fxusb" + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/lrm-manager +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/lrm-manager @@ -0,0 +1,87 @@ +#!/bin/sh + +# Note that this script is not only /sbin/lrm-manager, but it also +# ends up being the postinst for nic-restricted-modules. Take care +# when adding features to make sure they'll work in d-i's busybox + +# If you wish to disable the link-on-boot feature for certain modules, +# please see /etc/default/linux-restricted-modules-common for details. + +set -e + +KVER="$(uname -r)" +DEPMOD=yes + +while [ $# -gt 0 ]; do + case "$1" in + --kver=*) KVER="${1#--kver=}"; shift ;; + --quick) DEPMOD=no; shift ;; + --help) echo "Usage: $0 [ --quick ] [ --kver=KERNEL_VERSION ]"; exit 0 ;; + *) shift ;; + esac +done + +if [ -f /etc/default/linux-restricted-modules-common ] && [ "$DEPMOD" = "no" ]; then + . /etc/default/linux-restricted-modules-common +fi + +# check if we have the kernel objects + +if [ ! -d /lib/linux-restricted-modules/"$KVER" ]; then + exit 0 +fi + +# if tmpfs is already mounted, skip it. +# NOTE that at this point in time we have no /proc or other fancy things to check + +if [ ! -f /lib/modules/"$KVER"/volatile/.mounted ]; then + mkdir -p /lib/modules/"$KVER"/volatile/ + mount -t tmpfs -o mode=0755 tmpfs /lib/modules/"$KVER"/volatile/ + touch /lib/modules/"$KVER"/volatile/.mounted +fi + +cd /lib/linux-restricted-modules/"$KVER" +for module in *; do + CURRENT_MODULE_DISABLED="false" + set -- $DISABLED_MODULES + while [ $# -gt 0 ]; do + case "$1" in + fc) + set -- $@ fcdsl fcdsl2 fcdslsl fcdslslusb fcdslusb fcdslusb2 fcdslusba fcpci fcusb fxusb + shift + ;; + nv) + set -- $@ nvidia nvidia_legacy + shift + ;; + ltm) + set -- $@ ltmodem ltserial + shift + ;; + *) + if [ "$1" = "$module" ]; then + CURRENT_MODULE_DISABLED="true" + break + else + shift + fi + ;; + esac + done + if [ "$CURRENT_MODULE_DISABLED" = "false" ]; then + if type ld_static >/dev/null 2>&1; then + ld_static -d -r -o /lib/modules/"$KVER"/volatile/$module.ko $module/* || true + fi + fi +done + +if [ "$DEPMOD" = "yes" ]; then + if [ -f "/boot/System.map-$KVER" ]; then + depmod -a -q -F /boot/System.map-"$KVER" "$KVER" + elif type udpkg >/dev/null 2>&1; then + # Running in d-i + depmod -a -q + fi +fi + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.links.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.links.in @@ -0,0 +1,8 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/libglx.so.@@VERSION@@ usr/lib/xorg/modules/libglx.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/control +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/control @@ -0,0 +1,398 @@ +# THIS FILE IS AUTO-GENERATED FROM control.stub.in +Source: linux-restricted-modules-2.6.17 +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Kernel Team +Uploaders: Adam Conrad , Ben Collins +Standards-Version: 3.6.1 +Build-Depends: cpio, debhelper (>= 4.0.0), gcc-3.4 [hppa], libc6-i386 [amd64], libqt3-mt-dev [i386 amd64], kernel-wedge (>= 2.05ubuntu2), linux-headers-2.6.17-8-386 [i386], linux-headers-2.6.17-8-generic [amd64 i386], linux-headers-2.6.17-8-powerpc [powerpc], linux-headers-2.6.17-8-powerpc-smp [powerpc], linux-headers-2.6.17-8-mckinley [ia64], linux-headers-2.6.17-8-itanium [ia64], linux-headers-2.6.17-8-hppa32 [hppa], linux-headers-2.6.17-8-hppa64 [hppa], linux-headers-2.6.17-8-sparc64-smp [sparc], linux-headers-2.6.17-8-sparc64 [sparc], module-init-tools, rpm, sed (>> 3.0), sharutils, bzip2, libgtk2.0-dev [i386 amd64], libxxf86misc-dev [i386 amd64], libxtst-dev [i386 amd64], libxxf86vm-dev [i386 amd64], libxinerama-dev [i386 amd64], libstdc++5 [i386 amd64] + +Package: linux-restricted-modules-common +Architecture: all +Priority: optional +Depends: binutils-static +Description: Non-free Linux 2.6.17 modules helper script + This package provides only a set of helper scripts to handle + linux-restricted-modules. + +Package: linux-restricted-modules-2.6.17-8-386 +Architecture: i386 +Priority: optional +Provides: nvidia-kernel-1.0.8774, nvidia-kernel-1.0.7184 +Depends: linux-image-2.6.17-8-386, linux-restricted-modules-common (>= 2.6.17), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy, avm-fritz-firmware-2.6.17-8 +Description: Non-free Linux 2.6.17 modules on 386 + This package provides restricted modules for Linux version 2.6.17 on + 386. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl, fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcdslusba, + fcpci, fcusb, fxusb (AVM ISDN) + - ltmodem (Winmodem) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: nvidia-glx +Architecture: i386 amd64 +Depends: nvidia-kernel-${nvidia:Version}, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-kernel-source (>= ${nvidia:Version}) +Conflicts: nvidia-glx-src, nvidia-settings, nvidia-xconfig +Replaces: nvidia-glx-src +Provides: xserver-xorg-video +Description: NVIDIA binary XFree86 4.x/X.Org driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. + . + To enable the driver, run "sudo nvidia-glx-config enable". + +Package: nvidia-glx-dev +Architecture: i386 amd64 +Depends: nvidia-glx (>= ${nvidia:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Description: NVIDIA binary XFree86 4.x/X.Org driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src +Replaces: nvidia-kernel-src +Description: NVIDIA binary kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: nvidia-glx-legacy +Architecture: i386 amd64 +Depends: nvidia-kernel-${nvidia:LegacyVersion}, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-settings, nvidia-legacy-kernel-source (>= ${nvidia:LegacyVersion}) +Conflicts: nvidia-glx-src, nvidia-glx +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the TNT, + TNT2, TNT Ultra, GeForce, and GeForce2 chipsets. AGP, TV-out and flat panel + displays are also supported. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the above paragraph, please use the nvidia-glx driver, + which is much more up to date. + . + To enable the driver, run "sudo nvidia-glx-config enable". + +Package: nvidia-glx-legacy-dev +Architecture: i386 amd64 +Depends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + development files. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-legacy-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'legacy' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + +Package: fglrx-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: xorg-driver-fglrx (>= ${ati:XOrgVersion}), kernel-package (>= 8.082), devscripts +Description: ATI binary kernel module source + This package builds the ATI XFree86 4.x/X.Org binary kernel module needed + by xorg-driver-fglrx. This package is not needed on an + Ubuntu system because a pre-compiled kernel module is supplied by the + linux-restricted-modules packages. + +Package: xorg-driver-fglrx +Architecture: i386 amd64 +Depends: xserver-xorg-core (>= 1:0.99.0-1), ${shlibs:Depends} +Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy +Replaces: fglrx-driver, xfree86-driver-fglrx +Provides: fglrx-driver, xserver-xorg-video +Description: Video driver for ATI graphics accelerators + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This version of the ATI driver officially supports: + * ATI Radeon 8500, 9000, 9100, 9200, 9250 (R2xx) + * ATI Radeon 9500, 9550, 9600, 9700, 9800, X300, X400, X600 (R3xx) + * ATI Radeon X700, X800 (R4xx) + * ATI Mobility 9000, 9600, 9800 + * ATI FireGL 8700, 8800, E1, E2, X1, X2, X3, Z1, T2, 5100, 7100, 7200 + * ATI Mobility FireGL 9000, T2, T2e + . + This package provides 2D display drivers and hardware accelerated OpenGL. + +Package: xorg-driver-fglrx-dev +Architecture: i386 amd64 +Depends: xorg-driver-fglrx (= ${ati:XOrgFullVersion}) +Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev +Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev +Provides: fglrx-driver-dev +Description: Video driver for ATI graphics accelerators (devel files) + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This package provides definitions for the GL and GLX extensions + and the FGLRXGAMMA extension interface library. + +Package: fglrx-control +Architecture: i386 amd64 +Depends: xorg-driver-fglrx, ${shlibs:Depends} +Description: Control panel for the ATI graphics accelerators + Control panel for the ATI Radeon and FireGL graphics accelerators. + . + This package provides the control panel compiled for Qt3. + +Package: avm-fritz-kernel-source +Architecture: amd64 i386 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: kernel-package (>= 8.082), devscripts +Description: AVM Fritz! binary kernel module source + This package builds the binary kernel modules needed for the AVM FRITZ! + ISDN hardware. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: avm-fritz-firmware-2.6.17-8 +Architecture: amd64 i386 +Depends: capiutils (>= 1:3.6.2005-01-03-3ubuntu1) +Recommends: drdsl +Description: Firmware for AVM Fritz! ISDN hardware + This package contains firmware binaries needed for various Fritz! ISDN cards + made by AVM. The firmware is installed in a kernel specific directory to + match driver and firmware version, if more than one kernel installed. + +Package: linux-restricted-modules-2.6.17-8-generic +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-1.0.8774, nvidia-kernel-1.0.7184 +Depends: linux-image-2.6.17-8-generic, linux-restricted-modules-common (>= 2.6.17), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy, avm-fritz-firmware-2.6.17-8 +Description: Non-free Linux 2.6.17 modules on x86_64 generic + This package provides restricted modules for Linux version 2.6.17 on + generic x86/x86_64. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-powerpc +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.17-8-powerpc, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on PowerPC + This package provides restricted modules for Linux version 2.6.17 on + PowerPC. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-powerpc-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.17-8-powerpc-smp, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on PowerPC SMP + This package provides restricted modules for Linux version 2.6.17 on + PowerPC SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-itanium +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.17-8-itanium, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on Itanium + This package provides restricted modules for Linux version 2.6.17 on + Itanium. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-mckinley +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.17-8-mckinley, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on Itanium 2 + This package provides restricted modules for Linux version 2.6.17 on + Itanium 2. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-hppa32 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.17-8-hppa32, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 32-bit HPPA + This package provides restricted modules for Linux version 2.6.17 on + 32-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-hppa64 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.17-8-hppa64, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 64-bit HPPA + This package provides restricted modules for Linux version 2.6.17 on + 64-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-sparc64 +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.17-8-sparc64, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 64-bit Sparc + This package provides restricted modules for Linux version 2.6.17 on + 64-bit Sparc. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-sparc64-smp +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.17-8-sparc64-smp, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 64-bit Sparc SMP + This package provides restricted modules for Linux version 2.6.17 on + 64-bit Sparc SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: vmware-player-kernel-modules-2.6.17-8 +Architecture: i386 amd64 +Priority: optional +Depends: module-init-tools, linux-image-2.6 +Description: vmware-player modules for Linux (kernel 2.6.17) + This package contains the set of loadable kernel modules for + VMware Player. + . + This package contains the compiled kernel modules for 2.6.17. All + supported kernel types for this architecture are included in this single + package. + +Package: nic-restricted-modules-2.6.17-8-386-di +XC-Package-Type: udeb +Provides: nic-restricted-modules +Architecture: i386 +XB-Kernel-Version: 2.6.17-8-386 +Section: restricted/debian-installer +Priority: standard +Description: Restricted drivers for NICs + This package contains drivers for some NICs. These drivers are "restricted" + because they are not available under a completely Free licence. + +Package: nic-restricted-firmware-2.6.17-8-386-di +XC-Package-Type: udeb +Provides: nic-restricted-firmware +Architecture: i386 +XB-Kernel-Version: 2.6.17-8-386 +Section: restricted/debian-installer +Priority: standard +Description: Restricted external firmware for NIC drivers + This package contains external binary-only firmware for some NIC drivers. + These firmware images are "restricted" because they are not available under + a completely Free licence. + +Package: nic-restricted-modules-2.6.17-8-powerpc-di +XC-Package-Type: udeb +Provides: nic-restricted-modules +Architecture: powerpc +XB-Kernel-Version: 2.6.17-8-powerpc +Section: restricted/debian-installer +Priority: standard +Description: Restricted drivers for NICs + This package contains drivers for some NICs. These drivers are "restricted" + because they are not available under a completely Free licence. + +Package: nic-restricted-firmware-2.6.17-8-powerpc-di +XC-Package-Type: udeb +Provides: nic-restricted-firmware +Architecture: powerpc +XB-Kernel-Version: 2.6.17-8-powerpc +Section: restricted/debian-installer +Priority: standard +Description: Restricted external firmware for NIC drivers + This package contains external binary-only firmware for some NIC drivers. + These firmware images are "restricted" because they are not available under + a completely Free licence. + +Package: nic-restricted-modules-2.6.17-8-generic-di +XC-Package-Type: udeb +Provides: nic-restricted-modules +Architecture: amd64 +XB-Kernel-Version: 2.6.17-8-generic +Section: restricted/debian-installer +Priority: standard +Description: Restricted drivers for NICs + This package contains drivers for some NICs. These drivers are "restricted" + because they are not available under a completely Free licence. + +Package: nic-restricted-firmware-2.6.17-8-generic-di +XC-Package-Type: udeb +Provides: nic-restricted-firmware +Architecture: amd64 +XB-Kernel-Version: 2.6.17-8-generic +Section: restricted/debian-installer +Priority: standard +Description: Restricted external firmware for NIC drivers + This package contains external binary-only firmware for some NIC drivers. + These firmware images are "restricted" because they are not available under + a completely Free licence. --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx-dev.dirs.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx-dev.dirs.in @@ -0,0 +1,3 @@ +usr/share/doc/nvidia-glx@@NV_LEGACY@@-dev/include/GL +usr/X11R6/lib +usr/lib/nvidia --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/control.stub +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/control.stub @@ -0,0 +1,329 @@ +# THIS FILE IS AUTO-GENERATED FROM control.stub.in +Source: linux-restricted-modules-2.6.17 +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Kernel Team +Uploaders: Adam Conrad , Ben Collins +Standards-Version: 3.6.1 +Build-Depends: cpio, debhelper (>= 4.0.0), gcc-3.4 [hppa], libc6-i386 [amd64], libqt3-mt-dev [i386 amd64], kernel-wedge (>= 2.05ubuntu2), linux-headers-2.6.17-8-386 [i386], linux-headers-2.6.17-8-generic [amd64 i386], linux-headers-2.6.17-8-powerpc [powerpc], linux-headers-2.6.17-8-powerpc-smp [powerpc], linux-headers-2.6.17-8-mckinley [ia64], linux-headers-2.6.17-8-itanium [ia64], linux-headers-2.6.17-8-hppa32 [hppa], linux-headers-2.6.17-8-hppa64 [hppa], linux-headers-2.6.17-8-sparc64-smp [sparc], linux-headers-2.6.17-8-sparc64 [sparc], module-init-tools, rpm, sed (>> 3.0), sharutils, bzip2, libgtk2.0-dev [i386 amd64], libxxf86misc-dev [i386 amd64], libxtst-dev [i386 amd64], libxxf86vm-dev [i386 amd64], libxinerama-dev [i386 amd64], libstdc++5 [i386 amd64] + +Package: linux-restricted-modules-common +Architecture: all +Priority: optional +Depends: binutils-static +Description: Non-free Linux 2.6.17 modules helper script + This package provides only a set of helper scripts to handle + linux-restricted-modules. + +Package: linux-restricted-modules-2.6.17-8-386 +Architecture: i386 +Priority: optional +Provides: nvidia-kernel-1.0.8774, nvidia-kernel-1.0.7184 +Depends: linux-image-2.6.17-8-386, linux-restricted-modules-common (>= 2.6.17), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy, avm-fritz-firmware-2.6.17-8 +Description: Non-free Linux 2.6.17 modules on 386 + This package provides restricted modules for Linux version 2.6.17 on + 386. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl, fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcdslusba, + fcpci, fcusb, fxusb (AVM ISDN) + - ltmodem (Winmodem) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: nvidia-glx +Architecture: i386 amd64 +Depends: nvidia-kernel-${nvidia:Version}, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-kernel-source (>= ${nvidia:Version}) +Conflicts: nvidia-glx-src, nvidia-settings, nvidia-xconfig +Replaces: nvidia-glx-src +Provides: xserver-xorg-video +Description: NVIDIA binary XFree86 4.x/X.Org driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. + . + To enable the driver, run "sudo nvidia-glx-config enable". + +Package: nvidia-glx-dev +Architecture: i386 amd64 +Depends: nvidia-glx (>= ${nvidia:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Description: NVIDIA binary XFree86 4.x/X.Org driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src +Replaces: nvidia-kernel-src +Description: NVIDIA binary kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: nvidia-glx-legacy +Architecture: i386 amd64 +Depends: nvidia-kernel-${nvidia:LegacyVersion}, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-settings, nvidia-legacy-kernel-source (>= ${nvidia:LegacyVersion}) +Conflicts: nvidia-glx-src, nvidia-glx +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the TNT, + TNT2, TNT Ultra, GeForce, and GeForce2 chipsets. AGP, TV-out and flat panel + displays are also supported. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the above paragraph, please use the nvidia-glx driver, + which is much more up to date. + . + To enable the driver, run "sudo nvidia-glx-config enable". + +Package: nvidia-glx-legacy-dev +Architecture: i386 amd64 +Depends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + development files. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-legacy-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'legacy' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + +Package: fglrx-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: xorg-driver-fglrx (>= ${ati:XOrgVersion}), kernel-package (>= 8.082), devscripts +Description: ATI binary kernel module source + This package builds the ATI XFree86 4.x/X.Org binary kernel module needed + by xorg-driver-fglrx. This package is not needed on an + Ubuntu system because a pre-compiled kernel module is supplied by the + linux-restricted-modules packages. + +Package: xorg-driver-fglrx +Architecture: i386 amd64 +Depends: xserver-xorg-core (>= 1:0.99.0-1), ${shlibs:Depends} +Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy +Replaces: fglrx-driver, xfree86-driver-fglrx +Provides: fglrx-driver, xserver-xorg-video +Description: Video driver for ATI graphics accelerators + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This version of the ATI driver officially supports: + * ATI Radeon 8500, 9000, 9100, 9200, 9250 (R2xx) + * ATI Radeon 9500, 9550, 9600, 9700, 9800, X300, X400, X600 (R3xx) + * ATI Radeon X700, X800 (R4xx) + * ATI Mobility 9000, 9600, 9800 + * ATI FireGL 8700, 8800, E1, E2, X1, X2, X3, Z1, T2, 5100, 7100, 7200 + * ATI Mobility FireGL 9000, T2, T2e + . + This package provides 2D display drivers and hardware accelerated OpenGL. + +Package: xorg-driver-fglrx-dev +Architecture: i386 amd64 +Depends: xorg-driver-fglrx (= ${ati:XOrgFullVersion}) +Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev +Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev +Provides: fglrx-driver-dev +Description: Video driver for ATI graphics accelerators (devel files) + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This package provides definitions for the GL and GLX extensions + and the FGLRXGAMMA extension interface library. + +Package: fglrx-control +Architecture: i386 amd64 +Depends: xorg-driver-fglrx, ${shlibs:Depends} +Description: Control panel for the ATI graphics accelerators + Control panel for the ATI Radeon and FireGL graphics accelerators. + . + This package provides the control panel compiled for Qt3. + +Package: avm-fritz-kernel-source +Architecture: amd64 i386 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: kernel-package (>= 8.082), devscripts +Description: AVM Fritz! binary kernel module source + This package builds the binary kernel modules needed for the AVM FRITZ! + ISDN hardware. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: avm-fritz-firmware-2.6.17-8 +Architecture: amd64 i386 +Depends: capiutils (>= 1:3.6.2005-01-03-3ubuntu1) +Recommends: drdsl +Description: Firmware for AVM Fritz! ISDN hardware + This package contains firmware binaries needed for various Fritz! ISDN cards + made by AVM. The firmware is installed in a kernel specific directory to + match driver and firmware version, if more than one kernel installed. + +Package: linux-restricted-modules-2.6.17-8-generic +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-1.0.8774, nvidia-kernel-1.0.7184 +Depends: linux-image-2.6.17-8-generic, linux-restricted-modules-common (>= 2.6.17), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy, avm-fritz-firmware-2.6.17-8 +Description: Non-free Linux 2.6.17 modules on x86_64 generic + This package provides restricted modules for Linux version 2.6.17 on + generic x86/x86_64. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-powerpc +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.17-8-powerpc, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on PowerPC + This package provides restricted modules for Linux version 2.6.17 on + PowerPC. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-powerpc-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.17-8-powerpc-smp, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on PowerPC SMP + This package provides restricted modules for Linux version 2.6.17 on + PowerPC SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-itanium +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.17-8-itanium, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on Itanium + This package provides restricted modules for Linux version 2.6.17 on + Itanium. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-mckinley +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.17-8-mckinley, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on Itanium 2 + This package provides restricted modules for Linux version 2.6.17 on + Itanium 2. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-hppa32 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.17-8-hppa32, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 32-bit HPPA + This package provides restricted modules for Linux version 2.6.17 on + 32-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-hppa64 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.17-8-hppa64, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 64-bit HPPA + This package provides restricted modules for Linux version 2.6.17 on + 64-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-sparc64 +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.17-8-sparc64, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 64-bit Sparc + This package provides restricted modules for Linux version 2.6.17 on + 64-bit Sparc. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.17-8-sparc64-smp +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.17-8-sparc64-smp, linux-restricted-modules-common (>= 2.6.17), module-init-tools +Description: Non-free Linux 2.6.17 modules on 64-bit Sparc SMP + This package provides restricted modules for Linux version 2.6.17 on + 64-bit Sparc SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: vmware-player-kernel-modules-2.6.17-8 +Architecture: i386 amd64 +Priority: optional +Depends: module-init-tools, linux-image-2.6 +Description: vmware-player modules for Linux (kernel 2.6.17) + This package contains the set of loadable kernel modules for + VMware Player. + . + This package contains the compiled kernel modules for 2.6.17. All + supported kernel types for this architecture are included in this single + package. --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/copyright +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/copyright @@ -0,0 +1,517 @@ +This is the Debian GNU/Linux prepackaged version of restricted Linux modules. + +This package was put together by Herbert Xu +and Fabio M. Di Nitto in August 2004. + +This package has been created from the following source: + +madwifi: http://sourceforge.net/projects/madwifi/ +nvidia: ftp://download.nvidia.com/XFree86/Linux-x86/1.0-6111/NVIDIA-Linux-x86-1.0-6111-pkg0.run + based on Randall Donald Debian packages. +avm: ftp://ftp.avm.de/cardware + + +Copyright and Licenses: + +MADWIFI +------- + +Main Driver: + +All files contained in this distribution are covered by the following +copyright unless explicitly identified otherwise. + +/*- + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any + * redistribution must be conditioned upon including a substantially + * similar Disclaimer requirement for further binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGES. + * + * $Id: COPYRIGHT,v 1.4 2004/01/13 18:05:41 samleffler Exp $ + */ + +HAL: + + +All files contained in this distribution are covered by the following +copyright unless explicitly identified otherwise. Note that this +copyright does _NOT_ contain a "or GPL" clause and does _NOT_ permit +redistribution with changes. + +/*- + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros + * Communications, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that the following conditions are met: + * 1. The materials contained herein are unmodified and are used + * unmodified. + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following NO + * ''WARRANTY'' disclaimer below (''Disclaimer''), without + * modification. + * 3. Redistributions in binary form must reproduce at minimum a + * disclaimer similar to the Disclaimer below and any redistribution + * must be conditioned upon including a substantially similar + * Disclaimer requirement for further binary redistribution. + * 4. Neither the names of the above-listed copyright holders nor the + * names of any contributors may be used to endorse or promote + * product derived from this software without specific prior written + * permission. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, + * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE + * FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGES. + * + * $Id: COPYRIGHT,v 1.2 2004/05/15 22:26:24 samleffler Exp $ + */ + +NVIDIA: + +Upstream Author: NVIDIA + + +Copyright: + +First a note from the README file + +Q: Why does NVIDIA not provide rpms anymore? + +A: Not every Linux distribution uses rpm, and NVIDIA wanted a single + solution that would work across all Linux distributions. As indicated + in the NVIDIA Software License, Linux distributions are welcome to + repackage and redistribute the NVIDIA Linux driver in whatever package + format they wish. + +Furthermore, an email from NVIDIA: + +Greetings, Randall! Comments below: + +On 30 Jul 2003, Randall Donald wrote: + +> To whom it may concern, +> +> My name is Randall Donald and I am the maintainer for the Debian +> downloader packages nvidia-glx-src and nvidia-kernel-src. +> As stated in your license and the README file +> ( "As indicated in the NVIDIA Software License, Linux distributions +> are welcome to repackage and redistribute the NVIDIA Linux driver in +> whatever package format they wish." ) +> I wish to include packages containing the Linux driver files in the Debian archive. +> I'd like to know if it is legally permitted to distribute binary kernel modules +> compiled from the NVIDIA kernel module source and Debian kernel headers. + +This is fine; thanks for asking. + +> I am also wondering if the "No Separation of Components" clause +> ( No Separation of Components. The SOFTWARE is licensed as a +> single product. Its component parts may not be separated for use +> on more than one computer, nor otherwise used separately from the +> other parts.) applies to splitting the glx driver and kernel module source into +> multiple binary packages. + +This is also fine. I believe this section of the license was +intended to prevent users from doing things like using our Windows +control panel with a competitor's display driver (that's not actually +possible, but you get the idea...). In the case of separating the +driver into a glx package and a kernel package (like we used to +do ourselves), this is simply a packaging issue; of course users +will use the packages together when they install. + +Please feel free to redistribute the NVIDIA graphics driver. + +Thank you for doing this for the NVIDIA+Debian community! + +- Andy + + + +The NVIDIA Software Licence is as follows. + +From http://www.nvidia.com/view.asp?IO=nv_swlicense and extracted from the +installer: + + + License For Customer Use of NVIDIA Software + + +IMPORTANT NOTICE -- READ CAREFULLY: This License For Customer Use of +NVIDIA Software ("LICENSE") is the agreement which governs use of +the software of NVIDIA Corporation and its subsidiaries ("NVIDIA") +downloadable herefrom, including computer software and associated +printed materials ("SOFTWARE"). By downloading, installing, copying, +or otherwise using the SOFTWARE, you agree to be bound by the terms +of this LICENSE. If you do not agree to the terms of this LICENSE, +do not download the SOFTWARE. + +RECITALS + +Use of NVIDIA's products requires three elements: the SOFTWARE, the +hardware on a graphics controller board, and a personal computer. The +SOFTWARE is protected by copyright laws and international copyright +treaties, as well as other intellectual property laws and treaties. +The SOFTWARE is not sold, and instead is only licensed for use, +strictly in accordance with this document. The hardware is protected +by various patents, and is sold, but this agreement does not cover +that sale, since it may not necessarily be sold as a package with +the SOFTWARE. This agreement sets forth the terms and conditions +of the SOFTWARE LICENSE only. + +1. DEFINITIONS + +1.1 Customer. Customer means the entity or individual that +downloads the SOFTWARE. + +2. GRANT OF LICENSE + +2.1 Rights and Limitations of Grant. NVIDIA hereby grants Customer +the following non-exclusive, non-transferable right to use the +SOFTWARE, with the following limitations: + +2.1.1 Rights. Customer may install and use one copy of the SOFTWARE +on a single computer, and except for making one back-up copy of +the Software, may not otherwise copy the SOFTWARE. This LICENSE +of SOFTWARE may not be shared or used concurrently on different +computers. + +2.1.2 Linux Exception. Notwithstanding the foregoing terms of +Section 2.1.1, SOFTWARE designed exclusively for use on the Linux +operating system may be copied and redistributed, provided that +the binary files thereof are not modified in any way (except for +unzipping of compressed files). + +2.1.3 Limitations. + +No Reverse Engineering. Customer may not reverse engineer, +decompile, or disassemble the SOFTWARE, nor attempt in any other +manner to obtain the source code. + +No Separation of Components. The SOFTWARE is licensed as a +single product. Its component parts may not be separated for use +on more than one computer, nor otherwise used separately from the +other parts. + +No Rental. Customer may not rent or lease the SOFTWARE to someone +else. + +3. TERMINATION + +This LICENSE will automatically terminate if Customer fails to +comply with any of the terms and conditions hereof. In such event, +Customer must destroy all copies of the SOFTWARE and all of its +component parts. + +4. COPYRIGHT + +All title and copyrights in and to the SOFTWARE (including but +not limited to all images, photographs, animations, video, audio, +music, text, and other information incorporated into the SOFTWARE), +the accompanying printed materials, and any copies of the SOFTWARE, +are owned by NVIDIA, or its suppliers. The SOFTWARE is protected +by copyright laws and international treaty provisions. Accordingly, +Customer is required to treat the SOFTWARE like any other copyrighted +material, except as otherwise allowed pursuant to this LICENSE +and that it may make one copy of the SOFTWARE solely for backup or +archive purposes. + +5. APPLICABLE LAW + +This agreement shall be deemed to have been made in, and shall be +construed pursuant to, the laws of the State of California. + +6. DISCLAIMER OF WARRANTIES AND LIMITATION ON LIABILITY + +6.1 No Warranties. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE +LAW, THE SOFTWARE IS PROVIDED "AS IS" AND NVIDIA AND ITS SUPPLIERS +DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT +NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + +6.2 No Liability for Consequential Damages. TO THE MAXIMUM +EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NVIDIA OR +ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR +CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, +DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS +OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT +OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. MISCELLANEOUS + +The United Nations Convention on Contracts for the International +Sale of Goods is specifically disclaimed. If any provision of this +LICENSE is inconsistent with, or cannot be fully enforced under, +the law, such provision will be construed as limited to the extent +necessary to be consistent with and fully enforceable under the law. +This agreement is the final, complete and exclusive agreement between +the parties relating to the subject matter hereof, and supersedes +all prior or contemporaneous understandings and agreements relating +to such subject matter, whether oral or written. Customer agrees +that it will not ship, transfer or export the SOFTWARE into any +country, or use the SOFTWARE in any manner, prohibited by the +United States Bureau of Export Administration or any export laws, +restrictions or regulations. This LICENSE may only be modified in +writing signed by an authorized officer of NVIDIA. + +ATI FGLRX +--------- + +Packaging scripts: + Copyright (C) 2002-2004 Flavio Stanchina + Licensed under the GNU GPL + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The rest: + +ATI Software End User License Agreement + +PLEASE READ THIS LICENSE CAREFULLY BEFORE USING THE SOFTWARE. BY DOWNLOADING, INSTALLING, COPYING OR USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, SIGNIFY YOUR AGREEMENT BY CLICKING THE “AGREE/ACCEPT” BUTTON. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, PROMPTLY RETURN THE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT AND (IF APPLICABLE) YOUR MONEY WILL BE REFUNDED OR IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY CLICK “DISAGREE/DECLINE”. + +1. License. ATI Technologies Inc., on behalf of itself, its subsidiaries and licensors (referred collectively as “ATI”) grants to you the following non-exclusive, right to use the software accompanying this License (hereinafter "Software") subject to the following terms and limitations: + +(a) Regardless of the media upon which it is distributed, the Software is licensed to you for use solely in conjunction with ATI hardware products to which the Software relates ("ATI Hardware"). + +(b) You own the medium on which the Software is recorded, but ATI and, if applicable, its licensors retain title to the Software and related documentation. + +(c) You may: + + i) use the Software solely in connection with the ATI Hardware on a single computer; + + ii) make one copy of the Software in machine-readable form for backup purposes only. You must reproduce on such copy ATI's copyright notice and any other proprietary legends that were on the original copy of the Software; + + iii) transfer all your license rights in the Software provided you must also transfer a copy of this License, the backup copy of the Software, the ATI Hardware and the related documentation and provided the other party reads and agrees to accept the terms and conditions of this License. Upon such transfer your license rights are then terminated. + +(d) In addition to the license terms above, with respect to portions of the Software in source code form designed exclusively for use with the Linux operating system (“ATI Linux Code”), you may use, display, modify, copy, distribute, allow others to re-distribute, package and re-package such ATI Linux Code for commercial and non-commercial purposes, provided that: + +i) all binary components of the ATI Linux Code are not modified in any way; + +ii)the ATI Linux Code is only used as part of the Software and in connection with ATI Hardware; + +iii)all copyright notices of ATI are reproduced and you refer to these license terms; + +iv) you may not offer or impose any terms on the use of ATI Linux Code that alter or restrict this License; and + +v) if you have modified the ATI Linux Code, such modifications will be made publicly available and are licensed under the same terms provided herein to ATI or any other third party without further restriction, royalty or any other license requirement; + +vi) to the extent there is any ATI sample or control panel source code included in the ATI Linux Code, no rights are granted to modify such code except for portions thereof that may be subject to third party license terms that grant such rights; and + +vii) ATI is not obligated to provide any maintenance or technical support for any code resulting from ATI Linux Code. + +2. Restrictions. The Software contains copyrighted and patented material, trade secrets and other proprietary material. In order to protect them, and except as permitted by this license or applicable legislation, you may not: + + a) decompile, reverse engineer, disassemble or otherwise reduce the Software to a human-perceivable form; + + b) modify, network, rent, lend, loan, distribute or create derivative works based upon the Software in whole or in part; or + + c) electronically transmit the Software from one computer to another or over a network or otherwise transfer the Software except as permitted by this License. + +3. Termination. This License is effective until terminated. You may terminate this License at any time by destroying the Software, related documentation and all copies thereof. This License will terminate immediately without notice from ATI if you fail to comply with any provision of this License. Upon termination you must destroy the Software, related documentation and all copies thereof. + +4. Government End Users. If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees the Software and documentation were developed at private expense and are provided with "RESTRICTED RIGHTS". Use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time. In the event that this License, or any part thereof, is deemed inconsistent with the minimum rights identified in the Restricted Rights provisions, the minimum rights shall prevail. + +5. No Other License. No rights or licenses are granted by ATI under this License, expressly or by implication, with respect to any proprietary information or patent, copyright, trade secret or other intellectual property right owned or controlled by ATI, except as expressly provided in this License. + +6. Additional Licenses. DISTRIBUTION OR USE OF THE SOFTWARE WITH AN OPERATING SYSTEM MAY REQUIRE ADDITIONAL LICENSES FROM THE OPERATING SYSTEM VENDOR. + +7. Disclaimer of Warranty on Software. You expressly acknowledge and agree that use of the Software is at your sole risk. The Software and related documentation are provided "AS IS" and without warranty of any kind and ATI EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE, OF QUALITY, OF QUIET ENJOYMENT AND OF NON-INFRINGEMENT OF THIRD PARTY RIGHTS. ATI DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE SOFTWARE WILL BE CORRECTED. THE ENTIRE RISK AS TO THE RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, ATI DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE ORTHE RESULTS OF THE USE OF THE SOFTWARE OR RELATED DOCUMENTATION IN TERMS OF THEIR CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY ATI OR ATI'S AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU (AND NOT ATI OR ATI'S AUTHORIZED REPRESENTATIVE) ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. THE SOFTWARE IS NOT INTENDED FOR USE IN MEDICAL, LIFE SAVING OR LIFE SUSTAINING APPLICATIONS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT APPLY TO YOU. + +8. Limitation of Liability. TO THE MAXIMUM EXTENT PERMITTED BY LAW, UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL ATI, OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS, BE LIABLE TO YOU FOR ANY INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESSINFORMATION, AND THE LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE OR RELATED DOCUMENTATION, BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT, BY ATI, EVEN IF ATI OR ATI'S AUTHORIZED REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. ATI will not be liable for 1) loss of, or damage to, your records or data or 2) any damages claimed by you based on any third party claim. In no event shall ATI's total liability to you for all damages, losses, and causes of action (whether in contract, tort (including negligence) or otherwise) exceed the amount paid by you for the Software. The foregoing limitations will apply even if the above stated limitation fails of its essential purpose. + +9. Controlling Law and Severability. This License shall be governed by and construed under the laws of the Province of Ontario, Canada without reference to its conflict of law principles. Any dispute related hereto will be brought only in the courts in Toronto, Ontario, Canada and such courts are agreed to be the convenient forum. In the event of any conflicts between foreign law, rules, and regulations, and Canadian law, rules, and regulations, Canadian law, rules and regulations shall prevail and govern. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this License. If for any reason a court of competent jurisdiction finds any provision of this License or portion thereof, to be unenforceable, that provision of the License shall be enforced to the maximum extent permissible so as to effect the intent of the parties, and the remainder of this License shall continue in full force and effect. + +10. Complete Agreement. This License constitutes the entire agreement between the parties with respect to the use of the Software and the related documentation, and supersedes all prior or contemporaneous understandings or agreements, written or oral, regarding such subject matter. No amendment to or modification of this License will be binding unless in writing and signed by a duly authorized representative of ATI. + + +AVM FRITZ +--------- + +Upstream Author: AVM (http://www.avm.de/) + +License: + +The available AVM driver package consists of two portions, namely an Open +Source Software portion and a Proprietary Source Software portion. The +Proprietary Source Software portion is delivered in binary format only +and includes the firmware (.frm and .bin files) and object code (i.e. the +lib.o files and the drdsl executable). The object code, again, includes +libraries as well as specific portions of the driver. The Open Source +Software portion is licensed under the terms and conditions of the GNU +Lesser GPL (LGPL). Please be aware of the requirements of the LGPL. +You may easily download the terms of the LGPL as follows: +http://www.gnu.org/copyleft/lesser.html. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +In general, you may distribute both portions of the available AVM driver +package, i.e. on a distribution CD delivered in conjunction with your +products. In addition to the terms of the LGPL and under all AVM +intellectual property and proprietary rights, AVM grants you the worldwide, +non-exclusive and royalty-free rights + + (1) to use and copy + + (2) to make (and have made), use, import, sell, offer for sale or + otherwise distribute any of your (legal) products or services + containing (portions of) the AVM driver package. + +The Proprietary Source Software, which is delivered in object code format +only, such as the firmware, the ".o files" and the "drdsl" binary, shall +in no event be disassembled, reverse engineered, decompiled or otherwise +"be opened" and the results realised insofar shall not be copied or +distributed without the prior written approval of AVM except to the extent +as may be expressly authorized under mandatory law and the terms of the LGPL. + +It is understood that you will be responsible/liable for the software which +you offer/distribute/make available in conjunction with or which you +combine with (portions of) the AVM driver package. For instance, we refer +to the implications mentioned in the LGPL in case of a breach (your rights +granted under LGPL would terminate automatically, see Art. 4 LGPL). You +should state clearly that you offer any necessary support on your own. + + + +LTMODEM +------- + +Agere Systems WinModem End User SOFTWARE LICENSE AGREEMENT + + +YOU SHOULD READ THE TERMS AND CONDITIONS OF THIS AGREEMENT BEFORE YOU DOWNLOAD AND USE THE AGERE SYSTEMS WINMODEM LICENSED SOFTWARE. ONCE YOU HAVE READ THIS LICENSE AGREEMENT AND AGREE TO ITS TERMS, YOU MAY DOWNLOAD AND USE THE AGERE SYSTEMS WINMODEM LICENSED SOFTWARE. DOWNLOADING OR USING THE AGERE SYSTEMS WINMODEM LICENSED SOFTWARE SHOWS YOUR ACCEPTANCE OF THE TERMS OF THIS LICENSE AGREEMENT. + +The terms and conditions of this Agreement will apply to the Agere Systems WinModem Software (hereafter "Software") supplied under this Agreement and any derivatives obtained therefrom, including any copy. The term Software includes programs and related documentation supplied herewith. + +The following file is made available under the standard Linux license, a copy of which may be found at . +serial.c +serial24.c + +These additional files are not derived from any Linux open source content, and are subject to the following restrictions. +ltmodem.c +linuxif.h +ltmdmobj.o +Makefile +ltinst +ltuninst +readme.txt + +1.0 TITLE AND LICENSE GRANT + + 1.1 The Software is copyrighted and/or contains proprietary information protected by law. All Software and all copies thereof are and will remain the sole property of Agere Systems or its suppliers. Agere Systems hereby grants you a non-exclusive right to use the Software, in whatever form recorded, which is furnished to you under or in contemplation of this Agreement, in an Agere Systems winmodem. Any other use of the Software or removal of the Software from a country in which use is licensed shall automatically terminate this license. + + 1.2 You agree to use your best efforts to see that any user of the Software licensed hereunder complies with the terms and conditions of this Agreement. + + +2.0 SOFTWARE USE + + 2.1 You are permitted to make copies of the Software provided that any such copy shall contain the same copyright notice and proprietary marking included on the original Software. + + 2.2 You agree not to merge or combine any portion of the Software with any other software, other than the Linux operating system, unless expressly permitted by the laws of the jurisdiction where you are located. Any portion of the Software merged or combined with the other software will continue to be the subject of the terms and conditions of this Agreement and you agree to reproduce on the merged or combined portion of the Software the copyright and other proprietary rights notices included in the original Software. + +2.3 Redistribution and Usage + Agere permits use and limited redistribution of this Licensed Software in source and binary forms, with or without modification, subject to the following terms and conditions, in addition to the terms mentioned in this agreement. +2.3.1 Agere Systems reserves the right not to allow a third party to reuse or redistribute the software, at its sole discretion. +2.3.2 User hereby agrees not to remove or alter any copyright, trademark, credits and other proprietary notices contained within or associated with the Licensed Software, and shall include all such unaltered copyright, trademark, credits and other proprietary notices on or in every copy of the Software. +2.3.3 Notwithstanding any other provisions in this Agreement to the contrary, any modifications or alterations made to the Licensed Software shall cause any warranties and intellectual property indemnifications to become null and void and of no further effect. + +3.0 DISCLAIMER OF WARRANTY + + 3.1 You understand and acknowledge that the Software may contain errors, bugs or other defects. The Software is provided on AS-IS basis, without warranty of any kind. + + 3.2 Agere Systems has used reasonable efforts to minimize defects or errors in the Software. HOWEVER, YOU ASSUME THE RISK OF ANY AND ALL DAMAGE OR LOSS FROM USE OR INABILITY TO USE THE SOFTWARE. Specifically, but not in limitation of the foregoing disclaimers, Agere Systems does not warrant that the functions of the Software will meet your requirements or that the Software operation will be error-free or uninterrupted. + + 3.3 Agere Systems bears no responsibility for supplying assistance for fixing or for communicating known errors to you pertaining to the Software supplied hereunder. + + 3.4 YOU UNDERSTAND THAT AGERE SYSTEMS, ITS AFFILIATES, CONTRACTORS, SUPPLIERS, AND AGENTS MAKE NO WARRANTIES, EXPRESS OR IMPLIED, AND SPECIFICALLY DISCLAIM ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + +4.0 EXCLUSIVE REMEDIES AND LIMITATION OF LIABILITIES + + 4.1 Regardless of any other provisions of this Agreement, neither Agere Systems nor its affiliates, contractors, suppliers, or agents shall be liable for any indirect, incidental, or consequential damages (including lost profits) sustained or incurred in connection with the use, operation, or inability to use the Software or for damages due to causes beyond the reasonable control of Agere Systems, its affiliates, contractors, suppliers, and agents attributable to any service, products, or action of any other person. + + 4.2 This Agreement shall be construed in accordance with and governed by the laws of the State of New York. + +YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT AND UNDERSTAND IT, AND THAT BY DOWNLOADING OR USING THE SOFTWARE, YOU AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. YOU FURTHER AGREE THAT THIS AGREEMENT IS THE COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES. THIS AGREEMENT SUPERCEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN US RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT. + + +IPW3945d +-------- + +Copyright (c) 2006, Intel Corporation. +All rights reserved. + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Intel Corporation nor the names of its suppliers + may be used to endorse or promote products derived from this software + without specific prior written permission. +* No reverse engineering, decompilation, or disassembly of this software + is permitted. + +Limited patent license. Intel Corporation grants a world-wide, +royalty-free, non-exclusive license under patents it now or hereafter +owns or controls to make, have made, use, import, offer to sell and +sell ("Utilize") this software, but solely to the extent that any +such patent is necessary to Utilize the software alone, or in +combination with an operating system licensed under an approved Open +Source license as listed by the Open Source Initiative at +http://opensource.org/licenses. The patent license shall not apply to +any other combinations which include this software. No hardware per +se is licensed hereunder. + +DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/modules/powerpc/nic-restricted-modules +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/modules/powerpc/nic-restricted-modules @@ -0,0 +1,3 @@ +drivers/net/wireless/ath/ath_pci.o +drivers/net/wireless/ath_hal/ath_hal.o +drivers/net/wireless/ath_rate/onoe/ath_rate_onoe.o --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/modules/i386/nic-restricted-modules +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/modules/i386/nic-restricted-modules @@ -0,0 +1,3 @@ +drivers/net/wireless/ath/ath_pci.o +drivers/net/wireless/ath_hal/ath_hal.o +drivers/net/wireless/ath_rate/onoe/ath_rate_onoe.o --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/modules/amd64/nic-restricted-modules +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/modules/amd64/nic-restricted-modules @@ -0,0 +1,3 @@ +drivers/net/wireless/ath/ath_pci.o +drivers/net/wireless/ath_hal/ath_hal.o +drivers/net/wireless/ath_rate/onoe/ath_rate_onoe.o --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/firmware/powerpc/nic-restricted-firmware +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/firmware/powerpc/nic-restricted-firmware @@ -0,0 +1,5 @@ +RADIO0d.BIN +RADIO11.BIN +RADIO15.BIN +TIACX111.BIN +WLANGEN.BIN --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/firmware/i386/nic-restricted-firmware +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/firmware/i386/nic-restricted-firmware @@ -0,0 +1,5 @@ +RADIO0d.BIN +RADIO11.BIN +RADIO15.BIN +TIACX111.BIN +WLANGEN.BIN --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/firmware/amd64/nic-restricted-firmware +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/firmware/amd64/nic-restricted-firmware @@ -0,0 +1,5 @@ +RADIO0d.BIN +RADIO11.BIN +RADIO15.BIN +TIACX111.BIN +WLANGEN.BIN --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/package-list +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/package-list @@ -0,0 +1,19 @@ +# This file is used to build up the control file. The kernel version and +# "-di" are appended to the package names. Section can be left out. So can +# architecture, which is derived from the files in the modules directory. +# It overwrites specifications from /usr/share/kernel-wedge/package-list. +# +Package: nic-restricted-modules +Section: restricted/debian-installer +Priority: standard +Description: Restricted drivers for NICs + This package contains drivers for some NICs. These drivers are "restricted" + because they are not available under a completely Free licence. + +Package: nic-restricted-firmware +Section: restricted/debian-installer +Priority: standard +Description: Restricted external firmware for NIC drivers + This package contains external binary-only firmware for some NIC drivers. + These firmware images are "restricted" because they are not available under + a completely Free licence. --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/kernel-versions.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/kernel-versions.in @@ -0,0 +1,4 @@ +# arch version flavour installedname suffix build-depends +i386 @@ABIVER@@ 386 @@ABIVER@@-386 - +powerpc @@ABIVER@@ powerpc @@ABIVER@@-powerpc - +amd64 @@ABIVER@@ generic @@ABIVER@@-generic - --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/d-i/kernel-versions +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/d-i/kernel-versions @@ -0,0 +1,5 @@ +# THIS FILE IS AUTO-GENERATED FROM kernel-versions.in +# arch version flavour installedname suffix build-depends +i386 2.6.17-8 386 2.6.17-8-386 - +powerpc 2.6.17-8 powerpc 2.6.17-8-powerpc - +amd64 2.6.17-8 generic 2.6.17-8-generic - --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.links.amd64.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.links.amd64.in @@ -0,0 +1,13 @@ +usr/lib32/libGL.so.@@VERSION@@ usr/lib32/libGL.so.1 +usr/lib32/libGLcore.so.@@VERSION@@ usr/lib32/libGLcore.so.1 +usr/lib32/libnvidia-cfg.so.@@VERSION@@ usr/lib32/libnvidia-cfg.so.1 +usr/lib32/libnvidia-tls.so.@@VERSION@@ usr/lib32/libnvidia-tls.so.1 +usr/lib32/tls/libnvidia-tls.so.@@VERSION@@ usr/lib32/tls/libnvidia-tls.so.1 +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/libglx.so.@@VERSION@@ usr/lib/xorg/modules/libglx.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/xorg-driver-fglrx.preinst +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/xorg-driver-fglrx.preinst @@ -0,0 +1,68 @@ +#! /bin/sh +# preinst script for xorg-driver-fglrx +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# For details see /usr/share/doc/packaging-manual/ + +if [ `dpkg --print-installation-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + # create new diversion directories + if [ ! -d /usr/lib/fglrx ]; then + mkdir -p /usr/lib/fglrx || true + fi + if [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib/fglrx ]; then + mkdir -p /usr/X11R6/lib/fglrx || true + fi + if [ -n "$HAS_LIB32" ] && [ ! -d /usr/lib32/fglrx ]; then + mkdir -p /usr/lib32/fglrx || true + fi + if [ -n "$HAS_LIB32" ] && [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib32/fglrx ]; then + mkdir -p /usr/X11R6/lib32/fglrx || true + fi + + # make new diversions + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + if [ -n "$HAS_LIB32" ]; then + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.shlibs.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.shlibs.in @@ -0,0 +1,4 @@ +libGL 1 libgl1-mesa | libgl1 +libGLcore 1 libgl1-mesa | libgl1 +libXvMCNVIDIA_dynamic 1 nvidia-glx +libnvidia-tls 1 nvidia-glx --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.reportbug.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.reportbug.in @@ -0,0 +1,33 @@ +#!/bin/sh + +PATH=/sbin:$PATH + +printf "uname -r:\n" >&3 +echo `uname -a` >&3 +printf "\n\n/proc/version:\n" >&3 +cat /proc/version >&3 +printf "\n\n" >&3 + +if [ -e /proc/driver/nvidia/version ]; then + printf "/proc/driver/nvidia/version:\n" >&3 + cat /proc/driver/nvidia/version + printf "\n\n" >&3 +fi + +if (lspci --version) > /dev/null 2>&1; then + LC_ALL=C lspci | grep 'VGA compatible controller:' >&3 + LC_ALL=C lspci -n | grep 'Class 0300:' >&3 + printf "\n" >&3 +fi + +#if [ -e /etc/X11/XF86Config-4 ]; then +# cat /etc/X11/XF86Config-4 >&3 +# printf "\n" >&3 +#fi + +#if [ -e /var/log/XFree86.0.log ]; then +# cat /var/log/XFree86.0.log >&3 +# printf "\n" >&3 +#fi + +#ls -d -l /var/log/XFree86.*.log >&3 2> /dev/null --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/getavmcardware.py +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/getavmcardware.py @@ -0,0 +1,211 @@ +#! /usr/bin/python + +import os, re, sys +import ftplib +import fnmatch, glob +import shutil, tempfile, tarfile + +download_base = 'avm-download' +server = 'ftp.avm.de' +prefix = '/cardware' +versions = ['93', '92', '91', '90', '82', '81', '80'] +active_cards = [ + 'a1', + 'a1_pcm', + 'a1_plus', + 'b1', + 'b1_pci', + 'b1_pcm', + 'b1_usb', + 'c2', + 'c4', + 't1', + 't1-b', +] +fritz_cards = [ + 'fritzcrd.dsl', + 'fritzcrd.dsl_sl', + 'fritzcrd.dsl_sl_usb', + 'fritzcrd.dsl_usb', + 'fritzcrd.dsl_usb_analog', + 'fritzcrd.dsl_v20', + 'fritzcrd.pci', + 'fritzcrd.pcm', + #'fritzcrd.pnp', not supported anymore + 'fritzcrd.usb', + 'fritzcrdusb-v20', + 'fritzgsm', + 'fritzx.isdn', + 'fritzx.pc', + 'fritzx.usb', + 'fritzxpc.v20', + 'fritzxpc.v30', + 'fritzxusb.v20', + 'fritzxusb.v30', +] + +cards = active_cards + fritz_cards +cards = fritz_cards[:] + +class Driver: + def __init__(self, card, is64bit=False, localdir = None, tarname = None, tarsize = 0): + self.name = None + self.card = card + self.cards = set([card]) + self.dir = None + self.tarname = tarname + self.tarsize = tarsize + self.localdir = localdir + self.is64bit = is64bit + self.set_name_and_version() + + def set_name_and_version(self): + if self.tarname: + match = re.match(r'(\w+)-suse[\d.]*(?:-64bit)?-([\d.-]+)\.tar.gz', self.tarname) + self.name = match.group(1) + self.version = match.group(2) + + def getline(self, s): + self.line = s + + def get_tarball_info(self, ftp, prefix): + if self.is64bit: + linuxdir = 'linux_64bit' + else: + linuxdir = 'linux' + for version in versions: + self.directory = '%s/%s/%s/suse.%s' % (prefix, self.card, linuxdir, version) + try: + ftp.cwd(self.directory) + files = ftp.nlst() + except ftplib.error_perm, msg: + continue + p = '*suse*tar.gz' + files = fnmatch.filter(files, p) + if len(files): + self.tarname = files[0] + self.set_name_and_version() + ftp.retrlines('LIST %s/%s' % (self.directory, files[0]), self.getline) + self.tarsize = int(self.line.split()[4]) + return + return + + def is_download_needed(self, ftp, localdir): + try: + localsize = os.stat(os.path.join(localdir, self.tarname))[6] + except OSError: + return True + return localsize != self.tarsize + + def fetch_tarball(self, ftp, localdir): + print 'get %-23s %9d %s' % (self.card, self.tarsize, self.tarname) + self.localdir = localdir + ftp.retrbinary('RETR %s/%s' % (self.directory, self.tarname), + file(os.path.join(localdir, self.tarname), 'wb').write) + + def read_tarball(self): + return file(os.path.join(self.localdir, self.tarname)).read() + + def extract_tarball(self): + cwd = os.getcwd() + tmpdir = tempfile.mkdtemp() + print self.name, tmpdir + tar = tarfile.open(os.path.join(self.localdir, self.tarname), 'r:gz') + os.chdir(tmpdir) + for tarinfo in tar: + tar.extract(tarinfo) + tar.close() + os.chdir(cwd) + if os.path.isdir(os.path.join(tmpdir, 'active')): + driverdir = 'active' + elif os.path.isdir(os.path.join(tmpdir, 'fritz')): + driverdir = 'fritz' + else: + raise "ERROR, unknown directory" + print driverdir, self.name + try: + shutil.rmtree(os.path.join(driverdir, self.name)) + except: + pass + if self.is64bit: + targetdir = driverdir + '64' + else: + targetdir = driverdir + try: + os.makedirs(targetdir) + except: + pass + shutil.move(os.path.join(tmpdir, driverdir), + os.path.join(targetdir, self.name)) + shutil.rmtree(tmpdir) + +def do_download(cards, download_dir, is64bit): + tarballs = [] + ftp = ftplib.FTP(server) + ftp.login() + for card in cards: + d = Driver(card, is64bit) + d.get_tarball_info(ftp, prefix) + if d.tarname == None: + continue + try: + shutil.rmtree('%s/%s' % (download_dir, card)) + except: + pass + os.makedirs('%s/%s' % (download_dir, card)) + if d.is_download_needed(ftp, '%s/%s' % (download_dir, card)): + d.fetch_tarball(ftp, '%s/%s' % (download_dir, card)) + else: + print "up to date:", card, d.tarname + tarballs.append(d) + +def do_compare(tarballs, download_dir, is64bit): + if tarballs == None: + tarballs = [] + for tb in glob.glob('%s/*/*.tar.gz' % download_dir): + localdir, tarname = os.path.split(tb) + card = os.path.basename(localdir) + localsize = os.stat(tb)[6] + d = Driver(card, is64bit, localdir, tarname, localsize) + tarballs.append(d) + + tbset = set(tarballs) + for i1 in range(len(tarballs)): + tb1 = tarballs[i1] + data1 = tb1.read_tarball() + for i2 in range(i1+1, len(tarballs)): + tb2 = tarballs[i2] + data2 = tb2.read_tarball() + if data1 == data2: + print "Identical:", tb1.card, tb2.card + tb1.cards.add(tb2.card) + tb2.cards.add(tb1.card) + tbset.discard(tb2) + for i in range(len(tarballs)-1, -1, -1): + if not tarballs[i] in tbset: + del tarballs[i] + return tarballs + +def extract_tarballs(tarballs): + for tb in tarballs: + tb.extract_tarball() + +def do_arch(is64bit): + if is64bit: + download_dir = os.path.join(download_base, '64') + else: + download_dir = os.path.join(download_base, '32') + if not os.path.isdir(download_dir): + os.makedirs(download_dir) + tarballs = None + tarballs = do_download(cards, download_dir, is64bit) + tarballs = do_compare(tarballs, download_dir, is64bit) + for tb in tarballs: + print tb.cards + extract_tarballs(tarballs) + +def main(): + do_arch(True) # 64bit + do_arch(False) # 32bit + +main() --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.docs.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.docs.in @@ -0,0 +1,3 @@ +@dirname@/usr/share/doc/NVIDIA_Changelog +@dirname@/usr/share/doc/README* +@dirname@/usr/share/doc/nvidia-settings-user-guide.txt --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.prerm.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.prerm.in @@ -0,0 +1,42 @@ +#! /bin/sh +# prerm script for nvidia-drivers +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) +# install-info --quiet --remove /usr/info/nvidia-drivers.info.gz + [ -n "@@NV_LEGACY@@" ] && rm -f /etc/modprobe.d/nvidia-glx-legacy + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.override.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.override.in @@ -0,0 +1,14 @@ +nvidia-glx@@NV_LEGACY@@: library-not-linked-against-libc ./usr/lib/libGL.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: library-not-linked-against-libc ./usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libGL.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libGLcore.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/X11R6/lib/libXvMCNVIDIA.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so +nvidia-glx@@NV_LEGACY@@: non-dev-pkg-with-shlib-symlink usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ usr/X11R6/lib/modules/extensions/libglx.so --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/linux-restricted-modules-common.init +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/linux-restricted-modules-common.init @@ -0,0 +1,24 @@ +#!/bin/sh + +test -x /sbin/lrm-manager || exit 0 + +. /lib/lsb/init-functions + +case "$1" in + start) + log_begin_msg "Preparing restricted drivers..." + /sbin/lrm-manager --quick + status=$? + log_end_msg $status + if [ $status -ne 0 ]; then + exit $status + fi + ;; + stop|restart|reload|force-reload) + ;; + *) + echo "Usage: $0 {start}" + ;; +esac + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.postinst.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.postinst.in @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ -n "@@NV_LEGACY@@" ] && [ ! -e /etc/modprobe.d/nvidia-glx-legacy ]; then + echo "install nvidia /sbin/modprobe nvidia_legacy || /sbin/modprobe --ignore-install nvidia" > /etc/modprobe.d/nvidia-glx-legacy +fi + +#DEBHELPER# + +ldconfig --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/fglrx-kernel-source.dirs +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/fglrx-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/copy-modules.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/copy-modules.in @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +source="$1" +dest="$2" + +do_copy() { + cd $source + for i in $MODULES; do + tar cp $(eval "echo \$${i}_objs") | tar xpC $dest + done +} + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/split-module +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/split-module @@ -0,0 +1,62 @@ +#!/bin/sh + +set -e + +get_var() { + variable="$1" + dir="$2" + + tmp=$(tempfile) + cat < $tmp +split_module_print_value: + @echo \$($variable) + +include Makefile +EOF + + make -f $tmp -C $dir --no-print-directory split_module_print_value CC="$CC" GCC="$GCC" + rm -f $tmp +} + +module="$1" +build_dir="$2" +install_dir="$3" + +case "$module" in + fcdsl|fcdsl2|fcdslsl|fcdslslusb|fcdslusb|fcdslusb2|fcdslusba|fcpci|fcpcmcia|fcusb|fxusb) + export KERNELRELEASE=foo + extra_objs=../lib/$module-lib.o + objs_var="$module-objs" + ;; + fcpcmcia) + export KERNELRELEASE=foo + objs_var="fcpcmcia-objs" + ;; + fcpcmcia_cs) + export KERNELRELEASE=foo + objs_var= + extra_objs="fcpcmcia_cs.o" + ;; + *) + objs_var="$module-objs" + ;; +esac + +modpost=$module.mod.o + +if [ -n "$objs_var" ]; then + objs=$(get_var $objs_var $build_dir) + + if [ -z "$objs" ]; then + echo "split-module: failed to find objects for $module" >&2 + exit 1 + fi +fi + +install -d $install_dir/$module +for file in $objs $extra_objs $modpost; do + cp -v $build_dir/$file $install_dir/$module +done + +exit 0 + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.examples.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.examples.in @@ -0,0 +1 @@ +@dirname@/usr/share/doc/XF86Config.sample --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-legacy-kernel-source.README.Debian +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-legacy-kernel-source.README.Debian @@ -0,0 +1,166 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to Ubuntu NVIDIA packages. This document contains notes on the +kernel module interface for the NVIDIA driver offering. + + +KERNEL MODULE INSTRUCTIONS: +----------------------------------------------------------------------- + +There are TWO ways to build the nvidia-kernel package. Which one depends on +your situation with your kernel. + + METHOD #1: You are running a Ubuntu suppiled kernel or built a + kernel-headers package along with your own self-built kernel. + + METHOD #2: You are running your own self-built kernel built from kernel + source. + +Which method you choose really depends on what kernel headers you wish to +use, those from a kernel-headers package or those from kernel +source (from which you built your own kernel). + +As mentioned above, if you are running a Ubuntu supplied kernel you will +probably want to choose METHOD #1. If you compile your own kernels, METHOD #2. + + + +PRELIMINARY: +- Decide where you want to build your module. By default it +will build under /usr/src like other kernel modules but you may choose +to build it under your home directory as some people prefer and writing to +/usr violates the FHS. + + +SUPPORT FOR 2.6 KERNELS: +------------------------ +As of 1.0.5336-1, NVIDIA includes support for a 2.6 kernel. No extra steps are +required. + + +HOTPLUG SUPPORT: +------------------------ +As of version 1.0.5336-8 there is hotplug module loading support provided +in patches that are applied by default but by default, hotplug is set to +ignore PCI/AGP cards for display. To change this set IGNORE_PCI_CLASS_DISPLAY +to false in /etc/default/hotplug or run +dpkg-reconfigure -plow hotplug + + + +METHOD #1 Using a kernel-headers package +*********************************************************************** + +As root (or using fakeroot) +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + + The standard build location is /usr/src + +2. Find out your kernel version: + + uname -r For example: 2.4.21-4-k7 + +3. Download and install package: kernel-headers-2.4.21-4-k7 + It will install in /usr/src/ + + Make sure your kernel image and headers have matching release numbers to + avoid possible problems in packages built from different sources. + +4. Set some environment variables (if bash is your shell): + + export KSRC=/usr/src/kernel-headers-2.4.21-4-k7 + export KVERS=2.4.21-4-k7 + +5. Then build nvidia-kernel package: + + cd /modules/nvidia-kernel + debian/rules binary_modules + +(You can also combine step 4 and 5 into one line: +KSRC=/usr/src/kernel-headers-2.4.21-4-k7 KVERS=2.4.21-4-k7 debian/rules binary_modules) + +6. Install nvidia-kernel-common: + + If not installed already + apt-get install nvidia-kernel-common + +7. Install the nvidia-kernel package: + + dpkg -i ../nvidia-kernel-2.4.21-4-k7_1.0.6629-1+_.Custom_i386.deb + ( or similar filename ) + +Now see GENERAL NOTES below method #2 + +METHOD #2: Using your own kernel source headers +*********************************************************************** + +To build the nvidia-kernel deb you need to first make sure you have +kernel-package installed, then do the following: + +As root +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + +2. If you are NOT using the default modules location /usr/src/modules + then you must set an environment variable that points to your modules + location. + + export MODULE_LOC=/modules + + This is needed by make-kpkg which is used later. If + is /usr/src there is no need to set this. + +3. Build the modules under MODULE_LOC i.e. /modules + + cd linux (or your kernel source directory) + make-kpkg modules_image + +4. Install nvidia-kernel-common: + + apt-get install nvidia-kernel-common + +5. Install the nvidia-kernel package: + + cd (e.g. /usr/src) + dpkg -i nvidia-kernel-KVER*.deb + +Notes for method #2: + +- It is advised not to clean the kernel source tree between +"make-kpkg kernel_image" and "make-kpkg modules_image". + +- The Riva framebuffer is known to conflict with the nvidia X driver. If you +are using X it would be wise not to compile it in. The vesa framebuffer is +known to work slow but fine. + +GENERAL NOTES: + +Also you must add any users who wish to use OpenGL applications to the group +video. You can do this with: + + adduser username video + +Also note for AGP issues and further information please see the NVIDIA +README file (README.gz) in the nvidia-glx package + +An old nvidia.o might be already loaded (run 'lsmod' to check) so +do 'rmmod nvidia.o' to remove the module from memory. + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-kernel-source + + + -- Randall Donald , Fri, 30 Apr 2004 19:02:04 -0700 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/linux-restricted-modules.postinst +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/linux-restricted-modules.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +case "$1" in + configure) + lrm-manager --kver=@@KVERSION@@ + ;; +esac --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx-dev.postinst.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx-dev.postinst.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + if [ -e /etc/init.d/nvidia-glx@@NV_LEGACY@@ ] ; then + /etc/init.d/nvidia-glx@@NV_LEGACY@@ start + fi + ;; +esac + +#DEBHELPER# --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/linux-restricted-modules.postrm +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/linux-restricted-modules.postrm @@ -0,0 +1,16 @@ +#!/bin/sh + +if [ -f /lib/modules/@@KVERSION@@/volatile/.mounted ]; then + umount /lib/modules/@@KVERSION@@/volatile/ +fi + +rm -rf /lib/modules/@@KVERSION@@/volatile/ + + +case "$1" in + remove|purge) + depmod -a -q -F /boot/System.map-@@KVERSION@@ @@KVERSION@@ + ;; +esac + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx-dev.postrm.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx-dev.postrm.in @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove) + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + + if [ -d /usr/lib/nvidia ]; then + rmdir /usr/lib/nvidia || true; + + fi + if [ -d /usr/X11R6/lib/nvidia ]; then + rmdir /usr/X11R6/lib/nvidia || true; + + fi + + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/xorg-driver-fglrx.postrm +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/xorg-driver-fglrx.postrm @@ -0,0 +1,60 @@ +#! /bin/sh +# postrm script for xorg-driver-fglrx +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|purge) + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + if [ -d /usr/lib/fglrx ]; then + rmdir /usr/lib/fglrx || true; + fi + if [ -d /usr/X11R6/lib/fglrx ]; then + rmdir /usr/X11R6/lib/fglrx || true; + fi + if [ -d /usr/X11R6/lib32/fglrx ]; then + rmdir /usr/X11R6/lib32/fglrx || true; + fi + if [ -d /usr/lib32/fglrx ]; then + rmdir /usr/lib32/fglrx || true; + fi + ldconfig + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx-dev.links.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx-dev.links.in @@ -0,0 +1 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/xorg-driver-fglrx.links +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/xorg-driver-fglrx.links @@ -0,0 +1,5 @@ +usr/lib/libGL.so.1.2 usr/lib/libGL.so.1 +usr/lib/libfglrx_gamma.so.1.0 usr/lib/libfglrx_gamma.so.1 +usr/lib/libfglrx_pp.so.1.0 usr/lib/libfglrx_pp.so.1 +usr/lib/libfglrx_dm.so.1.0 usr/lib/libfglrx_dm.so.1 +usr/lib/libfglrx_tvout.so.1.0 usr/lib/libfglrx_tvout.so.1 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/linux-restricted-modules-common.postinst +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/linux-restricted-modules-common.postinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +if [ -L /etc/rcS.d/S15linux-restricted-modules-common ]; then + mv /etc/rcS.d/S15linux-restricted-modules-common \ + /etc/rcS.d/S07linux-restricted-modules-common +fi + +#DEBHELPER# + --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.preinst.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.preinst.in @@ -0,0 +1,128 @@ +#! /bin/sh +# preinst script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# For details see /usr/share/doc/packaging-manual/ + +if [ `dpkg --print-installation-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + + # Forcefully remove old init scripts and defaults files + rm -f /etc/init.d/nvidia-glx + rm -f /etc/init.d/nvidia-glx-legacy + rm -f /etc/default/nvidia-glx + rm -f /etc/default/nvidia-glx-legacy + update-rc.d nvidia-glx remove >/dev/null || true + update-rc.d nvidia-glx-legacy remove >/dev/null || true + + # Hack right now. + # rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 2>/dev/null || true + + # clean up from old diversions + if [ -d /usr/share/nvidia-glx/diversions ]; then + rm -f /usr/lib/libGL.so.1 + rm -f /usr/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null + + rm -f /usr/X11R6/lib/modules/extensions/libGLcore.a + rm -f /usr/X11R6/lib/modules/extensions/libglx.a + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions || true; + rmdir /usr/share/nvidia-glx || true; + fi + if [ -d /usr/share/nvidia-glx/diversions-X11R6 ]; then + + rm -f /usr/X11R6/lib/libGL.so.1 + rm -f /usr/X11R6/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1 /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1.2 /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + rmdir /usr/share/nvidia-glx/diversions-X11R6 || true; + rmdir /usr/share/nvidia-glx || true; + fi + + + # create new diversion directories + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + if [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib/nvidia ]; then + mkdir -p /usr/X11R6/lib/nvidia || true + fi + if [ -n "$HAS_LIB32" ] && [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib32/nvidia ]; then + mkdir -p /usr/X11R6/lib32/nvidia || true + fi + if [ -n "$HAS_LIB32" ] && [ ! -d /usr/lib32/nvidia ]; then + mkdir -p /usr/lib32/nvidia || true + fi + + # remove the old nvidia-glx diversion before re-creating it, since our + # first nvidia-glx-legacy upload was broken, argh: + if [ -n "@@NV_LEGACY@@" ] && dpkg-divert --list /usr/lib/libGL.so.1 | grep 'nvidia-glx$' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + fi + + # make new diversions + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + if [ -n "$HAS_LIB32" ]; then + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/libglx.so > /dev/null + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.postrm.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.postrm.in @@ -0,0 +1,80 @@ +#! /bin/sh +# postrm script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|purge) + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + if dpkg-divert --list /usr/X11R6/lib32/libGL.so.1 | grep 'nvidia-glx@@NV_LEGACY@@' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + fi + + if dpkg-divert --list /usr/lib32/libGL.so.1 | grep 'nvidia-glx@@NV_LEGACY@@' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/libglx.so > /dev/null + + rm -f /usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ 2> /dev/null || true + if [ -d /usr/lib/nvidia ]; then + rmdir /usr/lib/nvidia || true; + fi + if [ -d /usr/X11R6/lib/nvidia ]; then + rmdir /usr/X11R6/lib/nvidia || true; + fi + if [ -d /usr/X11R6/lib32/nvidia ]; then + rmdir /usr/X11R6/lib32/nvidia || true; + fi + if [ -d /usr/lib32/nvidia ]; then + rmdir /usr/lib32/nvidia || true; + fi + ldconfig + + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + + +#rm -f /usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ 2> /dev/null || true + + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/README-for-security-teams_or_to-update-the-nvidia-driver +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/README-for-security-teams_or_to-update-the-nvidia-driver @@ -0,0 +1,27 @@ +Hi guys, + if i will not be around when the time will come, hopefully never, that +you will have to do a security update of this package, there are several +things that you need to check and change. Specially in regards of the nvidia +part, that is yes simpler than the Debian package, but it has a bunch of +hardencoded values in different place that needs to be updated. + +This is list a good reference to keep handy: + +nvidia/NVIDIA-Linux-x86*: upstream source package +nvidia/debian.binary: contains the debian dir that will be installed + in nvidia-kernel-source package. Only the changelog entry needs + to be updated manually. All the other files are parsed automatically. + +debian/rules: there is a nvidia section at the top of the file that contains + upstreamrelease and debian version. You might want to update these + values to generate proper nvidia* packages. + The rules file can only build kernel driver for 2.6 (see PATCHLEVEL=6). + +debian/control: clearly here you need to give some love to dependecies in case + of major releases. + +debian$ grep 6111 * -rl will give you a good shot of the files that will +requires update (gived that 6111 is the nvidia release). + +Have fun! +Fabio --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-kernel-source.README.Debian +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-kernel-source.README.Debian @@ -0,0 +1,166 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to Ubuntu NVIDIA packages. This document contains notes on the +kernel module interface for the NVIDIA driver offering. + + +KERNEL MODULE INSTRUCTIONS: +----------------------------------------------------------------------- + +There are TWO ways to build the nvidia-kernel package. Which one depends on +your situation with your kernel. + + METHOD #1: You are running a Ubuntu suppiled kernel or built a + kernel-headers package along with your own self-built kernel. + + METHOD #2: You are running your own self-built kernel built from kernel + source. + +Which method you choose really depends on what kernel headers you wish to +use, those from a kernel-headers package or those from kernel +source (from which you built your own kernel). + +As mentioned above, if you are running a Ubuntu supplied kernel you will +probably want to choose METHOD #1. If you compile your own kernels, METHOD #2. + + + +PRELIMINARY: +- Decide where you want to build your module. By default it +will build under /usr/src like other kernel modules but you may choose +to build it under your home directory as some people prefer and writing to +/usr violates the FHS. + + +SUPPORT FOR 2.6 KERNELS: +------------------------ +As of 1.0.5336-1, NVIDIA includes support for a 2.6 kernel. No extra steps are +required. + + +HOTPLUG SUPPORT: +------------------------ +As of version 1.0.5336-8 there is hotplug module loading support provided +in patches that are applied by default but by default, hotplug is set to +ignore PCI/AGP cards for display. To change this set IGNORE_PCI_CLASS_DISPLAY +to false in /etc/default/hotplug or run +dpkg-reconfigure -plow hotplug + + + +METHOD #1 Using a kernel-headers package +*********************************************************************** + +As root (or using fakeroot) +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + + The standard build location is /usr/src + +2. Find out your kernel version: + + uname -r For example: 2.4.21-4-k7 + +3. Download and install package: kernel-headers-2.4.21-4-k7 + It will install in /usr/src/ + + Make sure your kernel image and headers have matching release numbers to + avoid possible problems in packages built from different sources. + +4. Set some environment variables (if bash is your shell): + + export KSRC=/usr/src/kernel-headers-2.4.21-4-k7 + export KVERS=2.4.21-4-k7 + +5. Then build nvidia-kernel package: + + cd /modules/nvidia-kernel + debian/rules binary_modules + +(You can also combine step 4 and 5 into one line: +KSRC=/usr/src/kernel-headers-2.4.21-4-k7 KVERS=2.4.21-4-k7 debian/rules binary_modules) + +6. Install nvidia-kernel-common: + + If not installed already + apt-get install nvidia-kernel-common + +7. Install the nvidia-kernel package: + + dpkg -i ../nvidia-kernel-2.4.21-4-k7_1.0.6629-1+_.Custom_i386.deb + ( or similar filename ) + +Now see GENERAL NOTES below method #2 + +METHOD #2: Using your own kernel source headers +*********************************************************************** + +To build the nvidia-kernel deb you need to first make sure you have +kernel-package installed, then do the following: + +As root +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + +2. If you are NOT using the default modules location /usr/src/modules + then you must set an environment variable that points to your modules + location. + + export MODULE_LOC=/modules + + This is needed by make-kpkg which is used later. If + is /usr/src there is no need to set this. + +3. Build the modules under MODULE_LOC i.e. /modules + + cd linux (or your kernel source directory) + make-kpkg modules_image + +4. Install nvidia-kernel-common: + + apt-get install nvidia-kernel-common + +5. Install the nvidia-kernel package: + + cd (e.g. /usr/src) + dpkg -i nvidia-kernel-KVER*.deb + +Notes for method #2: + +- It is advised not to clean the kernel source tree between +"make-kpkg kernel_image" and "make-kpkg modules_image". + +- The Riva framebuffer is known to conflict with the nvidia X driver. If you +are using X it would be wise not to compile it in. The vesa framebuffer is +known to work slow but fine. + +GENERAL NOTES: + +Also you must add any users who wish to use OpenGL applications to the group +video. You can do this with: + + adduser username video + +Also note for AGP issues and further information please see the NVIDIA +README file (README.gz) in the nvidia-glx package + +An old nvidia.o might be already loaded (run 'lsmod' to check) so +do 'rmmod nvidia.o' to remove the module from memory. + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-kernel-source + + + -- Randall Donald , Fri, 30 Apr 2004 19:02:04 -0700 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/xorg-driver-fglrx.links.amd64 +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/xorg-driver-fglrx.links.amd64 @@ -0,0 +1,6 @@ +usr/lib32/libGL.so.1.2 usr/lib32/libGL.so.1 +usr/lib/libGL.so.1.2 usr/lib/libGL.so.1 +usr/lib/libfglrx_gamma.so.1.0 usr/lib/libfglrx_gamma.so.1 +usr/lib/libfglrx_pp.so.1.0 usr/lib/libfglrx_pp.so.1 +usr/lib/libfglrx_dm.so.1.0 usr/lib/libfglrx_dm.so.1 +usr/lib/libfglrx_tvout.so.1.0 usr/lib/libfglrx_tvout.so.1 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-glx.README.Debian.in +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-glx.README.Debian.in @@ -0,0 +1,82 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to the Ubuntu NVIDIA packages. This document has notes on the +X Server and GL libraries of the NVIDIA driver offering. + + +A Note about Thread Local Storage (TLS): +---------------------------------------- +Under 2.6.x kernels a new TLS method is used and different libraries are +required. NVIDIA provides these libraries and at boot time (via +/etc/init.d/nvidia-glx) a test is performed on your system to see if +your require these extra libraries. Having the TLS libraries installed +(in /usr/lib/tls and libglx.so) running under a 2.4.x kernel will cause +problems when running GL applications. Likewise, not having these libraries +installed under 2.6.x might prevent X from starting at all. + +Simple Explanation: +To switch back and forth between the two systems simply run: + + /etc/init.d/nvidia-glx start + + This is run automatically at boot time. + +To force a certain setting (e.g. you may have a 2.4 kernel patched for +NPTL) place USE_TLS=1 in /etc/defaults/nvidia-glx for using the nvidia tls +libraries. USE_TLS=0 for not using tls libraries. This isn't normally +necessary for most users. + + +What Happens: +Symlinks are created in /usr/lib/tls from libraries installed in +/usr/lib/nvidia. Also the libglx.so.VERSION in +/usr/X11R6/lib/modules/extensions/ is symlinked to a tls-enabled one. + + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-glx + + +NOTES ABOUT GLX DRIVER AND OPENGL: +----------------------------------------------------------------------- + +Using the nvidia X driver requires some user modification. + + First, modify your /etc/X11/XF86Config-4 + + Minimum requirements: + In Section "Module" + add Load "glx" + remove Load "dri" + remove Load "GLcore" + In Section "Device" + Change Driver "nv" to Driver "nvidia" + + See /usr/share/doc/nvidia-glx/README.gz and + /usr/share/doc/nvidia-glx/examples/XF86Config.sample.gz + for descriptions of all supported options. + Appendix F: CONFIGURING AGP is an important section. + + +Note about OpenGL headers: The header files are not installed to +/usr/include/GL but to /usr/share/doc/nvidia-glx-dev/include/GL. +This is similar to what NVIDIA +does in their own packaging, allowing use of and not overwriting +preinstalled headers (e.g. xlibmesa-dev). If you wish to use the NVIDIA +supplied headers (e.g. you require NVIDIA GL extensions) you must copy them to +/usr/include/GL yourself or include /usr/share/doc/nvidia-glx-dev/include in +your includes path when compiling. + + +Also note all users using GLX must be in group video. (i.e. adduser +video) + + + + -- Randall Donald , Mon, 31 Mar 2003 23:40:05 -0800 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/vmware-player-kernel-modules-2.6.17-7.postrm +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/vmware-player-kernel-modules-2.6.17-7.postrm @@ -0,0 +1,16 @@ +#!/bin/bash -e + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + depmod -a + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-legacy-kernel-source.dirs +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-legacy-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nvidia-kernel-source.dirs +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nvidia-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/xorg-driver-fglrx.shlibs +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/xorg-driver-fglrx.shlibs @@ -0,0 +1,4 @@ +libGL 1 libgl1-mesa | libgl1 +libfglrx_pp 1 xorg-driver-fglrx +libfglrx_gamma 1 xorg-driver-fglrx +libfglrx_dm 1 xorg-driver-fglrx --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/linux-restricted-modules-common.default +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/linux-restricted-modules-common.default @@ -0,0 +1,18 @@ +# This file is sourced from the linux-restricted-modules-common init +# script and is used to disable the link-on-boot feature, one module +# at a time. This can be useful if you want to use hand-compiled +# versions of one or more modules, but keep linux-restricted-modules +# installed on your system, or just to disable modules you don't use +# and speed up your boot process by a second or two. +# +# Use a space-separated list of modules you wish to not have linked +# on boot. The following example shows a (condensed) list of all +# modules shipped in the linux-restricted-modules packages: +# +# DISABLED_MODULES="ath_hal fc fglrx ltm nv" +# +# Note that disabling "fc" disables all fcdsl drivers, "ltm" disables +# ltmodem and ltserial, and "nv" disables both the nvidia drivers. +# You can also name each module individually, if you prefer a subset. + +DISABLED_MODULES="" --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/xorg-driver-fglrx-dev.links +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/xorg-driver-fglrx-dev.links @@ -0,0 +1,4 @@ +usr/lib/libfglrx_gamma.so.1 usr/lib/libfglrx_gamma.so +usr/lib/libfglrx_pp.so.1 usr/lib/libfglrx_pp.so +usr/lib/libfglrx_dm.so.1 usr/lib/libfglrx_dm.so +usr/lib/libfglrx_tvout.so.1 usr/lib/libfglrx_tvout.so --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/nic-restricted-modules-2.6.17-5-amd64-generic-di.substvars +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/nic-restricted-modules-2.6.17-5-amd64-generic-di.substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.4-1) --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/vmware-player-kernel-modules.postinst +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/vmware-player-kernel-modules.postinst @@ -0,0 +1,20 @@ +#!/bin/bash -e + +case "$1" in + configure) + depmod -a + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.17-2.6.17.5.orig/debian/vmware-player-kernel-modules.postrm +++ linux-restricted-modules-2.6.17-2.6.17.5/debian/vmware-player-kernel-modules.postrm @@ -0,0 +1,16 @@ +#!/bin/bash -e + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + depmod -a + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0