[arch-commits] CVS update of extra/system/lirc-ck (3 files)
Tom Killian
tom at archlinux.org
Sat Oct 13 21:33:23 UTC 2007
Date: Saturday, October 13, 2007 @ 17:33:23
Author: tom
Path: /home/cvs-extra/extra/system/lirc-ck
Removed: PKGBUILD (1.7) kernel-2.6.20.patch (1.1) lirc.install (1.5)
kernel26ck removed
---------------------+
PKGBUILD | 41 --------------
kernel-2.6.20.patch | 145 --------------------------------------------------
lirc.install | 50 -----------------
3 files changed, 236 deletions(-)
Index: extra/system/lirc-ck/PKGBUILD
diff -u extra/system/lirc-ck/PKGBUILD:1.7 extra/system/lirc-ck/PKGBUILD:removed
--- extra/system/lirc-ck/PKGBUILD:1.7 Mon Aug 20 06:07:51 2007
+++ extra/system/lirc-ck/PKGBUILD Sat Oct 13 17:33:23 2007
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD,v 1.7 2007/08/20 10:07:51 tom Exp $
-# Maintainer: Paul Mattal <paul at archlinux.org>
-
-pkgname=lirc-ck
-pkgver=0.8.2
-pkgrel=2
-_kernver=2.6.22-ck
-pkgdesc="Linux Infrared Remote Control kernel modules. For kernel26ck"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('lirc-utils' 'kernel26ck')
-makedepends=(help2man)
-source=(http://umn.dl.sf.net/sourceforge/lirc/lirc-$pkgver.tar.bz2)
-url="http://www.lirc.org/"
-install=lirc.install
-replaces=('lirc+pctv')
-md5sums=('83e7060a6693b81075c178d7e3b215af')
-
-build() {
- # configure
- cd $startdir/src/lirc-$pkgver || 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
-}
Index: extra/system/lirc-ck/kernel-2.6.20.patch
diff -u extra/system/lirc-ck/kernel-2.6.20.patch:1.1 extra/system/lirc-ck/kernel-2.6.20.patch:removed
--- extra/system/lirc-ck/kernel-2.6.20.patch:1.1 Sat Feb 17 06:54:55 2007
+++ extra/system/lirc-ck/kernel-2.6.20.patch Sat Oct 13 17:33:23 2007
@@ -1,145 +0,0 @@
---- 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
Index: extra/system/lirc-ck/lirc.install
diff -u extra/system/lirc-ck/lirc.install:1.5 extra/system/lirc-ck/lirc.install:removed
--- extra/system/lirc-ck/lirc.install:1.5 Tue Jul 24 05:26:05 2007
+++ extra/system/lirc-ck/lirc.install Sat Oct 13 17:33:23 2007
@@ -1,50 +0,0 @@
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
-# arg 1: the new package version
-pre_install() {
- /bin/true
-}
-
-# arg 1: the new package version
-post_install() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- /bin/true
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-pre_upgrade() {
- /bin/true
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- /bin/true
-}
-
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- /bin/true
-}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list