[arch-commits] CVS update of extra/network/fcpci-suspend2 (5 files)

daniel at archlinux.org daniel at archlinux.org
Tue Oct 16 18:45:46 UTC 2007


    Date: Tuesday, October 16, 2007 @ 14:45:46
  Author: daniel
    Path: /home/cvs-extra/extra/network/fcpci-suspend2

 Removed: PKGBUILD (1.4) atomic.patch (1.1) fcpci.install (1.4)
          kernel-2.6.19.patch (1.1) kernel-2.6.20.patch (1.1)


---------------------+
 PKGBUILD            |   35 -------------------------------
 atomic.patch        |   18 ----------------
 fcpci.install       |   31 ----------------------------
 kernel-2.6.19.patch |   20 ------------------
 kernel-2.6.20.patch |   55 --------------------------------------------------
 5 files changed, 159 deletions(-)


Index: extra/network/fcpci-suspend2/PKGBUILD
diff -u extra/network/fcpci-suspend2/PKGBUILD:1.4 extra/network/fcpci-suspend2/PKGBUILD:removed
--- extra/network/fcpci-suspend2/PKGBUILD:1.4	Tue Aug 21 12:58:01 2007
+++ extra/network/fcpci-suspend2/PKGBUILD	Tue Oct 16 14:45:46 2007
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD,v 1.4 2007/08/21 16:58:01 daniel Exp $
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=fcpci-suspend2
-pkgver=31107
-pkgrel=4
-_kernver=2.6.22-suspend2
-pkgdesc="AVM ISDN driver for FRITZ PCI isdn cards. For kernel26suspend2."
-arch=(i686 x86_64)
-url="http://www.avm.de"
-depends=('capi4k-utils' 'kernel26suspend2')
-source=(ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.93/fcpci-suse93-3.11-07.tar.gz atomic.patch \
-        kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch)
-install=fcpci.install
-md5sums=('3ee301b5d0e8df9e4b915af58b725556'
-         '258b13bb2ac46960b9c91635f02cd080'
-         '5c63dc9df0810bb1ba85f3425abaa0ed'
-         '890ec6e1219a3a4bae77f5815c3ed40d'
-         '4f4f03630ed994b16b4cd167f090a116')
-
-build() {
-  cd $startdir/src/fritz/src
-  patch -Np0 -i ../../atomic.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.19.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.20.patch || return 1
-  patch -Np0 -i ../../kernel-2.6.22.patch || return 1
-  cd $startdir/src/fritz
-  make clean
-  make LIBDIR=$startdir/pkg/var/lib/fritz KDIR=/lib/modules/${_kernver}/build all || return 1
-  mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  cp $startdir/src/fritz/src/fcpci.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  rm -r $startdir/pkg/var/lib/fritz  
-  # build module dependencies
-  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpci.install
-}
Index: extra/network/fcpci-suspend2/atomic.patch
diff -u extra/network/fcpci-suspend2/atomic.patch:1.1 extra/network/fcpci-suspend2/atomic.patch:removed
--- extra/network/fcpci-suspend2/atomic.patch:1.1	Sun Oct 15 08:41:44 2006
+++ extra/network/fcpci-suspend2/atomic.patch	Tue Oct 16 14:45:46 2007
@@ -1,18 +0,0 @@
---- tools.h	2005-07-07 00:00:00.000000000 +0200
-+++ tools.h~	2006-03-13 08:27:07.000000000 +0100
-@@ -69,14 +69,7 @@
- extern void lprintf  (const char *, const char *, ...);
- extern void vlprintf (const char *, const char *, va_list);
- 
--/*---------------------------------------------------------------------------*\
--\*---------------------------------------------------------------------------*/
--static inline unsigned long atomic_xchg (
--	volatile atomic_t *	v, 
--	unsigned		value
--) {
--	return __xchg (value, &v->counter, sizeof (unsigned));
--} /* atomic_xchg */
-+
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
Index: extra/network/fcpci-suspend2/fcpci.install
diff -u extra/network/fcpci-suspend2/fcpci.install:1.4 extra/network/fcpci-suspend2/fcpci.install:removed
--- extra/network/fcpci-suspend2/fcpci.install:1.4	Tue Aug 21 12:58:01 2007
+++ extra/network/fcpci-suspend2/fcpci.install	Tue Oct 16 14:45:46 2007
@@ -1,31 +0,0 @@
- # arg 1:  the new package version
-post_install() {
-cat << EOF
-==> Add 'capiinit' to rc.conf daemons list. 
-==> If you use hotplug daemon, please blacklist hisax modules in /etc/hotplug/blacklist.
-EOF
-  sed -i -e 's/#fcpci		-	-	-	-	-	-/fcpci		-	-	-	-	-	-/g' /etc/capi.conf
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.22-suspend2
-  depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-post_remove() {
-  sed -i -e 's/fcpci		-	-	-	-	-	-/#fcpci		-	-	-	-	-	-/g' /etc/capi.conf
-    # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.22-suspend2
-  depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
Index: extra/network/fcpci-suspend2/kernel-2.6.19.patch
diff -u extra/network/fcpci-suspend2/kernel-2.6.19.patch:1.1 extra/network/fcpci-suspend2/kernel-2.6.19.patch:removed
--- extra/network/fcpci-suspend2/kernel-2.6.19.patch:1.1	Sat Dec  2 10:36:38 2006
+++ extra/network/fcpci-suspend2/kernel-2.6.19.patch	Tue Oct 16 14:45:46 2007
@@ -1,20 +0,0 @@
---- main.c~	2005-07-07 00:00:00.000000000 +0200
-+++ main.c	2006-10-17 14:56:59.000000000 +0200
-@@ -22,7 +22,6 @@
- 
- #include <stdarg.h>
- #include <asm/uaccess.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
---- driver.h~	2005-07-07 00:00:00.000000000 +0200
-+++ driver.h	2006-10-17 15:00:26.000000000 +0200
-@@ -23,7 +23,6 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
- 
--#include <linux/config.h>
- #include <linux/skbuff.h>
- #include <linux/capi.h>
- #include <linux/list.h>
Index: extra/network/fcpci-suspend2/kernel-2.6.20.patch
diff -u extra/network/fcpci-suspend2/kernel-2.6.20.patch:1.1 extra/network/fcpci-suspend2/kernel-2.6.20.patch:removed
--- extra/network/fcpci-suspend2/kernel-2.6.20.patch:1.1	Tue May  8 17:22:41 2007
+++ extra/network/fcpci-suspend2/kernel-2.6.20.patch	Tue Oct 16 14:45:46 2007
@@ -1,55 +0,0 @@
---- driver.c~	2005-07-07 00:00:00.000000000 +0200
-+++ driver.c	2007-01-08 22:33:51.000000000 +0100
-@@ -901,10 +901,10 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_init (void) {
- 
- 	return (NULL != (capi_lib = link_library (NULL)));
--} /* driver_init */
-+} /* avm_init */
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
---- main.c~	2007-01-08 22:18:57.000000000 +0100
-+++ main.c	2007-01-08 22:34:33.000000000 +0100
-@@ -204,7 +204,7 @@
- 	NOTE(PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
- 
- 	NOTE("Loading...\n");
--	if (!driver_init ()) {
-+	if (!avm_init ()) {
- 		ERROR("Error: Driver library not available.\n");
- 		ERROR("Not loaded.\n");
- 		return res;
-@@ -269,7 +269,7 @@
- 	NOTE (PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
- 
- 	NOTE("Loading...\n");
--	if (!driver_init ()) {
-+	if (!avm_init ()) {
- 		ERROR("Error: Driver library not available.\n");
- 		ERROR("Not loaded.\n");
- 		return -EBUSY;
-@@ -377,7 +377,7 @@
- 	}
- 	return err;
- #elif defined (__fcpcmcia__) || defined (__fcclassic__)
--	if (!driver_init ()) {
-+	if (!avm_init ()) {
- 		ERROR("Error: Driver library not available.\n");
- 		ERROR("Not loaded.\n");
- 		return -EBUSY;
---- driver.h~	2007-01-08 22:18:57.000000000 +0100
-+++ driver.h	2007-01-08 22:34:12.000000000 +0100
-@@ -97,7 +97,7 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
-+extern int avm_init (void);
- extern void driver_exit (void);
- 
- /*---------------------------------------------------------------------------*\




More information about the arch-commits mailing list