diff options
| author | Derek Young <dyoung@nslu2-linux.org> | 2005-09-17 13:09:25 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-17 13:09:25 +0000 |
| commit | e879aac21b73889c0f3c86760099ffcf45ad7bc0 (patch) | |
| tree | f062285cffa24a750798aa6784969205f78ac59d | |
| parent | a0c2e9742361627eccb43a59b9490e2047a6146c (diff) | |
| parent | 5c8fbba855e50d4f6777f65e1be9b26ca6081d80 (diff) | |
merge of 18e90deffbe7500d559fd5a3e6ad96258087772b
and 597b1f057c7b7f29333d19ebf0b1c777db0569a9
| -rw-r--r-- | packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch | 4 | ||||
| -rw-r--r-- | packages/pvrusb2-mci/pvrusb2-mci_20050911.bb | 18 |
2 files changed, 10 insertions, 12 deletions
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 |