Skip to content

M
mkimage-profiles
Commit fd4f2a67 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

e2k.mk, mixin.mk: add more targets

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).
parent 41b5a5b6
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 8 deletions
conf.d/e2k.mk
View file @ fd4f2a67
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
vm/e2k-live: vm/bare use/e2k use/deflogin/live use/control/sudo-su vm/.e2k-bare: vm/.bare use/e2k
@$(call add,THE_PACKAGES,openssh) @$(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)) @$(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_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
@$(call add,THE_LISTS,$(call tags,server && (network || extra))) @$(call add,THE_LISTS,$(call tags,server && (network || extra)))
@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd) @$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
vm/e2k-xfce: vm/e2k-rescue use/e2k/sound use/e2k/x11 use/x11/xfce \ vm/e2k-xfce: vm/e2k-rescue mixin/e2k-desktop use/x11/xfce
use/browser/firefox use/browser/firefox/esr use/browser/firefox/i18n \ @$(call add,THE_PACKAGES,pnmixer)
use/l10n/default/ru_RU use/fonts/otf/adobe use/fonts/otf/mozilla
@$(call add,THE_PACKAGES,xinit xterm mc) vm/e2k-lxqt: vm/e2k-rescue mixin/e2k-desktop
@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer) @$(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-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 endif
conf.d/mixin.mk
View file @ fd4f2a67
...@@ -8,6 +8,15 @@ mixin/desktop-installer: +net-eth +vmguest \ ...@@ -8,6 +8,15 @@ mixin/desktop-installer: +net-eth +vmguest \
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober) @$(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 ### regular.mk
# common WM live/installer bits # common WM live/installer bits
mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs
......
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