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

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

Browse Source
This commit is contained in:
Anton Midyukov 2020-09-11 18:40:02 +07:00
parent b07db07061
commit 30af48c871
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.d/vm.mk
View File

@ -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)

8
lib/vm.mk
View File

@ -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