[arch-commits] CVS update of extra/network/iwlwifi-suspend2 (PKGBUILD)

[daniel at archlinux.org]

    Date: Wednesday, September 26, 2007 @ 13:42:16
  Author: daniel
    Path: /home/cvs-extra/extra/network/iwlwifi-suspend2

Modified: PKGBUILD (1.2 -> 1.3)

upgpkg: iwlwifi-suspend2 1.1.0-1


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


Index: extra/network/iwlwifi-suspend2/PKGBUILD
diff -u extra/network/iwlwifi-suspend2/PKGBUILD:1.2 extra/network/iwlwifi-suspend2/PKGBUILD:1.3
--- extra/network/iwlwifi-suspend2/PKGBUILD:1.2	Mon Aug 27 10:10:29 2007
+++ extra/network/iwlwifi-suspend2/PKGBUILD	Wed Sep 26 13:42:16 2007
@@ -2,21 +2,23 @@
 
 _kernver=2.6.22-suspend2
 pkgname=iwlwifi-suspend2
-_dlver=1.0.0-1
-pkgver=$(echo ${_dlver} | sed 's|-|.|g')
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Driver for the Intel PRO/Wireless 3945ABG/4965AGN miniPCI express adapters"
 arch=(i686 x86_64)
 url="http://intellinuxwireless.org/?p=iwlwifi"
 license=('GPL')
 depends=('wireless_tools' 'kernel26suspend2')
 install=iwlwifi.install
-source=(http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-${_dlver}.tgz)
-md5sums=('040c862c05496ade225e6d3d0a1ef7bf')
+source=(http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-${pkgver}.tgz)
+md5sums=('f7183e4309e9081f3b9ae0a705516295')
 
 build() {
-  cd $startdir/src/iwlwifi-${_dlver}
-  make KSRC=/lib/modules/${_kernver}/build
+  cd $startdir/src/iwlwifi-${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