From 5c8f9c2b0ce937d141ee18d2e2e370cb95155d1b Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 8 Jan 2019 19:48:09 -0500
Subject: [PATCH] build: Move WiFi drivers from the minimum to the regular
 image.

We don't include the wpa_supplicant on the minimum image, so
these aren't very useful (it seems one needs the wpa_supplicant
to connect even to an unsecured network, with our setup.)

Anyone who needs one of these and also has a reason to use the
minimum image can easily add them back via their UserBuildConfig.
---
 build/jam/images/definitions/minimum | 11 -----------
 build/jam/images/definitions/regular | 13 +++++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
index 1e4fef17dc..aba8175a21 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -198,17 +198,6 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 	pegasus
 	usb_asix usb_davicom usb_ecm
 	wb840
-
-	# WLAN drivers
-	x86,x86_64 @{
-		aironetwifi atheroswifi
-		broadcom43xx
-		iprowifi2100 iprowifi2200 iprowifi3945 iprowifi4965
-		idualwifi7260
-		marvell88w8363 marvell88w8335
-		ralinkwifi realtekwifi
-		wavelanwifi
-	}@ # x86,x86_64
 ] ;
 
 SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures
diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index bf5d1a2d9f..e46321fe6d 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -226,6 +226,19 @@ SYSTEM_ADD_ONS_DRIVERS_MIDI +=
 	usb_midi
 ;
 
+SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
+	# WLAN drivers
+	x86,x86_64 @{
+		aironetwifi atheroswifi
+		broadcom43xx
+		iprowifi2100 iprowifi2200 iprowifi3945 iprowifi4965
+		idualwifi7260
+		marvell88w8363 marvell88w8335
+		ralinkwifi realtekwifi
+		wavelanwifi
+	}@ # x86,x86_64
+];
+
 SYSTEM_ADD_ONS_DRIVERS_POWER += [ FFilterByBuildFeatures
 	acpi_battery@x86,x86_64
 ] ;