Skip to content

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

{mixin-,}basealt.mk: move common bits into mixin

These have been added to the image description that was x86-specific initially -- we're lucky that ARM-related bits are quite minor here but let's keep the mixin away for the sake of e2k for now: it's built in a different enough way at the moment.
parent 240c8fbf
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
conf.d/basealt.mk
View file @ f31f305f
......@@ -16,10 +16,6 @@ distro/alt-workstation: distro/.base +vmguest +wireless +efi \
use/vmguest/kvm/x11 use/stage2/kms \
use/branding/complete use/docs/license \
use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk
@$(call add,INSTALL2_PACKAGES,open-iscsi)
@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
@$(call add,MAIN_PACKAGES,solaar)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
endif
......@@ -27,13 +23,6 @@ ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,workstation/virtualbox)
@$(call add,BASE_KMODULES,kvm virtualbox)
endif
@$(call add,MAIN_LISTS,workstation/extras)
@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
@$(call add,THE_LISTS,$(call tags,archive extra))
@$(call add,THE_LISTS,$(call tags,mobile mate))
@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
@$(call add,LIVE_PACKAGES,livecd-installer-features)
@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
......
conf.d/mixin-basealt.mk
View file @ f31f305f
......@@ -21,6 +21,8 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm \
@$(call set,BRANDING,alt-workstation)
@$(call add,THE_BRANDING,mate-settings)
@$(call add,COMMON_PACKAGES,vim-console)
@$(call add,THE_LISTS,$(call tags,archive extra))
@$(call add,THE_LISTS,$(call tags,mobile mate))
@$(call add,BASE_LISTS,workstation/base.pkgs)
@$(call add,BASE_LISTS,$(call tags,desktop cups))
@$(call add,LIVE_LISTS,workstation/live.pkgs)
......@@ -58,5 +60,14 @@ mixin/alt-workstation-install: +installer \
@$(call add,INSTALL2_PACKAGES,alterator-notes)
@$(call add,INSTALL2_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,INSTALL2_PACKAGES,open-iscsi)
@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
@$(call add,LIVE_PACKAGES,livecd-installer-features)
@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
@$(call add,MAIN_LISTS,workstation/extras)
@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
@$(call add,MAIN_PACKAGES,solaar)
@$(call add,STAGE2_PACKAGES,chrony)
@$(call add,MAIN_GROUPS,$(workstation_groups))
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