From 1388847518943a2ab9f779ce75e4aaeca2e507c3 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 17:05:04 -0700 Subject: madwifi:Bumped/Updated for LinHES 7. --- abs/core-testing/madwifi-utils/PKGBUILD | 14 +++++++------- abs/core-testing/madwifi/PKGBUILD | 20 +++++++++++--------- abs/core-testing/madwifi/kernel-2.6.30.patch | 14 ++++++++++++++ abs/core-testing/madwifi/madwifi-ng.install | 21 ++++++--------------- 4 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 abs/core-testing/madwifi/kernel-2.6.30.patch diff --git a/abs/core-testing/madwifi-utils/PKGBUILD b/abs/core-testing/madwifi-utils/PKGBUILD index 6246983..35feeea 100644 --- a/abs/core-testing/madwifi-utils/PKGBUILD +++ b/abs/core-testing/madwifi-utils/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 7960 2008-08-05 10:51:02Z tpowa $ +# $Id: PKGBUILD 70649 2010-02-27 18:41:30Z tpowa $ # Originally by kleptophobiac # Modified by James Rayner for the repositories pkgname=madwifi-utils -pkgver=0.9.4.3844 -_kernver=2.6.28-LinHES -pkgrel=3 +pkgver=0.9.4.4119 +_kernver=2.6.33-ARCH +pkgrel=1 pkgdesc="Userspace tools of madwifi drivers for Atheros wireless chipsets." arch=(i686 x86_64) license=('GPL') -url="http://madwifi.org" +url="http://madwifi-project.org" depends=('wireless_tools') makedepends=('sharutils') provides=("madwifi-ng-utils") conflicts=("madwifi-ng-utils") replaces=("madwifi-ng-utils") -# subversion source: svn checkout http://svn.madwifi.org/madwifi/trunk madwifi +# subversion source: svn checkout http://madwifi-project.org/svn/madwifi/trunk madwifi source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2 #http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-$pkgver.tar.gz ) @@ -32,4 +32,4 @@ build() { MANDIR=/usr/share/man \ install-tools } -md5sums=('fc8b627774a91a5f0d6bd4e0d0b206fd') +md5sums=('a720a20264b312c0ff906b9888bb49ae') diff --git a/abs/core-testing/madwifi/PKGBUILD b/abs/core-testing/madwifi/PKGBUILD index 3cd078b..a6cb369 100644 --- a/abs/core-testing/madwifi/PKGBUILD +++ b/abs/core-testing/madwifi/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 22482 2008-12-26 22:45:43Z tpowa $ +# $Id: PKGBUILD 80421 2010-05-17 08:11:17Z tpowa $ # Originally by kleptophobiac # Modified by James Rayner for the repositories -_kernver=2.6.28-LinHES; +_kernver=2.6.34-LinHES pkgname=madwifi -pkgver=0.9.4.3844 -pkgrel=5 +pkgver=0.9.4.4119 +pkgrel=2 pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel" arch=(i686 x86_64) license=('GPL') -url="http://madwifi.org" -depends=('madwifi-utils' 'kernel26>=2.6.28' 'kernel26<2.6.29') +url="http://madwifi-project.org" +depends=('madwifi-utils' 'kernel26>=2.6.34' 'kernel26<2.6.35') +makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') makedepends=('sharutils') install=madwifi-ng.install -# subversion source: svn checkout http://svn.madwifi.org/madwifi/trunk madwifi +# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2 #http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz ) build() { - [ "${CARCH}" == "i686" ] && export ARCH=i386 + [ "${CARCH}" = "i686" ] && export ARCH=i386 #cd $startdir/src/$pkgname-$pkgver cd $startdir/src/$pkgname @@ -35,4 +36,5 @@ build() { mv $startdir/pkg/lib/modules/$_kernver/net/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi rm -r $startdir/pkg/lib/modules/$_kernver/net/ } -md5sums=('fc8b627774a91a5f0d6bd4e0d0b206fd') + +md5sums=('a720a20264b312c0ff906b9888bb49ae') diff --git a/abs/core-testing/madwifi/kernel-2.6.30.patch b/abs/core-testing/madwifi/kernel-2.6.30.patch new file mode 100644 index 0000000..f844668 --- /dev/null +++ b/abs/core-testing/madwifi/kernel-2.6.30.patch @@ -0,0 +1,14 @@ +--- ath/if_athvar.h~ 2009-06-13 09:38:53.000000000 +0200 ++++ ath/if_athvar.h 2009-06-13 09:38:53.000000000 +0200 +@@ -103,11 +103,6 @@ + /* + * Guess how the interrupt handler should work. + */ +-#if !defined(IRQ_NONE) +-typedef void irqreturn_t; +-#define IRQ_NONE +-#define IRQ_HANDLED +-#endif /* !defined(IRQ_NONE) */ + + #ifndef SET_MODULE_OWNER + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) diff --git a/abs/core-testing/madwifi/madwifi-ng.install b/abs/core-testing/madwifi/madwifi-ng.install index 800cb98..3711208 100644 --- a/abs/core-testing/madwifi/madwifi-ng.install +++ b/abs/core-testing/madwifi/madwifi-ng.install @@ -1,23 +1,14 @@ -# arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 + KERNEL_VERSION='2.6.34-LinHES' + depmod -ae $KERNEL_VERSION > /dev/null 2>&1 } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 - + KERNEL_VERSION='2.6.34-LinHES' + depmod -ae $KERNEL_VERSION > /dev/null 2>&1 } -# arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.28-LinHES' - depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 + KERNEL_VERSION='2.6.34-LinHES' + depmod -ae $KERNEL_VERSION > /dev/null 2>&1 } - -op=$1 -shift -$op $* -- cgit v0.12