new version of ov511 drivers, includes new kernel patch. Yay.
svn path=/nixpkgs/trunk/; revision=5718
This commit is contained in:
parent
b9f6522b7c
commit
18104bd4e9
|
@ -1,11 +1,11 @@
|
||||||
{stdenv, fetchurl, kernel}:
|
{stdenv, fetchurl, kernel}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "ov511-2.30";
|
name = "ov511-2.32";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2;
|
url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2;
|
||||||
md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
|
md5 = "6a08025311649356242761641a1df0f2";
|
||||||
};
|
};
|
||||||
patches = [./ov511-kernel.patch];
|
patches = [./ov511-kernel.patch];
|
||||||
inherit kernel;
|
inherit kernel;
|
||||||
|
|
|
@ -1,40 +1,39 @@
|
||||||
diff -ruN ov511-2.30/do_install.sh ov511-2.30.new/do_install.sh
|
diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh
|
||||||
--- ov511-2.30/do_install.sh 2003-11-12 09:24:29.000000000 +0100
|
*** ov511-2.32/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
|
--- ov511-2.32.new/do_install.sh 2006-07-16 19:44:56.000000000 +0200
|
||||||
@@ -6,10 +6,10 @@
|
***************
|
||||||
exit 1
|
*** 8,15 ****
|
||||||
fi
|
|
||||||
|
|
||||||
-UNAME=`uname -r`
|
UNAME=`uname -r`
|
||||||
+UNAME=$version
|
|
||||||
|
|
||||||
-INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
|
! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
|
||||||
-INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
|
! 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`
|
MAJMIN=`echo $UNAME | cut -d . -f 1-2`
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@
|
--- 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
|
install $MODULE $INSTALL_PATH
|
||||||
done
|
done
|
||||||
|
|
||||||
-echo Finding module dependencies
|
! echo Finding module dependencies
|
||||||
-/sbin/depmod -ae
|
! /sbin/depmod -ae
|
||||||
+#echo Finding module dependencies
|
|
||||||
+#/sbin/depmod -ae
|
|
||||||
|
|
||||||
echo All done!
|
echo All done!
|
||||||
diff -ruN ov511-2.30/Makefile ov511-2.30.new/Makefile
|
--- 35,41 ----
|
||||||
--- ov511-2.30/Makefile 2005-10-12 11:19:27.000000000 +0200
|
install $MODULE $INSTALL_PATH
|
||||||
+++ ov511-2.30.new/Makefile 2006-01-03 16:02:41.000000000 +0100
|
done
|
||||||
@@ -112,7 +112,8 @@
|
|
||||||
|
|
||||||
else # We were called from command line
|
! #echo Finding module dependencies
|
||||||
|
! #/sbin/depmod -ae
|
||||||
|
|
||||||
-KDIR := /lib/modules/$(shell uname -r)/build
|
echo All done!
|
||||||
+#KDIR := /lib/modules/$(shell uname -r)/build
|
|
||||||
+KDIR := $(kernel)/lib/modules/$(version)/build
|
|
||||||
PWD := $(shell pwd)
|
|
||||||
|
|
||||||
default:
|
|
||||||
|
|
Loading…
Reference in New Issue