[arch-commits] CVS update of unstable/system/lirc-mm (PKGBUILD kernel-2.6.20.patch)
Tom Killian
tom at archlinux.org
Mon May 28 10:24:06 UTC 2007
Date: Monday, May 28, 2007 @ 06:24:06
Author: tom
Path: /home/cvs-unstable/unstable/system/lirc-mm
Added: PKGBUILD (1.1) kernel-2.6.20.patch (1.1)
upgpkg: lirc-ck 0.8.1-3
---------------------+
PKGBUILD | 41 ++++++++++++++
kernel-2.6.20.patch | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 186 insertions(+)
Index: unstable/system/lirc-mm/PKGBUILD
diff -u /dev/null unstable/system/lirc-mm/PKGBUILD:1.1
--- /dev/null Mon May 28 06:24:06 2007
+++ unstable/system/lirc-mm/PKGBUILD Mon May 28 06:24:06 2007
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD,v 1.1 2007/05/28 10:24:06 tom Exp $
+# Maintainer: Paul Mattal <paul at archlinux.org>
+
+pkgname=lirc-ck
+pkgver=0.8.1
+pkgrel=3
+_kernver=2.6.21-ck
+pkgdesc="Linux Infrared Remote Control kernel modules for kernel26ck."
+arch=(i686 x86_64)
+depends=('lirc-utils' 'kernel26ck')
+makedepends=(help2man)
+source=(http://umn.dl.sf.net/sourceforge/lirc/lirc-$pkgver.tar.bz2 kernel-2.6.20.patch)
+url="http://www.lirc.org/"
+install=lirc.install
+replaces=('lirc+pctv')
+
+build() {
+ # configure
+ cd $startdir/src/lirc-$pkgver || return 1
+ patch -Np0 -i ../kernel-2.6.20.patch || return 1
+ ./configure --enable-sandboxed --prefix=/usr \
+ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver} \
+ --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+ || return 1
+
+ # disable parallel and bt829
+ # because of incompatibility with smp systems
+ sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \
+ Makefile drivers/Makefile drivers/*/Makefile tools/Makefile \
+ || return 1
+
+ # build
+ cd drivers || return 1
+ make || return 1
+ make DESTDIR=$startdir/pkg install || return 1
+
+ # set the kernel we've built for inside the install script
+ sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
+ $startdir/lirc.install || return 1
+}
+md5sums=('3a42083fc6c54797351e52c77537c586' '5922c346bbc946a25aa6bdc3f9383308')
Index: unstable/system/lirc-mm/kernel-2.6.20.patch
diff -u /dev/null unstable/system/lirc-mm/kernel-2.6.20.patch:1.1
--- /dev/null Mon May 28 06:24:06 2007
+++ unstable/system/lirc-mm/kernel-2.6.20.patch Mon May 28 06:24:06 2007
@@ -0,0 +1,145 @@
+--- drivers/lirc_atiusb/lirc_atiusb.c 2006/10/20 05:03:38 1.55
++++ drivers/lirc_atiusb/lirc_atiusb.c 2007/01/16 08:45:04 1.56
+@@ -251,7 +251,7 @@
+ add_wait_queue(&oep->wait, &wait);
+
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(oep->urb, SLAB_ATOMIC)) {
++ if (usb_submit_urb(oep->urb, GFP_ATOMIC)) {
+ #else
+ if (usb_submit_urb(oep->urb)) {
+ #endif
+@@ -323,7 +323,7 @@
+ iep->urb->dev = ir->usbdev;
+ dprintk(DRIVER_NAME "[%d]: linking iep 0x%02x (%p)\n", ir->devnum, iep->ep->bEndpointAddress, iep);
+ #ifdef KERNEL_2_5
+- if ((rtn = usb_submit_urb(iep->urb, SLAB_ATOMIC)) < 0) {
++ if ((rtn = usb_submit_urb(iep->urb, GFP_ATOMIC)) < 0) {
+ #else
+ if ((rtn = usb_submit_urb(iep->urb)) < 0) {
+ #endif
+@@ -659,7 +659,7 @@
+
+ /* resubmit urb */
+ #ifdef KERNEL_2_5
+- usb_submit_urb(urb, SLAB_ATOMIC);
++ usb_submit_urb(urb, GFP_ATOMIC);
+ #endif
+ }
+
+@@ -775,7 +775,7 @@
+ iep->len = len;
+
+ #ifdef KERNEL_2_5
+- if ( !(iep->buf = usb_buffer_alloc(dev, len, SLAB_ATOMIC, &iep->dma)) ) {
++ if ( !(iep->buf = usb_buffer_alloc(dev, len, GFP_ATOMIC, &iep->dma)) ) {
+ mem_failure = 2;
+ } else if ( !(iep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ mem_failure = 3;
+@@ -856,7 +856,7 @@
+ init_waitqueue_head(&oep->wait);
+
+ #ifdef KERNEL_2_5
+- if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, SLAB_ATOMIC, &oep->dma)) ) {
++ if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, GFP_ATOMIC, &oep->dma)) ) {
+ mem_failure = 2;
+ } else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ mem_failure = 3;
+--- drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006/10/20 05:03:38 1.9
++++ drivers/lirc_igorplugusb/lirc_igorplugusb.c 2007/01/16 08:45:04 1.10
+@@ -484,7 +484,7 @@
+ #if defined(KERNEL_2_5)
+ } else if (!(ir->buf_in = usb_buffer_alloc(dev,
+ DEVICE_BUFLEN+DEVICE_HEADERLEN,
+- SLAB_ATOMIC, &ir->dma_in))) {
++ GFP_ATOMIC, &ir->dma_in))) {
+ mem_failure = 5;
+ #else
+ } else if (!(ir->buf_in = kmalloc(
+--- drivers/lirc_mceusb/lirc_mceusb.c 2006/10/20 05:03:38 1.13
++++ drivers/lirc_mceusb/lirc_mceusb.c 2007/01/16 08:45:04 1.14
+@@ -768,7 +768,7 @@
+ dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+ dev->bulk_in_buffer = usb_buffer_alloc
+- (udev, buffer_size, SLAB_ATOMIC, &dev->dma_in);
++ (udev, buffer_size, GFP_ATOMIC, &dev->dma_in);
+ #else
+ dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
+ #endif
+@@ -795,7 +795,7 @@
+ dev->bulk_out_size = buffer_size;
+ dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+- dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, SLAB_ATOMIC, &dev->dma_out);
++ dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, GFP_ATOMIC, &dev->dma_out);
+ #else
+ dev->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL);
+ #endif
+--- drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 06:05:27 1.22
++++ drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 08:45:04 1.23
+@@ -264,7 +264,7 @@
+ async_urb->transfer_buffer_length = size;
+ async_urb->dev = ir->usbdev;
+
+- if ((res=usb_submit_urb(async_urb, SLAB_ATOMIC))) {
++ if ((res=usb_submit_urb(async_urb, GFP_ATOMIC))) {
+ dprintk(DRIVER_NAME "[%d]: receive request FAILED! (res=%d)\n", ir->devnum, res);
+ return;
+ }
+@@ -467,7 +467,7 @@
+ }
+
+ /* resubmit urb */
+- usb_submit_urb(urb, SLAB_ATOMIC);
++ usb_submit_urb(urb, GFP_ATOMIC);
+ }
+
+
+@@ -703,7 +703,7 @@
+ mem_failure = 3;
+ } else if (lirc_buffer_init(rbuf, sizeof(lirc_t), LIRCBUF_SIZE)) {
+ mem_failure = 4;
+- } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, SLAB_ATOMIC, &ir->dma_in))) {
++ } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, GFP_ATOMIC, &ir->dma_in))) {
+ mem_failure = 5;
+ } else if (!(ir->urb_in = usb_alloc_urb(0, GFP_KERNEL))) {
+ mem_failure = 7;
+--- drivers/lirc_streamzap/lirc_streamzap.c 2006/12/01 04:11:52 1.18
++++ drivers/lirc_streamzap/lirc_streamzap.c 2007/01/16 08:45:04 1.19
+@@ -458,7 +458,7 @@
+
+ #ifdef KERNEL_2_5
+ /* resubmit only for 2.6 */
+- usb_submit_urb( urb, SLAB_ATOMIC );
++ usb_submit_urb( urb, GFP_ATOMIC );
+ #endif
+
+ return;
+@@ -556,7 +556,7 @@
+ sz->buf_in_len = sz->endpoint->wMaxPacketSize;
+ #ifdef KERNEL_2_5
+ if((sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
+- SLAB_ATOMIC, &sz->dma_in)) == NULL )
++ GFP_ATOMIC, &sz->dma_in)) == NULL )
+ {
+ goto error;
+ }
+@@ -715,7 +715,7 @@
+
+ sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++ if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ if (usb_submit_urb(sz->urb_in))
+ #endif
+@@ -866,7 +866,7 @@
+
+ sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+- if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++ if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ if (usb_submit_urb(sz->urb_in))
+ #endif
More information about the arch-commits
mailing list