[arch-commits] CVS update of core/support/iwlwifi (PKGBUILD)

[Thomas Baechler]

    Date: Wednesday, September 19, 2007 @ 11:19:15
  Author: thomas
    Path: /home/cvs-core/core/support/iwlwifi

Modified: PKGBUILD (1.7 -> 1.8)

upgpkg: iwlwifi 1.1.0-1


----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


Index: core/support/iwlwifi/PKGBUILD
diff -u core/support/iwlwifi/PKGBUILD:1.7 core/support/iwlwifi/PKGBUILD:1.8
--- core/support/iwlwifi/PKGBUILD:1.7	Fri Aug 17 11:15:55 2007
+++ core/support/iwlwifi/PKGBUILD	Wed Sep 19 11:19:15 2007
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD,v 1.7 2007/08/17 15:15:55 thomas Exp $
+# $Id: PKGBUILD,v 1.8 2007/09/19 15:19:15 thomas Exp $
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 
 _kernver=2.6.22-ARCH
 pkgname=iwlwifi
-_dlver=1.0.0-1
-pkgver=$(echo ${_dlver} | sed 's|-|.|g')
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Driver for the Intel PRO/Wireless 3945ABG/4965AGN miniPCI express adapters"
 arch=(i686 x86_64)
@@ -12,12 +11,15 @@
 license=('GPL')
 depends=('wireless_tools' 'kernel26')
 install=iwlwifi.install
-source=(http://intellinuxwireless.org/iwlwifi/downloads/$pkgname-${_dlver}.tgz)
-md5sums=('040c862c05496ade225e6d3d0a1ef7bf')
+source=(http://intellinuxwireless.org/iwlwifi/downloads/$pkgname-${pkgver}.tgz)
+md5sums=('f7183e4309e9081f3b9ae0a705516295')
 
 build() {
-  cd $startdir/src/$pkgname-${_dlver}
-  make KSRC=/lib/modules/${_kernver}/build
+  cd $startdir/src/$pkgname-${pkgver}
+  # The first 'make' adds compatibility patches,
+  # the second actually builds
+  make KSRC=/lib/modules/${_kernver}/build || \
+  make KSRC=/lib/modules/${_kernver}/build || return 1
   #Install kernel module
   install -D -m 644 compatible/iwl3945.ko  $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless/iwl3945.ko
   install -D -m 644 compatible/iwl4965.ko  $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/wireless/iwl4965.ko