pvrusb2-mci: Fix STAGING references in TARGET_LDFLAGS, add 20080210 version which builds against modern kernels

16 files changed, 54 insertions, 60 deletions

diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20080210/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20080210/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20080210/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
index 25a08d9bff..1e24f9bf64 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
@@ -21,10 +21,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
 do_compile() {
 	cd ivtv; oe_runmake
 	cd ../driver; oe_runmake
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
index 9f91a111ad..e12c68a425 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
@@ -19,10 +19,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
 do_compile() {
 	cd ivtv; oe_runmake
 	cd ../driver; oe_runmake
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
index d8c17cbde6..6e0d4fa68c 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
@@ -19,10 +19,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
 do_compile() {
 	cd ivtv; oe_runmake
 	cd ../driver; oe_runmake
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
index fa8a68432d..c16dec2c1c 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
@@ -19,10 +19,6 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
-
 do_compile() {
 	cd ivtv; oe_runmake
 	cd ../driver; oe_runmake
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
index e80430f7d0..ad5935d45e 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r2"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
@@ -19,9 +19,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
index ac5b82be94..562733e768 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
@@ -19,9 +19,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
index 8f1cc4465b..36ea62e771 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
@@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
index 8f1cc4465b..36ea62e771 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
@@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
index 8f1cc4465b..36ea62e771 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
@@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
index 8f1cc4465b..36ea62e771 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
@@ -22,9 +22,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
index b2ad76d007..3f14c8ffe2 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom \
@@ -32,9 +32,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
index b2ad76d007..3f14c8ffe2 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom \
@@ -32,9 +32,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
index b2ad76d007..3f14c8ffe2 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom \
@@ -32,9 +32,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
index adf2fe6c5e..5bd4ea2db9 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
@@ -1,4 +1,4 @@
-require pvrusb2-mci.inc
+require pvrusb2-mci2.inc
 
 RRECOMMENDS = "kernel-module-tveeprom \
 	kernel-module-firmware-class \
@@ -31,9 +31,6 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
-
 do_install() {
         install -d ${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
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20080210.bb b/packages/pvrusb2-mci/pvrusb2-mci_20080210.bb
new file mode 100644
index 0000000000..5bd4ea2db9
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20080210.bb
@@ -0,0 +1,40 @@
+require pvrusb2-mci2.inc
+
+RRECOMMENDS = "kernel-module-tveeprom \
+	kernel-module-firmware-class \
+	kernel-module-tuner \
+	kernel-module-msp3400 \
+	kernel-module-saa7115 \
+	kernel-module-tda9887 \
+	kernel-module-v4l1-compat \
+	kernel-module-v4l2-common \
+	kernel-module-videodev"
+
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
+           file://hotplug.functions \
+           file://firmware.hotplug \
+           file://Makefile.patch;patch=1"
+
+S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+	  '-I${KERNEL_SOURCE}/drivers/media/video' "
+
+CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' "
+
+CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
+
+EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
+                'CC=${KERNEL_CC}' \
+                'LD=${KERNEL_LD}' \
+                'KDIR=${STAGING_KERNEL_DIR}'"
+
+do_install() {
+        install -d ${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
+	mkdir -p ${D}/etc/hotplug.d/firmware
+	cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware
+	cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware
+}