>> "Marcelo E. Magallon" <[EMAIL PROTECTED]> writes:
> Attached is a diff [...]
someday I'll learn... Thou shalt not say "attached is" beforeth
attaching it... (and thou shalt not make fun of English, either)
--
Marcelo
diff -ruN drm/Makefile.linux drm.mine/Makefile.linux
--- drm/Makefile.linux Fri May 18 22:16:09 2001
+++ drm.mine/Makefile.linux Mon May 21 13:37:44 2001
@@ -134,6 +134,8 @@
| grep -s 'AGP = ' | cut -d' ' -f3)
SIS := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
| grep -s 'SIS = ' | cut -d' ' -f3)
+KVERS := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
+ | grep -s 'KVERS = ' | cut -d' ' -f3)
PARAMS := $(shell if fgrep kill_fasync $(TREE)/linux/fs.h 2>/dev/null \
| egrep -q '(band|int, int)'; then echo 3; else echo 2; fi)
MACHINE := $(shell echo `uname -m`)
@@ -194,6 +196,10 @@
all::;@echo
else
all:: $(LIBS) $(MODS) $(PROGS)
+
+install: all
+ install -o root -g root -m 0755 -d
+$(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/char/drm/
+ install -o root -g root -m 0644 $(MODS)
+$(DESTDIR)/lib/modules/$(KVERS)/kernel/drivers/char/drm/
endif
endif
diff -ruN drm/debian/changelog drm.mine/debian/changelog
--- drm/debian/changelog Thu Jan 1 01:00:00 1970
+++ drm.mine/debian/changelog Fri May 4 17:20:06 2001
@@ -0,0 +1,9 @@
+drm (2.0.2-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Marcelo E. Magallon <[EMAIL PROTECTED]> Fri, 4 May 2001 17:18:16 +0200
+
+Local variables:
+mode: debian-changelog
+End:
diff -ruN drm/debian/control drm.mine/debian/control
--- drm/debian/control Thu Jan 1 01:00:00 1970
+++ drm.mine/debian/control Mon May 21 14:28:32 2001
@@ -0,0 +1,18 @@
+Source: drm
+Section: misc
+Priority: extra
+Build-Depends: debhelper
+Maintainer: Marcelo E. Magallon <[EMAIL PROTECTED]>
+Standards-Version: 2.4.0.0
+
+Package: drm-2.4.4-ac4
+Architecture: i386
+Provides: drm-mod
+Recommends: kernel-image-2.4.4-ac4
+Description: Direct Rendering Manager kernel modules
+ This pacakge provides the Direct Rendering Manager (DRM), a device-independent
+ kernel-level device driver that provides support for the XFree86 Direct
+ Rendering Infrastructure (DRI).
+ .
+ This package contains the drivers compiled for linux kernel
+ 2.4.4-ac4
diff -ruN drm/debian/control.modules drm.mine/debian/control.modules
--- drm/debian/control.modules Thu Jan 1 01:00:00 1970
+++ drm.mine/debian/control.modules Fri May 4 17:23:02 2001
@@ -0,0 +1,18 @@
+Source: drm
+Section: misc
+Priority: extra
+Build-Depends: debhelper
+Maintainer: Marcelo E. Magallon <[EMAIL PROTECTED]>
+Standards-Version: 2.4.0.0
+
+Package: drm-#KVERS#
+Architecture: i386
+Provides: drm-mod
+Recommends: kernel-image-#KVERS#
+Description: Direct Rendering Manager kernel modules
+ This pacakge provides the Direct Rendering Manager (DRM), a device-independent
+ kernel-level device driver that provides support for the XFree86 Direct
+ Rendering Infrastructure (DRI).
+ .
+ This package contains the drivers compiled for linux kernel
+ #KVERS#
diff -ruN drm/debian/drm-mod.README.Debian drm.mine/debian/drm-mod.README.Debian
--- drm/debian/drm-mod.README.Debian Thu Jan 1 01:00:00 1970
+++ drm.mine/debian/drm-mod.README.Debian Fri May 4 17:39:28 2001
@@ -0,0 +1,7 @@
+Make sure you first unload any older DRI kernel modules that might be
+already loaded.
+
+Note that some DRM modules require that the agpgart module be loaded
+first.
+
+ -- Marcelo E. Magallon <[EMAIL PROTECTED]>
diff -ruN drm/debian/genchanges.sh drm.mine/debian/genchanges.sh
--- drm/debian/genchanges.sh Thu Jan 1 01:00:00 1970
+++ drm.mine/debian/genchanges.sh Fri May 4 17:12:47 2001
@@ -0,0 +1,25 @@
+#!/bin/sh
+# genchanges.sh - generate a changes file for a deb file generated via
+# the make-kpkg utility
+
+# REV KSRC KMAINT and KEMAIL are expected to be passed through the
+# environment
+
+set -e
+umask 022
+
+VERS=`dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2`
+ARCH=`dpkg --print-architecture`
+
+# the changes file's name
+chfile="$KSRC/../lm-sensors-${KVERS}_${VERS}+${REV}_${ARCH}.changes"
+
+dpkg-genchanges -b ${KMAINT:+-m"$KMAINT <$KEMAIL>"} -u"$KSRC/.." > "$chfile.pt"
+if test -e "${GNUPGHOME:-$HOME/.gnupg/secring.gpg}"; then
+ gpg -ast ${KMAINT:+-u"$KMAINT"} \
+ --clearsign < "$chfile.pt" > "$chfile"
+else
+ pgp -fast ${KMAINT:+-u"$KMAINT"} +clearsig=on \
+ < "$chfile.pt" > "$chfile"
+fi
+rm "$chfile.pt"
diff -ruN drm/debian/rules drm.mine/debian/rules
--- drm/debian/rules Thu Jan 1 01:00:00 1970
+++ drm.mine/debian/rules Fri May 4 18:04:47 2001
@@ -0,0 +1,76 @@
+#!/usr/bin/make -f
+# This is fairly complicated since it can be called either to build the
+# source package, or to build a kernel module package.
+
+# Strip epoch, which is at the _end_ of KDREV
+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)
+KSRC:=/usr/src/linux
+PKG_VERSION=$(EPOCH)$(VERSION)+$(REV)
+
+# Build everything except kernel modules.
+build-modules:
+ dh_testdir
+ $(MAKE) -f Makefile.linux TREE=$(KSRC)/include
+
+clean:
+ dh_testdir
+ dh_testroot
+ $(MAKE) -f Makefile.linux clean
+ -mv -f debian/control.save debian/control
+ dh_clean debian/drm-$(KVERS).*
+
+# Build the kernel module .deb.
+binary-modules: build-modules
+ dh_clean -k
+ dh_testdir
+ dh_testroot
+
+ rm -f debian/control.save
+ cp debian/control debian/control.save
+ rm -f debian/control
+ sed 's/#KVERS#/$(KVERS)/g' debian/control.modules > debian/control
+ # And set up files so debhelper can find them.
+ ln -sf drm-mod.README.Debian debian/drm-$(KVERS).README.Debian
+
+ $(MAKE) -f Makefile.linux TREE=$(KSRC)/include DESTDIR=$(PWD)/debian/tmp
+install
+ dh_installdocs
+ dh_installexamples
+ dh_installchangelogs
+ dh_installmodules
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol -- -v$(PKG_VERSION)
+ dh_makeshlibs
+ dh_md5sums
+ dh_builddeb --destdir=$(KSRC)/..
+
+# Build architecture-independent files here.
+binary-indep:
+ # Nothing to do.
+
+# This is used when kernel-package is building the package.
+kdist_image: binary-modules clean
+ # The dependancies take care of building the module package.
+kdist: clean binary-modules
+ # Build a .changes file.
+ KVERS="$(KVERS)" KSRC="$(KSRC)" KMAINT="$(KMAINT)" \
+ REV="$(REV)" KEMAIL="$(KEMAIL)" \
+ sh -v debian/genchanges.sh
+ # Only now can we clean up.
+ debian/rules clean
+kdist_configure:
+ # Nothing to do when configured.
+kdist_clean: clean
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary kdist kdist_image kdist_configure
diff -ruN drm/picker.c drm.mine/picker.c
--- drm/picker.c Wed Nov 8 01:07:17 2000
+++ drm.mine/picker.c Mon May 21 13:38:15 2001
@@ -26,6 +26,10 @@
#define CONFIG_FB_SIS 0
#endif
+#ifndef UTS_RELEASE
+#define UTS_RELEASE 0
+#endif
+
SMP = CONFIG_SMP
MODULES = CONFIG_MODULES
MODVERSIONS = CONFIG_MODVERSIONS
@@ -33,3 +37,4 @@
AGP_MODULE = CONFIG_AGP_MODULE
RELEASE = UTS_RELEASE
SIS = CONFIG_FB_SIS
+KVERS = UTS_RELEASE
