From 5c8fbba855e50d4f6777f65e1be9b26ca6081d80 Mon Sep 17 00:00:00 2001
From: Derek Young <dyoung@nslu2-linux.org>
Date: Sat, 17 Sep 2005 13:08:44 +0000
Subject: pvrusb2-mci: Add some ugly hackery to define LINUX_ARM_ARCH for
 nslu2, this should be properly addressed in the future

---
 .../pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch    |  4 ++--
 packages/pvrusb2-mci/pvrusb2-mci_20050911.bb           | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'packages/pvrusb2-mci')

diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch
index a364472417..829c741b69 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch
@@ -5,11 +5,11 @@
  
    modules modules_install clean:
 -	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
-+	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS=$(CFLAGS) -C $(KDIR) M=$(shell pwd) $@
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
  
    install:
 -	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
-+	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS=$(CFLAGS) -C $(KDIR) M=$(shell pwd) modules_install
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
  
  else
  
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
index aa261db2fc..94589e268c 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
@@ -4,7 +4,8 @@ SECTION = "kernel/modules"
 MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
 LICENSE = "GPL"
 PR = "r0"
-RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
+# It in fact requires these modules, but for now is using the local ones.
+# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
  
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2 \
            file://Makefile.patch;patch=1" 
@@ -13,16 +14,13 @@ S = "${WORKDIR}/pvrusb2-mci-20050911/driver"
 
 inherit module
 
-#EXTRA_OEMAKE = "CFLAGS=-I${STAGING_KERNEL_DIR}/include ${CFLAGS}" 
-export INCLUDES = "{KERNEL_SOURCE}/include"
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+          '-D__LINUX_ARM_ARCH__=5'"
 
-do_compile () {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
-                   'CFLAGS=-I${KERNEL_SOURCE}/include' \
-                   'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
-}
+EXTRA_OEMAKE = "'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
-- 
cgit 1.2.3-korg