Skip to content

M
mkimage-profiles
Commit 1885b7a3 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

regular.mk: use grub for jeos

parent 94168cf1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 11 deletions
conf.d/regular.mk
View file @ 1885b7a3
...@@ -62,19 +62,9 @@ distro/.regular-jeos-base: distro/.regular-bare \ ...@@ -62,19 +62,9 @@ distro/.regular-jeos-base: distro/.regular-bare \
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty) @$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console su agetty)
@$(call add,THE_LISTS,openssh) @$(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 # ...and for somewhat bare distros
distro/.regular-jeos: distro/.regular-jeos-base \ distro/.regular-jeos: distro/.regular-jeos-base \
distro/.regular-jeos-bootloader use/syslinux/lateboot.cfg \ use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \ use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/jeos use/cleanup/jeos
@$(call add,BASE_KMODULES,guest scsi vboxguest) @$(call add,BASE_KMODULES,guest scsi vboxguest)
......
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