education: do not install base set by default, remove conflicted slinux/misc and p2p packages

132cdf3e · Andrey Cherepanov · Anton Midyukov · 5be89dc7 · 132cdf3e
Commit 132cdf3e authored Apr 03, 2021 by Andrey Cherepanov Committed by Anton Midyukov Apr 04, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

education.mk conf.d/education.mk +1 -4

No files found.
--- a/conf.d/education.mk
+++ b/conf.d/education.mk
@@ -19,12 +19,9 @@ mixin/education: \
 	@$(call add,THE_BRANDING,indexhtml)
 	@$(call add,THE_BRANDING,menu xfce-settings system-settings)
 	@$(call add,THE_LISTS,slinux/xfce-base)
-	@$(call add,THE_LISTS,slinux/misc-base)
-	@$(call add,THE_LISTS,gnome-p2p)
+	@$(call add,THE_LISTS,education/misc)
 	@$(call add,THE_LISTS,$(call tags,base l10n))
-	@$(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)
 	@$(call add,THE_PACKAGES,xinput xorg-drv-libinput)
 	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)