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

Some images will now be better off with GRUB; rework ve/.bare while at that (splitting the image targets appropriately).

vm.mk: add vm/.bare-grub{,-efi}
cf420b21 · Alexey Shabalin · Michael Shigorin · 11e1bf73 · cf420b21 · cf420b21
Commit cf420b21 authored Nov 27, 2018 by Alexey Shabalin Committed by Michael Shigorin Dec 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 3 deletions

vm.mk conf.d/vm.mk +2 -2

vm.mk lib/vm.mk +13 -1

No files found.
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
@@ -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)

--- a/lib/vm.mk
+++ b/lib/vm.mk
@@ -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