Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit c58c7e36 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

regular.mk: moved use/luks to .regular-base

Commit g2b975e1b got it wrong for server-regular as it turns out now, at least until that image decides to support LUKS either.
parent 95900b21
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
conf.d/regular.mk
View file @ c58c7e36
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
# common ground # common ground
distro/.regular-bare: distro/.base +wireless use/efi/signed use/luks \ distro/.regular-bare: distro/.base +wireless use/efi/signed \
use/memtest use/stage2/net-eth use/kernel/net use/memtest use/stage2/net-eth use/kernel/net
@$(call try,SAVE_PROFILE,yes) @$(call try,SAVE_PROFILE,yes)
# WM base target # WM base target
distro/.regular-base: distro/.regular-bare +vmguest +live \ distro/.regular-base: distro/.regular-bare +vmguest +live \
use/live/ru use/live/install use/live/repo use/live/rw \ use/live/ru use/live/install use/live/repo use/live/rw \
use/x11/3d-free use/branding use/luks use/x11/3d-free use/branding
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular)) @$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,LIVE_LISTS,$(call tags,base rescue)) @$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2) @$(call add,LIVE_PACKAGES,installer-feature-desktop-other-fs-stage2)
......
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