From 7725165f08d8f6a448ee48d7aabd9ec859e01755 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 7 Jun 2019 01:50:34 +0700 Subject: [PATCH] mixin-basealt.mk, basealt.mk: separate mixin/alt-workstation-install Target vm/ do not require installer. --- conf.d/basealt.mk | 1 + conf.d/mixin-basealt.mk | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk index 6b753726..2dd4a010 100644 --- a/conf.d/basealt.mk +++ b/conf.d/basealt.mk @@ -7,6 +7,7 @@ distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\ distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \ mixin/desktop-installer mixin/alt-workstation \ + mixin/alt-workstation-install \ use/memtest use/rescue/base use/bootloader/grub use/luks \ use/efi/refind use/efi/memtest86 use/efi/shell \ use/install2/repo use/install2/suspend use/live/suspend \ diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk index c3c19eb9..024f34f9 100644 --- a/conf.d/mixin-basealt.mk +++ b/conf.d/mixin-basealt.mk @@ -6,10 +6,9 @@ mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\ libreoffice mate-usershare pidgin raccess scanning scribus \ sound-editing thunderbird vlc freeipa-client) -mixin/alt-workstation: +installer +systemd +pulse +nm \ +mixin/alt-workstation: +systemd +pulse +nm \ use/kernel/net use/l10n/default/ru_RU \ use/x11/xorg use/x11-autostart use/x11/gtk/nm \ - use/install2/fs use/install2/fat use/install2/vnc \ use/apt-conf/branch use/volumes/regular \ use/fonts/install2 \ use/fonts/otf/adobe use/fonts/otf/mozilla \ @@ -19,14 +18,9 @@ mixin/alt-workstation: +installer +systemd +pulse +nm \ use/sound use/xdg-user-dirs \ use/docs/manual use/docs/indexhtml \ use/browser/firefox use/browser/firefox/esr - @$(call set,BRANDING,alt-workstation) + @$(call set,BRANDING,alt-starterkit) @$(call add,THE_BRANDING,mate-settings) - @$(call add,STAGE1_MODLISTS,stage2-mmc) - @$(call set,INSTALLER,altlinux-desktop) - @$(call add,INSTALL2_PACKAGES,alterator-notes) - @$(call add,INSTALL2_PACKAGES,fdisk) @$(call add,COMMON_PACKAGES,vim-console) - @$(call add,MAIN_GROUPS,$(workstation_groups)) @$(call add,BASE_LISTS,workstation/base.pkgs) @$(call add,BASE_LISTS,$(call tags,desktop cups)) @$(call add,LIVE_LISTS,workstation/live.pkgs) @@ -51,3 +45,11 @@ mixin/alt-workstation: +installer +systemd +pulse +nm \ @$(call set,META_VOL_ID,ALT Workstation) @$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH)) @$(call set,DOCS,alt-workstation) + +mixin/alt-workstation-install: +installer \ + use/install2/fs use/install2/fat use/install2/vnc + @$(call add,STAGE1_MODLISTS,stage2-mmc) + @$(call set,INSTALLER,altlinux-desktop) + @$(call add,INSTALL2_PACKAGES,alterator-notes) + @$(call add,INSTALL2_PACKAGES,fdisk) + @$(call add,MAIN_GROUPS,$(workstation_groups))