altcloud/mkimage-profiles
2
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

e2k.mk, mixin.mk: add more targets

Browse Source 
mixin/e2k-desktop was asking for separation from its day zero,
and the rest just came in naturally (the temporary patch to
add lxqt and mate looked awfully with all the duplication in).
This commit is contained in:
Michael Shigorin 2017-09-25 23:45:56 +03:00
parent 41b5a5b633
commit fd4f2a675d
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
conf.d/e2k.mk
View File

@ -1,20 +1,28 @@
ifeq (vm,$(IMAGE_CLASS))
vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su
@$(call add,THE_PACKAGES,openssh)
vm/.e2k-bare: vm/.bare use/e2k
@$(call add,BASE_PACKAGES,apt)
vm/e2k-live: vm/.e2k-bare use/deflogin/live use/net-ssh use/control/sudo-su
@$(call add,THE_LISTS,$(call tags,ve tools))
vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
vm/e2k-rescue: vm/e2k-live mixin/e2k-base use/services/lvm2-disable
@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
vm/e2k-xfce: vm/e2k-rescue use/e2k/sound use/e2k/x11 use/x11/xfce \
use/browser/firefox use/browser/firefox/esr use/browser/firefox/i18n \
use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xinit xterm mc)
@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer)
vm/e2k-xfce: vm/e2k-rescue mixin/e2k-desktop use/x11/xfce
@$(call add,THE_PACKAGES,pnmixer)
vm/e2k-lxqt: vm/e2k-rescue mixin/e2k-desktop
@$(call add,THE_LISTS,$(call tags,(lxqt desktop) && !extra))
vm/e2k-mate: vm/systemd mixin/e2k-base mixin/e2k-desktop \
use/deflogin/live use/x11/mate; @:
vm/e2k-builder: vm/e2k-rescue use/dev/builder/base; @:
vm/e2k-samba-DC: vm/e2k-rescue
@$(call add,BASE_PACKAGES,task-samba-dc glibc-locales net-tools)
endif

9
conf.d/mixin.mk
View File

@ -8,6 +8,15 @@ mixin/desktop-installer: +net-eth +vmguest \
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober)
### e2k.mk
mixin/e2k-base: use/tty/S0 use/net-eth/dhcp; @:
mixin/e2k-desktop: use/e2k/x11 use/e2k/sound use/l10n/default/ru_RU \
use/browser/firefox/esr use/browser/firefox/i18n \
use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xinit xterm mc)
@$(call add,THE_PACKAGES,fonts-bitmap-terminus)
### regular.mk
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs