new version of ov511 drivers, includes new kernel patch. Yay.

svn path=/nixpkgs/trunk/; revision=5718
This commit is contained in:
Armijn Hemel 2006-07-16 17:46:11 +00:00
parent b9f6522b7c
commit 18104bd4e9
2 changed files with 42 additions and 43 deletions

@ -1,11 +1,11 @@
{stdenv, fetchurl, kernel}:
stdenv.mkDerivation {
name = "ov511-2.30";
name = "ov511-2.32";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2;
md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2;
md5 = "6a08025311649356242761641a1df0f2";
};
patches = [./ov511-kernel.patch];
inherit kernel;

@ -1,40 +1,39 @@
diff -ruN ov511-2.30/do_install.sh ov511-2.30.new/do_install.sh
--- ov511-2.30/do_install.sh 2003-11-12 09:24:29.000000000 +0100
+++ ov511-2.30.new/do_install.sh 2006-01-03 16:34:44.000000000 +0100
@@ -6,10 +6,10 @@
exit 1
fi
-UNAME=`uname -r`
+UNAME=$version
-INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
-INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
+INSTALL_PATH_2_4=$out/lib/modules/$UNAME/kernel/drivers/usb/
+INSTALL_PATH_2_6=$out/lib/modules/$UNAME/kernel/drivers/usb/media/
MAJMIN=`echo $UNAME | cut -d . -f 1-2`
@@ -35,7 +35,7 @@
install $MODULE $INSTALL_PATH
done
-echo Finding module dependencies
-/sbin/depmod -ae
+#echo Finding module dependencies
+#/sbin/depmod -ae
echo All done!
diff -ruN ov511-2.30/Makefile ov511-2.30.new/Makefile
--- ov511-2.30/Makefile 2005-10-12 11:19:27.000000000 +0200
+++ ov511-2.30.new/Makefile 2006-01-03 16:02:41.000000000 +0100
@@ -112,7 +112,8 @@
else # We were called from command line
-KDIR := /lib/modules/$(shell uname -r)/build
+#KDIR := /lib/modules/$(shell uname -r)/build
+KDIR := $(kernel)/lib/modules/$(version)/build
PWD := $(shell pwd)
default:
diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh
*** ov511-2.32/do_install.sh 2003-11-12 09:24:29.000000000 +0100
--- ov511-2.32.new/do_install.sh 2006-07-16 19:44:56.000000000 +0200
***************
*** 8,15 ****
UNAME=`uname -r`
! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
MAJMIN=`echo $UNAME | cut -d . -f 1-2`
--- 8,15 ----
UNAME=`uname -r`
! INSTALL_PATH_2_4=$out/lib/modules/$UNAME/kernel/drivers/usb/
! INSTALL_PATH_2_6=$out/lib/modules/$UNAME/kernel/drivers/usb/media/
MAJMIN=`echo $UNAME | cut -d . -f 1-2`
***************
*** 35,41 ****
install $MODULE $INSTALL_PATH
done
! echo Finding module dependencies
! /sbin/depmod -ae
echo All done!
--- 35,41 ----
install $MODULE $INSTALL_PATH
done
! #echo Finding module dependencies
! #/sbin/depmod -ae
echo All done!