Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packages/Haiku: Clean up WiFi firmware rules.

Browse Source 
* Nothing uses the plural forms anymore, so drop them.
 * Nothing uses the "PACKAGE" field, so drop it.

Once the Marvell driver is migrated to use a package instead of the
archive, we can drop even more of this related to HAIKU_WIFI_FIRMWARE_DO_EXTRACT.
This commit is contained in:
Augustin Cavalier 2022-06-20 13:27:13 -04:00
parent 33d311a64b
commit 891bd14810
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/jam/packages/Haiku
View File

@ -8,20 +8,10 @@ HaikuPackage $(haikuPackage) ;
# wifi firmware
local driver ;
for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT) ] ;
if $(archive) {
AddWifiFirmwareToPackage $(driver) : $(package) : $(archive)
: $(extract) ;
}
local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ;
local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ;
local archive ;
for archive in $(archives) {
AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive)
: $(extract) ;
packages = $(packages[2-]) ;
AddWifiFirmwareToPackage $(driver) : : $(archive) : $(extract) ;
}
}

1
src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
View File

@ -25,6 +25,5 @@ KernelAddon iprowifi2100 :
# 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 ;

1
src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile
View File

@ -29,6 +29,5 @@ KernelAddon iprowifi2200 :
# 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 iprowifi2200 = "" ;
HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi2200 = ipw2200-fw-3.1.tgz ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on iprowifi2200 = false ;

1
src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
View File

@ -26,7 +26,6 @@ KernelAddon marvell88w8363 :
libfreebsd_network.a
;
HAIKU_WIFI_FIRMWARE_PACKAGE on marvell88w8363 = "" ;
HAIKU_WIFI_FIRMWARE_ARCHIVE on marvell88w8363 = 88w8363-fw-3.6.2.2.zip ;
HAIKU_WIFI_FIRMWARE_DO_EXTRACT on marvell88w8363 = true ;