[haiku-commits] haiku: hrev47749 - data/bin src/add-ons/kernel/drivers/network/wlan/iprowifi2100
- From: jerome.duval@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 26 Aug 2014 23:20:22 +0200 (CEST)
hrev47749 adds 2 changesets to branch 'master'
old head: c4696b3071a6be9d7556d57ae8c337b13409345a
new head: d64b771b96050fca8ff1859daa5ec44ff3493af7
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d64b771+%5Ec4696b3
----------------------------------------------------------------------------
d76361c: Add iprowifi2100 firmware to image.
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
d64b771: Fix offline installation of iprowifi2100 and iprowifi2200 firmware.
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ luroh <lurohh@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 14 insertions(+), 7 deletions(-)
data/bin/install-wifi-firmwares.sh | 15 ++++++++-------
.../kernel/drivers/network/wlan/iprowifi2100/Jamfile | 6 ++++++
############################################################################
Commit: d76361c8a82080ac1c2e6d586be1043ad6e6eba2
URL: http://cgit.haiku-os.org/haiku/commit/?id=d76361c
Author: luroh <lurohh@xxxxxxxxx>
Date: Sun Jun 1 22:18:34 2014 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Tue Aug 26 21:10:31 2014 UTC
Add iprowifi2100 firmware to image.
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
index f6f49ba..6970487 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
@@ -22,3 +22,9 @@ KernelAddon iprowifi2100 :
libfreebsd_wlan.a
libfreebsd_network.a
;
+
+# Note: Due to licensing restrictions, we can only distribute the archive.
+# The end-user must extract and install it themselves.
+HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi2100 = "" ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi2100 = ipw2100-fw-1.3.tgz ;
+HAIKU_WIFI_FIRMWARE_DO_EXTRACT on iprowifi2100 = false ;
############################################################################
Revision: hrev47749
Commit: d64b771b96050fca8ff1859daa5ec44ff3493af7
URL: http://cgit.haiku-os.org/haiku/commit/?id=d64b771
Author: luroh <lurohh@xxxxxxxxx>
Date: Sat Jun 7 08:57:06 2014 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Tue Aug 26 21:10:37 2014 UTC
Fix offline installation of iprowifi2100 and iprowifi2200 firmware.
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/data/bin/install-wifi-firmwares.sh
b/data/bin/install-wifi-firmwares.sh
index 53713e7..e4e0c0c 100755
--- a/data/bin/install-wifi-firmwares.sh
+++ b/data/bin/install-wifi-firmwares.sh
@@ -147,7 +147,7 @@ function CleanTemporaryFiles()
function PreFirmwareInstallation()
{
- echo "Installing firmware for ${driver} ..."
+ echo "Acquiring firmware for ${driver} ..."
mkdir -p "${tempFirmwareDir}/${driver}"
UnlinkDriver
}
@@ -158,7 +158,7 @@ function PostFirmwareInstallation()
SetFirmwarePermissions
SymlinkDriver
CleanTemporaryFiles
- echo "... firmware for ${driver} has been installed."
+ echo "... firmware for ${driver} will be installed."
}
@@ -167,13 +167,14 @@ function InstallIpw2100()
driver='iprowifi2100'
PreFirmwareInstallation
- # Extract contents.
+ # Prepare firmware archive for extraction.
local file='ipw2100-fw-1.3.tgz'
local url="${baseURL}/intel/${file}"
local dir="${tempFirmwareDir}/${driver}"
+ cp "${firmwareDir}/${driver}/${file}" "${dir}"
DownloadFileIfNotCached $url $file $dir
- # Install the firmware & license file by extracting in place.
+ # Extract the firmware & license file in place.
cd "${tempFirmwareDir}/${driver}"
gunzip < "$file" | tar xf -
@@ -187,16 +188,16 @@ function InstallIprowifi2200()
driver='iprowifi2200'
PreFirmwareInstallation
- # Extract contents.
+ # Prepare firmware archive for extraction.
local file='ipw2200-fw-3.1.tgz'
local url="${baseURL}/intel/${file}"
local dir="${tempFirmwareDir}/${driver}"
+ cp "${firmwareDir}/${driver}/${file}" "${dir}"
DownloadFileIfNotCached $url $file $dir
+ # Extract the firmware & license file.
cd "$tempDir"
gunzip < "${tempFirmwareDir}/${driver}/$file" | tar xf -
-
- # Install the firmware & license file.
cd "${tempDir}/ipw2200-fw-3.1"
mv LICENSE.ipw2200-fw "${tempFirmwareDir}/${driver}/"
mv ipw2200-ibss.fw "${tempFirmwareDir}/${driver}/"
Other related posts:
- » [haiku-commits] haiku: hrev47749 - data/bin src/add-ons/kernel/drivers/network/wlan/iprowifi2100 - jerome . duval
