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

mixin-basealt.mk, basealt.mk: separate mixin/alt-workstation-install

Browse Source 
Target vm/ do not require installer.
This commit is contained in:
Anton Midyukov 2019-06-07 01:50:34 +07:00
parent b82ec6c07f
commit 7725165f08
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf.d/basealt.mk
View File

@ -7,6 +7,7 @@ distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \ distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \
mixin/desktop-installer mixin/alt-workstation \ mixin/desktop-installer mixin/alt-workstation \
mixin/alt-workstation-install \
use/memtest use/rescue/base use/bootloader/grub use/luks \ use/memtest use/rescue/base use/bootloader/grub use/luks \
use/efi/refind use/efi/memtest86 use/efi/shell \ use/efi/refind use/efi/memtest86 use/efi/shell \
use/install2/repo use/install2/suspend use/live/suspend \ use/install2/repo use/install2/suspend use/live/suspend \

18
conf.d/mixin-basealt.mk
View File

@ -6,10 +6,9 @@ mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\
libreoffice mate-usershare pidgin raccess scanning scribus \ libreoffice mate-usershare pidgin raccess scanning scribus \
sound-editing thunderbird vlc freeipa-client) 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/kernel/net use/l10n/default/ru_RU \
use/x11/xorg use/x11-autostart use/x11/gtk/nm \ 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/apt-conf/branch use/volumes/regular \
use/fonts/install2 \ use/fonts/install2 \
use/fonts/otf/adobe use/fonts/otf/mozilla \ 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/sound use/xdg-user-dirs \
use/docs/manual use/docs/indexhtml \ use/docs/manual use/docs/indexhtml \
use/browser/firefox use/browser/firefox/esr 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,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,COMMON_PACKAGES,vim-console)
@$(call add,MAIN_GROUPS,$(workstation_groups))
@$(call add,BASE_LISTS,workstation/base.pkgs) @$(call add,BASE_LISTS,workstation/base.pkgs)
@$(call add,BASE_LISTS,$(call tags,desktop cups)) @$(call add,BASE_LISTS,$(call tags,desktop cups))
@$(call add,LIVE_LISTS,workstation/live.pkgs) @$(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_VOL_ID,ALT Workstation)
@$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH)) @$(call set,META_APP_ID,$(DISTRO_VERSION)/$(ARCH))
@$(call set,DOCS,alt-workstation) @$(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))