Ticket #10464: 0002-Fix-offline-installation-of-iprowifi2100-and-iprowif.patch

File 0002-Fix-offline-installation-of-iprowifi2100-and-iprowif.patch, 2.2 KB (added by luroh, 10 years ago)

  • data/bin/install-wifi-firmwares.sh 

    From 9e1676798ffd3bc8428c5b6717204c8664e67ba1 Mon Sep 17 00:00:00 2001
From: luroh <lurohh@gmail.com>
Date: Sat, 7 Jun 2014 10:57:06 +0200
Subject: [PATCH 2/2] Fix offline installation of iprowifi2100 and iprowifi2200
 firmware.

---
 data/bin/install-wifi-firmwares.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/bin/install-wifi-firmwares.sh b/data/bin/install-wifi-firmwares.sh
index 53713e7..e4e0c0c 100755
    a b function CleanTemporaryFiles()  
    147147
    148148function PreFirmwareInstallation()
    149149{
    150     echo "Installing firmware for ${driver} ..."
     150    echo "Acquiring firmware for ${driver} ..."
    151151    mkdir -p "${tempFirmwareDir}/${driver}"
    152152    UnlinkDriver
    153153}
    … … function PostFirmwareInstallation()  
    158158    SetFirmwarePermissions
    159159    SymlinkDriver
    160160    CleanTemporaryFiles
    161     echo "... firmware for ${driver} has been installed."
     161    echo "... firmware for ${driver} will be installed."
    162162}
    163163
    164164
    … … function InstallIpw2100()  
    167167    driver='iprowifi2100'
    168168    PreFirmwareInstallation
    169169
    170     # Extract contents.
     170    # Prepare firmware archive for extraction.
    171171    local file='ipw2100-fw-1.3.tgz'
    172172    local url="${baseURL}/intel/${file}"
    173173    local dir="${tempFirmwareDir}/${driver}"
     174    cp "${firmwareDir}/${driver}/${file}" "${dir}"
    174175    DownloadFileIfNotCached $url $file $dir
    175176
    176     # Install the firmware & license file by extracting in place.
     177    # Extract the firmware & license file in place.
    177178    cd "${tempFirmwareDir}/${driver}"
    178179    gunzip < "$file" | tar xf -
    179180
    … … function InstallIprowifi2200()  
    187188    driver='iprowifi2200'
    188189    PreFirmwareInstallation
    189190
    190     # Extract contents.
     191    # Prepare firmware archive for extraction.
    191192    local file='ipw2200-fw-3.1.tgz'
    192193    local url="${baseURL}/intel/${file}"
    193194    local dir="${tempFirmwareDir}/${driver}"
     195    cp "${firmwareDir}/${driver}/${file}" "${dir}"
    194196    DownloadFileIfNotCached $url $file $dir
    195197
     198    # Extract the firmware & license file.
    196199    cd "$tempDir"
    197200    gunzip < "${tempFirmwareDir}/${driver}/$file" | tar xf -
    198 
    199     # Install the firmware & license file.
    200201    cd "${tempDir}/ipw2200-fw-3.1"
    201202    mv LICENSE.ipw2200-fw "${tempFirmwareDir}/${driver}/"
    202203    mv ipw2200-ibss.fw "${tempFirmwareDir}/${driver}/"