[Lunar-commits] iwlwifi, iwlwifi-4965-ucode: Version bump to 1.2.24. Adding ucode image for 4965

[Stefan Wold]

commit e42bf88a2368d027ec61d3c7e41ccb79a9328b28
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Wed Jan 30 08:49:52 2008 +0100

    iwlwifi, iwlwifi-4965-ucode: Version bump to 1.2.24. Adding ucode image for 4965
    
    Ucode images are now optional.
---
 wifi/iwlwifi-4965-ucode/BUILD   |    8 ++++++++
 wifi/iwlwifi-4965-ucode/DETAILS |   14 ++++++++++++++
 wifi/iwlwifi/BUILD              |    2 ++
 wifi/iwlwifi/DEPENDS            |    3 ++-
 wifi/iwlwifi/DETAILS            |   22 +++++++++++++---------
 5 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/wifi/iwlwifi-4965-ucode/BUILD b/wifi/iwlwifi-4965-ucode/BUILD
new file mode 100644
index 0000000..7640f01
--- /dev/null
+++ b/wifi/iwlwifi-4965-ucode/BUILD
@@ -0,0 +1,8 @@
+(
+
+  prepare_install &&
+  mkdir -p /lib/firmware &&
+  install -m 644 iwlwifi-4965-1.ucode /lib/firmware/ &&
+  gather_docs README.iwlwifi-4965-ucode
+
+) > $C_FIFO 2>&1
diff --git a/wifi/iwlwifi-4965-ucode/DETAILS b/wifi/iwlwifi-4965-ucode/DETAILS
new file mode 100644
index 0000000..b58667a
--- /dev/null
+++ b/wifi/iwlwifi-4965-ucode/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=iwlwifi-4965-ucode
+         VERSION=4.44.1.20
+          SOURCE=$MODULE-$VERSION.tgz
+      SOURCE_URL=http://www.intellinuxwireless.org/iwlwifi/downloads/
+      SOURCE_VFY=sha1:34731f1855ea69751f5e357e95b51019430816b3
+        WEB_SITE=http://www.intellinuxwireless.org/
+         ENTERED=20080130
+         UPDATED=20080130
+           SHORT="Intel PRO/Wireless 4965 microcode image"
+
+cat << EOF
+This module contain the REQUIRED binary micro code for Intel
+PRO/Wireless 4965 that is uploaded to the card upon initialization.
+EOF
diff --git a/wifi/iwlwifi/BUILD b/wifi/iwlwifi/BUILD
index 96ae275..a578bf4 100644
--- a/wifi/iwlwifi/BUILD
+++ b/wifi/iwlwifi/BUILD
@@ -6,6 +6,8 @@
                  grep UTS_RELEASE /usr/src/linux/include/linux/version.h | cut -d'"' -f2
          fi)
 
+  patch_it $SOURCE2 1 &&
+
   if ! $(uname -r | grep -q "^2\.6") ; then
         message ""
         message "${PROBLEM_COLOR}This module must only be installed with 2.6.x based kernels!${DEFAULT_COLOR}";
diff --git a/wifi/iwlwifi/DEPENDS b/wifi/iwlwifi/DEPENDS
index 4a0c7a9..8e4521d 100644
--- a/wifi/iwlwifi/DEPENDS
+++ b/wifi/iwlwifi/DEPENDS
@@ -1 +1,2 @@
-depends iwlwifi-3945-ucode
+optional_depends "iwlwifi-3945-ucode" "" "" "Intel wifi 3945 micro code support"
+optional_depends "iwlwifi-4965-ucode" "" "" "Intel wifi 4965 micro code support"
diff --git a/wifi/iwlwifi/DETAILS b/wifi/iwlwifi/DETAILS
index 7283eda..bec0532 100644
--- a/wifi/iwlwifi/DETAILS
+++ b/wifi/iwlwifi/DETAILS
@@ -1,17 +1,21 @@
           MODULE=iwlwifi
-         VERSION=1.2.23
+         VERSION=1.2.24
           SOURCE=$MODULE-$VERSION.tgz
+         SOURCE2=iwlwifi-1.2.23-revert-uncompatible.patch
       SOURCE_URL=http://www.intellinuxwireless.org/iwlwifi/downloads/
-      SOURCE_VFY=sha1:207e1922850cb0e628e30597c5fddb768687ee14
-        WEB_SITE=http://www.intellinuxwireless.org
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:4f4c690bd4dd816819298c5371e49cdee1b1de3c
+     SOURCE2_VFY=sha1:0847914e1ade6f399f85a53676eff3216d7775c2
+        WEB_SITE=http://www.intellinuxwireless.org/
          ENTERED=20071013
-         UPDATED=20080104
-           SHORT="Intel PRO/Wireless 3945 Driver for Linux"
-           PSAFE=no
+         UPDATED=20080130
+           SHORT="Intel PRO/Wireless 3945 and 4965 driver for Linux"
+PSAFE=no
 
 cat << EOF
 This project was created by Intel to enable support for the Intel
-PRO/Wireless 3945ABG (IWL3945) Network Connection adapter. This project
-is intended to be a community effort as much as is possible given some
-working constraints (mainly, no HW documentation is available).
+PRO/Wireless 3945ABG (IWL3945) and 4965AGN (IWL4965) Network Connection
+adapter. This project is intended to be a community effort as much as is
+possible given some working constraints (mainly, no HW documentation is
+available).
 EOF