Skip to content

M
mkimage-profiles
Commit 30af48c8 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

vm.mk: Simplified conditions for choosing a bootloader depending on arch

parent b07db070
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
conf.d/vm.mk
View file @ 30af48c8
......@@ -2,18 +2,10 @@
ifeq (vm,$(IMAGE_CLASS))
# NB: interactivesystem pulls in network-config-subsystem anyways
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
vm/bare: vm/.base-lilo +sysvinit
else
vm/bare: vm/.bare +sysvinit
endif
@$(call add,BASE_PACKAGES,apt)
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
vm/systemd: vm/.base-grub +systemd
else
vm/systemd: vm/.bare +systemd
endif
@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata)
@$(call add,BASE_PACKAGES,apt)
......
lib/vm.mk
View file @ 30af48c8
......@@ -11,14 +11,20 @@ vm/.bare: profile/bare
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
vm/.base-lilo: vm/.bare use/bootloader/lilo; @:
else
vm/.base-lilo: vm/.base-grub; @:
endif
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
vm/.base-grub: vm/.bare use/bootloader/grub; @:
else
vm/.base-grub: vm/.base-grub-efi; @:
endif
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
vm/.base-grub-efi: vm/.bare use/efi/grub; @:
else
vm/.base-grub-efi: vm/.bare; @:
endif
endif
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