Skip to content

M
mkimage-profiles
Commit 1fe0bc75 authored by Andrey Cherepanov's avatar Andrey Cherepanov Committed by Michael Shigorin
Browse files
Options

educaton.mk: reorder rules

parent c7d719d8
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
conf.d/education.mk
View file @ 1fe0bc75
......@@ -25,6 +25,12 @@ distro/alt-education: distro/.installer \
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2)
@$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,slinux/misc-base)
@$(call add,THE_LISTS,gnome-p2p)
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,MAIN_LISTS,slinux/not-install-full)
@$(call add,THE_LISTS,slinux/misc-full)
@$(call add,BASE_LISTS,education/base)
@$(call add,BASE_LISTS,workstation/3rdparty)
@$(call add,MAIN_GROUPS,education/01_preschool)
......@@ -35,7 +41,12 @@ distro/alt-education: distro/.installer \
@$(call add,MAIN_GROUPS,education/teacher)
@$(call add,MAIN_GROUPS,education/kde5)
@$(call add,MAIN_GROUPS,education/server-apps-edu)
@$(call set,KFLAVOURS,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,THE_PACKAGES,usbutils pv syslinux lftp links2 openssh-server xinput xorg-drv-libinput)
@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend)
......@@ -47,23 +58,12 @@ distro/alt-education: distro/.installer \
@$(call add,MAIN_PACKAGES,iperf3 owamp-server)
@$(call add,MAIN_PACKAGES,stellarium)
@$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,SERVICES_ENABLE,bluetoothd sshd bind crond alteratord cups ahttpd)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call set,KFLAVOURS,std-def)
@$(call add,THE_LISTS,gnome-p2p)
@$(call add,LIVE_LISTS,education/live)
@$(call add,LIVE_LISTS,slinux/network-base)
@$(call add,THE_LISTS,slinux/misc-base)
@$(call add,THE_LISTS,slinux/xfce-base)
@$(call add,THE_LISTS,$(call tags,base l10n))
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,chrony)
@$(call add,THE_KMODULES,staging)
@$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call add,MAIN_LISTS,slinux/not-install-full)
@$(call add,THE_LISTS,slinux/misc-full)
@$(call add,THE_KMODULES,virtualbox)
@$(call add,THE_KMODULES,nvidia)
@$(call add,MAIN_KMODULES,bbswitch)
@$(call add,SERVICES_ENABLE,bluetoothd sshd bind crond alteratord cups ahttpd)
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment