i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install-wifi-firmwares: Cleanup and fixes.

Browse Source 
* Unlink/Symlink not needed as we now use a package.
 * Use correct URLs to download headers.

Fixes #14412.

Change-Id: I76dbca3d48d0b2933a27bea666551ff86d404a93
Reviewed-on: https://review.haiku-os.org/493
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2018-08-28 20:14:00 +00:00
committed by waddlesplash
parent 5e7b3530c8
commit b41678294b
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/bin/install-wifi-firmwares.sh
+2 -21
View File
@@ -89,23 +89,6 @@ function InstallAllFirmwares()
} }
function UnlinkDriver()
{
# remove the driver's symlink
#rm -f "${driversDir}/dev/net/${driver}"
echo "TODO: UnlinkDriver"
}
function SymlinkDriver()
{
# restore the driver's symlink
#cd "${driversDir}/dev/net/"
#ln -sf "../../bin/${driver}" "${driver}"
echo "TODO: SymlinkDriver"
}
function DownloadFileIfNotCached() function DownloadFileIfNotCached()
{ {
# DownloadFileIfNotCached <url> <filename> <destination dir> # DownloadFileIfNotCached <url> <filename> <destination dir>
@@ -149,14 +132,12 @@ function PreFirmwareInstallation()
{ {
echo "Acquiring firmware for ${driver} ..." echo "Acquiring firmware for ${driver} ..."
mkdir -p "${tempFirmwareDir}/${driver}" mkdir -p "${tempFirmwareDir}/${driver}"
UnlinkDriver
} }
function PostFirmwareInstallation() function PostFirmwareInstallation()
{ {
SetFirmwarePermissions SetFirmwarePermissions
SymlinkDriver
CleanTemporaryFiles CleanTemporaryFiles
echo "... firmware for ${driver} will be installed." echo "... firmware for ${driver} will be installed."
} }
@@ -278,7 +259,7 @@ function BuildBroadcomFWCutter()
# Download additonal files for building b43-fwcutter. # Download additonal files for building b43-fwcutter.
cd b43-fwcutter-012 cd b43-fwcutter-012
local baseURL='http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc' local baseURL='https://git.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc'
DownloadFileIfNotCached ${baseURL}/string/byteswap.h byteswap.h $dir DownloadFileIfNotCached ${baseURL}/string/byteswap.h byteswap.h $dir
if [ $result -gt 0 ]; then if [ $result -gt 0 ]; then
return $result return $result
@@ -295,7 +276,7 @@ function BuildBroadcomFWCutter()
# Build b43-fwcutter. # Build b43-fwcutter.
echo "Compiling b43-fwcutter for installing Broadcom's firmware ..." echo "Compiling b43-fwcutter for installing Broadcom's firmware ..."
make PREFIX=/boot/system CFLAGS="-I. -Wall -D_BSD_SOURCE" > /dev/null 2>&1 make PREFIX=/boot/system CFLAGS="-I. -Wall -D_BSD_SOURCE" >/dev/null 2>&1
result=$? result=$?
if [ $result -gt 0 ]; then if [ $result -gt 0 ]; then
echo "... failed to compile b43-fwcutter." echo "... failed to compile b43-fwcutter."