education.mk: refactor lists

77de1c8d · Andrey Cherepanov · Michael Shigorin · 7a58ffd3 · 77de1c8d
Commit 77de1c8d authored Aug 30, 2016 by Andrey Cherepanov Committed by Michael Shigorin May 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

education.mk conf.d/education.mk +6 -7

No files found.
--- a/conf.d/education.mk
+++ b/conf.d/education.mk
@@ -10,16 +10,15 @@ distro/education: distro/.installer use/slinux/full \
 	@$(call set,INSTALLER,junior)
 	@$(call set,BRANDING,alt-education)
 	@$(call set,META_VOL_SET,ALT Education 8.0)
-	@$(call add,THE_LISTS,education/desktop)
+	@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend xorg-drv-libinput)
-	@$(call add,STAGE2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend)
+	@$(call add,BASE_GROUPS,education/teacher)
-	@$(call add,THE_GROUPS,education/teacher)
+	@$(call add,BASE_GROUPS,education/kde5)
-	@$(call add,THE_GROUPS,education/kde5)
+	@$(call add,BASE_GROUPS,education/server-apps-edu)
-	@$(call add,THE_GROUPS,education/server-apps-edu)
-	@$(call add,INSTALL2_PACKAGES,xorg-drv-libinput)
 	@$(call add,THE_PACKAGES,usbutils pv syslinux lftp links2 openssh-server xinput xorg-drv-libinput vim-console)
 	@$(call add,THE_KMODULES,lsadrv)
-	@$(call add,BASE_PACKAGES,os-prober)
 	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend)
 	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
+	@$(call add,THE_PACKAGES,os-prober)
+	@$(call add,THE_LISTS,education/desktop)
 endif