From 1fc6ce85c476c0f0d3eda25473f7a1c58fe0aee4 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 17 Jul 2006 07:49:17 +0000 Subject: [PATCH] compile with the right kernel, mark the compilation as b0rken (because it is and needs more investigation) svn path=/nixpkgs/trunk/; revision=5726 --- pkgs/os-specific/linux/ov511/builder.sh | 4 ++++ pkgs/os-specific/linux/ov511/default.nix | 2 +- .../linux/ov511/ov511-2.32-kdir.patch | 20 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch diff --git a/pkgs/os-specific/linux/ov511/builder.sh b/pkgs/os-specific/linux/ov511/builder.sh index 8bb282cacf75..c189c2e17068 100644 --- a/pkgs/os-specific/linux/ov511/builder.sh +++ b/pkgs/os-specific/linux/ov511/builder.sh @@ -16,3 +16,7 @@ export version ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild + +echo "b0rken" + +exit 1 diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix index 00afafb42962..31151a972ca1 100644 --- a/pkgs/os-specific/linux/ov511/default.nix +++ b/pkgs/os-specific/linux/ov511/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2; md5 = "6a08025311649356242761641a1df0f2"; }; - patches = [./ov511-kernel.patch ./ov511-2.32.patch]; + patches = [./ov511-kernel.patch ./ov511-2.32.patch ./ov511-2.32-kdir.patch]; inherit kernel; NIX_GLIBC_FLAGS_SET=1; } diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch b/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch new file mode 100644 index 000000000000..e0a1175a7ff4 --- /dev/null +++ b/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch @@ -0,0 +1,20 @@ +diff -rc ov511-2.32/Makefile ov511-2.32.new/Makefile +*** ov511-2.32/Makefile 2006-03-28 17:47:31.000000000 +0200 +--- ov511-2.32.new/Makefile 2006-07-17 09:46:17.000000000 +0200 +*************** +*** 114,120 **** + + else # We were called from command line + +! KDIR := /lib/modules/$(shell uname -r)/build + PWD := $(shell pwd) + + default: +--- 114,120 ---- + + else # We were called from command line + +! KDIR := $(kernel)/lib/modules/$(version)/build + PWD := $(shell pwd) + + default: