hrev56201 adds 2 changesets to branch 'master'
old head: 2e1033fcf1206b57b16f2a0ed26915205d3ea5ab
new head: 891bd14810c4ba41b1f3d68cfaf076d1e23b710a
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=891bd14810c4+%5E2e1033fcf120
----------------------------------------------------------------------------
33d311a64b12: HaikuBootstrap: WiFi firmware rules not needed.
The WiFi firmware rules are only needed for a few very old drivers.
Any devices we are going to bootstrap on will use one of the wifi_firmwares
packages instead.
891bd14810c4: packages/Haiku: Clean up WiFi firmware rules.
* 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.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 1 insertion(+), 35 deletions(-)
build/jam/packages/Haiku | 12 +----------
build/jam/packages/HaikuBootstrap | 21 --------------------
.../drivers/network/wlan/iprowifi2100/Jamfile | 1 -
.../drivers/network/wlan/iprowifi2200/Jamfile | 1 -
.../drivers/network/wlan/marvell88w8363/Jamfile | 1 -
############################################################################
Commit: 33d311a64b125543088f079d5eca6f689fcb22a8
URL: https://git.haiku-os.org/haiku/commit/?id=33d311a64b12
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Jun 20 17:25:58 2022 UTC
HaikuBootstrap: WiFi firmware rules not needed.
The WiFi firmware rules are only needed for a few very old drivers.
Any devices we are going to bootstrap on will use one of the wifi_firmwares
packages instead.
----------------------------------------------------------------------------
diff --git a/build/jam/packages/HaikuBootstrap
b/build/jam/packages/HaikuBootstrap
index 04a735706d..07f5160b53 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -5,27 +5,6 @@ local haikuPackage = haiku.hpkg ;
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-]) ;
- }
-}
-
-
# modules
AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS)
;
AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
############################################################################
Revision: hrev56201
Commit: 891bd14810c4ba41b1f3d68cfaf076d1e23b710a
URL: https://git.haiku-os.org/haiku/commit/?id=891bd14810c4
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Jun 20 17:27:13 2022 UTC
packages/Haiku: Clean up WiFi firmware rules.
* 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.
----------------------------------------------------------------------------
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index bae8c310d8..d0ba8e4173 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -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)
;
}
}
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
index b2bbd642ed..ddf14fe5bd 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2100/Jamfile
@@ -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 ;
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile
b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile
index ea3f50a926..2f6a55a636 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile
@@ -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 ;
diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
index c88aff3f22..466d0107ac 100644
--- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
@@ -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 ;
