education.mk: generalize distro/alt-education

conf.d/education.mk

@@ -4,9 +4,14 @@ mixin/education: use/kernel use/firmware \
 	+systemd \
 	use/services \
 	use/ntp/chrony \
-	use/x11/xorg use/x11/lightdm/gtk +pulse \
+	use/volumes/education \
+	use/x11/xorg use/x11/amdgpu use/x11/lightdm/gtk +pulse \
 	+nm use/x11/gtk/nm use/net-eth/dhcp \
-	use/xdg-user-dirs/deep
+	use/xdg-user-dirs/deep \
+	use/office/LibreOffice/still \
+	use/office/LibreOffice/gtk3 \
+	use/office/LibreOffice/extensions \
+	use/office/LibreOffice/integrated
 	@$(call set,BRANDING,alt-education)
 	@$(call add,THE_BRANDING,indexhtml)
 	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
@@ -17,25 +22,31 @@ mixin/education: use/kernel use/firmware \
 	@$(call add,BASE_LISTS,education/base)
 	@$(call add,BASE_LISTS,workstation/3rdparty)
 	@$(call add,THE_LISTS,education/misc)
-	@$(call add,THE_PACKAGES,usbutils pv lftp links2 openssh-server xinput xorg-drv-libinput)
+	@$(call add,THE_PACKAGES,usbutils pv lftp links2 openssh-server)
+	@$(call add,THE_PACKAGES,xinput xorg-drv-libinput)
 	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
 	@$(call add,THE_PACKAGES,disable-usb-autosuspend)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/education: distro/alt-education; @:
-distro/alt-education: distro/.installer mixin/education \
+mixin/education-live: \
+	use/live/install use/live/suspend \
+	use/live/repo use/live/x11 use/live/rw
+	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
+	@$(call add,LIVE_PACKAGES,livecd-timezone)
+	@$(call add,LIVE_LISTS,slinux/net-base)
+	@$(call add,LIVE_LISTS,$(call tags,base rescue))
+
+mixin/education-installer: \
 	use/memtest \
 	use/branding/complete \
-	use/live/install use/live/suspend \
-	use/live/repo use/live/x11 use/live/rw \
 	use/install2/vnc use/install2/full \
 	use/l10n/default/ru_RU +vmguest \
 	+efi use/efi/refind use/efi/shell \
 	use/isohybrid use/luks \
-	+plymouth +wireless \
 	use/install2/fonts \
+	+plymouth +wireless \
 	use/stage2/fs use/stage2/hid use/stage2/md \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs \
 	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
@@ -52,44 +63,64 @@ distro/alt-education: distro/.installer mixin/education \
 	@$(call add,MAIN_GROUPS,education/03_highschool)
 	@$(call add,MAIN_GROUPS,education/04_secondary_vocational)
 	@$(call add,MAIN_GROUPS,education/05_university)
-	@$(call add,MAIN_GROUPS,education/teacher)
-	@$(call add,MAIN_GROUPS,education/kde5)
-	@$(call add,MAIN_GROUPS,education/server-apps-edu)
-	@$(call add,MAIN_GROUPS,education/video-conferencing)
-ifeq (,$(filter-out i586 x86_64,$(ARCH)))
-	@$(call set,KFLAVOURS,un-def std-def)
-	@$(call add,MAIN_PACKAGES,kernel-headers-std-def kernel-headers-modules-std-def)
-	@$(call add,MAIN_PACKAGES,kernel-headers-un-def kernel-headers-modules-un-def)
-	@$(call add,THE_KMODULES,virtualbox)
-	@$(call add,THE_KMODULES,nvidia)
-	@$(call add,THE_KMODULES,lsadrv bbswitch)
-	@$(call add,THE_KMODULES,staging)
-	@$(call add,MAIN_KMODULES,bbswitch)
-	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
-	@$(call add,THE_PACKAGES,syslinux)
-	@$(call add,MAIN_PACKAGES,owamp-server)
-endif
+	@$(call add,MAIN_GROUPS,education/07_teacher)
+	@$(call add,MAIN_GROUPS,education/08_server-apps-edu)
 	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
 	@$(call add,THE_PACKAGES,alterator-fbi)
 	@$(call add,THE_PACKAGES,alt-rootfs-installer)
 	@$(call add,BASE_PACKAGES,os-prober)
 	@$(call add,BASE_PACKAGES,guest-account)
-	@$(call add,BASE_PACKAGES,nextcloud-client)
 	@$(call add,MAIN_PACKAGES,iperf3)
 	@$(call add,MAIN_PACKAGES,stellarium)
 	@$(call add,MAIN_PACKAGES,libreoffice-block-macros)
 	@$(call add,MAIN_PACKAGES,lmms)
-	@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
-	@$(call add,LIVE_PACKAGES,livecd-timezone)
-	@$(call add,LIVE_PACKAGES,xfce-polkit)
-	@$(call add,LIVE_PACKAGES,volumes-profile-education)
-	@$(call add,LIVE_LISTS,slinux/net-base)
-	@$(call add,LIVE_LISTS,$(call tags,base rescue))
 	@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
 	@$(call add,STAGE2_PACKAGES,chrony)
 	@$(call add,STAGE1_MODLISTS,stage2-mmc)
+
+#FIXME#	mixin/education-live \
+	#
+distro/education: distro/alt-education; @:
+distro/alt-education: distro/.installer \
+	mixin/education \
+	mixin/education-live \
+	mixin/education-installer \
+	use/e2k/multiseat/801/full +power
+	@$(call set,INSTALLER,education)
+ifeq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,MAIN_GROUPS,education/06_kdesc)
+	@$(call add,MAIN_PACKAGES,xorg-conf-noblank)
+	@$(call add,THE_PACKAGES,firefox-esr-ru flashrom)
+	@$(call add,THE_PACKAGES,xscreensaver-hacks-rss_glx)
+	@$(call add,DEFAULT_SERVICES_ENABLE,acpid dnsmasq)
+	@$(call add,DEFAULT_SERVICES_DISABLE,upower clamd clamsmtpd)
+	@$(call add,CLEANUP_PACKAGES,plymouth plymouth-scripts)
+	@$(call add,CONTROL,pam_mktemp:disabled)	### private /tmp dirs
+	@$(call add,INSTALL2_PACKAGES,ImageMagick-tools)	### DROPME: for import on /pkg ###
+else
+	@$(call add,MAIN_GROUPS,education/06_kde5)
+	@$(call add,MAIN_GROUPS,education/09_video-conferencing)
+endif	# e2k%
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call set,KFLAVOURS,un-def std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-un-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-modules-un-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-std-def)
+	@$(call add,MAIN_PACKAGES,kernel-headers-modules-std-def)
+	@$(call add,THE_KMODULES,virtualbox)
+	@$(call add,THE_KMODULES,nvidia)
+	@$(call add,THE_KMODULES,lsadrv bbswitch)
+	@$(call add,THE_KMODULES,staging)
+	@$(call add,MAIN_KMODULES,bbswitch)
+	@$(call add,BASE_PACKAGES,nextcloud-client)
+	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
+	@$(call add,THE_PACKAGES,syslinux)
+	@$(call add,MAIN_PACKAGES,owamp-server)
+
 endif
 
+endif # distro
+
 ifeq (vm,$(IMAGE_CLASS))
 
 ifeq (,$(filter-out aarch64 armh,$(ARCH)))