e2k.mk: add vm/e2k-builder

...and somewhat improve vm/e2k-xfce.

e2k.mk: add vm/e2k-builder
16da13ff · Michael Shigorin · 29bbcaa1 · 16da13ff
Commit 16da13ff authored Aug 21, 2017 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

e2k.mk conf.d/e2k.mk +6 -2

No files found.
--- a/conf.d/e2k.mk
+++ b/conf.d/e2k.mk
@@ -9,8 +9,12 @@ vm/e2k-rescue: vm/e2k-live use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
 	@$(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/x11 use/x11/xfce \
+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 firefox mc)
+	@$(call add,THE_PACKAGES,xinit xterm mc)
+	@$(call add,THE_PACKAGES,fonts-bitmap-terminus pnmixer)
+
+vm/e2k-builder: vm/e2k-rescue use/dev/builder/base; @:

 endif