From a35f3ba7fbd5fe44358fc52c3c64ed9f0ecbfe15 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 24 Aug 2005 22:34:15 +0000 Subject: Move qc-usb --- .../qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 +++++++++++++++++++ packages/qc-usb-messenger/qc-usb-messenger_0.8.bb | 29 ---------------------- packages/qc-usb/qc-usb-messenger_0.8.bb | 29 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 29 deletions(-) create mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty create mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger_0.8.bb create mode 100644 packages/qc-usb/qc-usb-messenger_0.8.bb (limited to 'packages') diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix new file mode 100644 index 0000000000..ff3572db8d --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix @@ -0,0 +1,25 @@ +diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c +--- qc-usb-messenger-0.8/qc-memory.c 2003-12-15 10:31:46.000000000 +0100 ++++ qc-usb-messenger-0.8-fixed/qc-memory.c 2005-02-22 17:53:50.000000000 +0100 +@@ -63,9 +63,9 @@ + #endif + + #if !HAVE_VMA +-static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); } +-#undef remap_page_range +-#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot)) ++static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); } ++#undef io_remap_page_range ++#define io_remap_page_range(vma, start, addr, size, prot) qc_io_remap_page_range((start),(addr),(size),(prot)) + #endif + + #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) +@@ -230,7 +230,7 @@ + pos = (unsigned long)src; + while ((long)size > 0) { + physaddr = kvirt_to_pa(pos); +- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) ++ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb deleted file mode 100644 index 2720b3af59..0000000000 --- a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ - file://qc-messenger-0.8-fix;patch=1" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' \ - 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ - all -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc - install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc -} - diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb new file mode 100644 index 0000000000..2720b3af59 --- /dev/null +++ b/packages/qc-usb/qc-usb-messenger_0.8.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik " +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ + file://qc-messenger-0.8-fix;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC="${KERNEL_CC}"' \ + 'LD="${KERNEL_LD}"' \ + 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ + all +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc +} + -- cgit v1.2.3