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

vm.mk: add vm/.bare-grub{,-efi}

Browse Source 
Some images will now be better off with GRUB;
rework ve/.bare while at that (splitting the
image targets appropriately).
This commit is contained in:
Алексей Шабалин 2018-11-27 20:20:28 +03:00 committed by Michael Shigorin
parent 11e1bf73db
commit cf420b2174
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/vm.mk
View File

@ -2,10 +2,10 @@
ifeq (vm,$(IMAGE_CLASS))
# NB: interactivesystem pulls in network-config-subsystem anyways
vm/bare: vm/.bare +sysvinit
vm/bare: vm/.base-lilo +sysvinit
@$(call add,BASE_PACKAGES,apt)
vm/systemd: vm/.bare +systemd
vm/systemd: vm/.base-grub +systemd
@$(call add,BASE_PACKAGES,apt)
# handle ROOTPW (through deflogin)

14
lib/vm.mk
View File

@ -8,8 +8,20 @@ ifeq (vm,$(IMAGE_CLASS))
vm/.bare: profile/bare
@$(call add,BASE_PACKAGES,interactivesystem shadow-utils e2fsprogs)
ifeq (,$(filter-out i586 x86_64,$(ARCH))) # useless on anything else
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
vm/.base-lilo: vm/.bare
@$(call add,BASE_PACKAGES,lilo)
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
vm/.base-grub: vm/.bare
@$(call add,BASE_PACKAGES,grub2-pc)
endif
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
vm/.base-grub-efi: vm/.bare
@$(call add,BASE_PACKAGES,grub2-efi)
endif
endif