net: rework NM support

Non-GUI packages moved to base+nm pkglist to enable standalone installation of those; and GTK bits left in desktop+nm for use by images lacking their own new and improved(tm) variant. Note that both GNOME3 and KDE4 aren't lacking anymore.

net: rework NM support
78f21583 · Michael Shigorin · 92c3e24a · 78f21583 · 78f21583 · 78f21583
Commit 78f21583 authored Jun 09, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 11 deletions

config.mk features.in/net/config.mk +2 -1

base+nm pkg.in/lists/tagged/base+nm +10 -0

desktop+nm pkg.in/lists/tagged/desktop+nm +8 -10

No files found.
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -8,8 +8,9 @@ use/net: use/services
 use/net/dhcp: use/net
 	@$(call add,THE_PACKAGES,dhcpcd)

+# base service, no GUI
 use/net/nm: use/net
-	@$(call add,THE_LISTS,$(call tags,desktop nm))
+	@$(call add,THE_LISTS,$(call tags,base nm))
 	@$(call add,LIVE_PACKAGES,livecd-save-nfs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,NetworkManager ModemManager)
 	@$(call add,DEFAULT_SERVICES_ENABLE,livecd-save-nfs) # keep interface up

--- a/pkg.in/lists/tagged/base+nm
+++ b/pkg.in/lists/tagged/base+nm
+NetworkManager
+
+NetworkManager-vpnc
+NetworkManager-openvpn
+NetworkManager-pptp
+
+# this one pulls strongswan, a bit too much?
+#NetworkManager-l2tp
+
+usb-modeswitch
--- a/pkg.in/lists/tagged/desktop+nm
+++ b/pkg.in/lists/tagged/desktop+nm
-NetworkManager
-NetworkManager-vpnc
-NetworkManager-openvpn
-NetworkManager-pptp
-#NetworkManager-l2tp
-NetworkManager-openvpn-gnome
-NetworkManager-pptp-gnome
-NetworkManager-vpnc-gnome
-#NetworkManager-l2tp-gnome
-usb-modeswitch
+NetworkManager-applet-gtk
+
+NetworkManager-openvpn-gtk
+NetworkManager-pptp-gtk
+NetworkManager-vpnc-gtk
+
+# pulls in strongswan
+#NetworkManager-l2tp-gtk