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

regular-jeos: use grub on architectures not supported by lilo

Browse Source
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2019-07-09 18:56:38 +03:00 committed by Michael Shigorin
parent 255a0f87d5
commit 2fb0293dec
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conf.d/regular.mk
View File

@ -61,9 +61,19 @@ distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
@$(call add,THE_LISTS,openssh)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/.regular-jeos-bootloader: use/bootloader/lilo ; @:
else
ifeq (,$(filter-out $(GRUB_ARCHES),$(ARCH)))
distro/.regular-jeos-bootloader: use/bootloader/grub ; @:
else
distro/.regular-jeos-bootloader: ; @:
endif
endif
# ...and for somewhat bare distros
distro/.regular-jeos: distro/.regular-jeos-base \
use/bootloader/lilo use/syslinux/lateboot.cfg \
distro/.regular-jeos-bootloader use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/jeos
@$(call add,BASE_KMODULES,guest scsi vboxguest)