3 files changed, 33 insertions, 15 deletions
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060209/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060209/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20060209/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch
new file mode 100644
index 0000000000..29b1267177
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20060209/Makefile.patch
@@ -0,0 +1,25 @@
+*** driver/Makefile-	Tue Feb 28 21:05:41 2006
+--- driver/Makefile	Tue Feb 28 21:07:15 2006
+***************
+*** 45,54 ****
+    M:=$(shell pwd)
+  
+    modules modules_install clean:
+! 	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
+  
+    install:
+! 	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
+  
+  else
+  
+--- 45,54 ----
+    M:=$(shell pwd)
+  
+    modules modules_install clean:
+! 	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m $@
+  
+    install:
+! 	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install
+  
+  else
+  
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
index b270be5337..bebfe55f44 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
@@ -3,21 +3,21 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
 LICENSE = "GPL"
-PR = "r0"
-# It in fact requires these modules, but for now is using the local ones.
-# RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
-RRECOMMEND = "kernel-module-tda9887"
+PR = "r1"
+RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
  
-SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2"
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
+           file://Makefile.patch;patch=1" 
 
-S = "${WORKDIR}/pvrusb2-mci-${PV}"
+S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
 inherit module
 
 CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+	  '-I${KERNEL_SOURCE}/drivers/media/video' \
           '-D__LINUX_ARM_ARCH__=5'"
 
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
+EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'" 
@@ -25,14 +25,7 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib"
 
-
-do_compile() {   
-	cd ivtv; oe_runmake
-	cd ../driver; oe_runmake 
-}
-
 do_install() {   
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-        install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
-        install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }