Skip to content

M
mkimage-profiles
Commit 0c873dd0 authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin
Browse files
Options

regular.mk: use/efi/refind for all targets, except jeos

elilo does not support secure boot with shim-signed 15. jeos does not require Secure Boot.
parent bd50f525
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
conf.d/regular.mk
View file @ 0c873dd0
...@@ -22,12 +22,12 @@ distro/.regular-x11: distro/.regular-base \ ...@@ -22,12 +22,12 @@ distro/.regular-x11: distro/.regular-base \
# WM base target # WM base target
distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \ distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \
mixin/regular-desktop; @: mixin/regular-desktop use/efi/refind; @:
# DE base target # DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm \ distro/.regular-desktop: distro/.regular-wm \
use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd use/syslinux/ui/gfxboot use/firmware/laptop +systemd
@$(call add,THE_BRANDING,bootloader) @$(call add,THE_BRANDING,bootloader)
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2) @$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
...@@ -40,7 +40,8 @@ distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \ ...@@ -40,7 +40,8 @@ distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
distro/.regular-install: distro/.regular-base +installer +sysvinit +power \ distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks \ use/branding use/bootloader/grub use/luks \
use/install2/fs use/install2/vnc use/install2/repo use/install2/fs use/install2/vnc use/install2/repo \
use/efi/refind
@$(call add,INSTALL2_PACKAGES,fdisk) @$(call add,INSTALL2_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@$(call add,THE_LISTS,$(call tags,base regular)) @$(call add,THE_LISTS,$(call tags,base regular))
...@@ -93,14 +94,14 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \ ...@@ -93,14 +94,14 @@ distro/.regular-install-x11-full: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-desktop use/install2/fs \ mixin/desktop-installer mixin/regular-desktop use/install2/fs \
use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \ use/fonts/otf/adobe use/fonts/otf/mozilla use/fonts/chinese \
use/branding/complete use/branding/slideshow/once \ use/branding/complete use/branding/slideshow/once \
use/net-eth/dhcp use/efi/refind use/efi/shell use/rescue/base \ use/net-eth/dhcp use/efi/shell use/rescue/base \
use/init/sysv/elogind use/init/sysv/elogind
@$(call add,RESCUE_LISTS,$(call tags,rescue misc)) @$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch) @$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord) @$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \ distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \
use/efi/refind use/browser/chromium use/browser/chromium
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
# wdm can't do autologin so add standalone one for livecd # wdm can't do autologin so add standalone one for livecd
...@@ -155,7 +156,7 @@ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \ ...@@ -155,7 +156,7 @@ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
@$(call add,THE_LISTS,$(call tags,lxqt desktop)) @$(call add,THE_LISTS,$(call tags,lxqt desktop))
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \ distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp use/efi/refind; @: use/net-eth/dhcp; @:
distro/regular-kde5: distro/.regular-desktop use/browser/falkon \ distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
use/x11/kde5 use/x11/sddm use/domain-client \ use/x11/kde5 use/x11/sddm use/domain-client \
......
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