{lib,conf.d}/{ve,vm}.mk: shift the real targets

lib/*.mk aren't going to be parsed for build targets in the near future; and the early placement of those targets was superseded by a dedicated configuration snippet directory so just move these bits there.

{lib,conf.d}/{ve,vm}.mk: shift the real targets
a18295f2 · Michael Shigorin · d160d610 · a18295f2 · a18295f2 · a18295f2
Commit a18295f2 authored Jun 19, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 21 deletions

ve.mk conf.d/ve.mk +20 -0

vm.mk conf.d/vm.mk +3 -0

ve.mk lib/ve.mk +0 -17

vm.mk lib/vm.mk +0 -4

No files found.
--- a/conf.d/ve.mk
+++ b/conf.d/ve.mk
+ifeq (ve,$(IMAGE_CLASS))
+
+# no "vzctl enter"
+ve/bare: ve/.base
+	@$(call add,BASE_PACKAGES,sysvinit)
+
+# /dev/pty and friends start here
+ve/base: ve/bare
+	@$(call add,BASE_PACKAGES,interactivesystem)
+
+# this should be more or less deployable
+ve/generic: ve/base
+	@$(call add,BASE_LISTS,openssh \
+		$(call tags,base && (server || network || security || pkg)))
+
+# example of service-specific template
+ve/openvpn: ve/bare
+	@$(call add,BASE_LISTS,$(call tags,server openvpn))
+
+endif
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
 # virtual machines
 ifeq (vm,$(IMAGE_CLASS))

+vm/bare: vm/.bare
+	@$(call add,BASE_PACKAGES,apt)
+
 vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:

 # NB: use/x11 employs some installer-feature packages

--- a/lib/ve.mk
+++ b/lib/ve.mk
@@ -14,21 +14,4 @@ ve/.bare: profile/bare
 ve/.base: ve/.bare
 	@$(call add,BASE_PACKAGES,etcnet apt)

-# no "vzctl enter"
-ve/bare: ve/.base
-	@$(call add,BASE_PACKAGES,sysvinit)
-
-# /dev/pty and friends start here
-ve/base: ve/bare
-	@$(call add,BASE_PACKAGES,interactivesystem)
-
-# this should be more or less deployable
-ve/generic: ve/base
-	@$(call add,BASE_LISTS,openssh \
-		$(call tags,base && (server || network || security || pkg)))
-
-# example of service-specific template
-ve/openvpn: ve/bare
-	@$(call add,BASE_LISTS,$(call tags,server openvpn))
-
 endif
--- a/lib/vm.mk
+++ b/lib/vm.mk
@@ -8,9 +8,5 @@ ifeq (vm,$(IMAGE_CLASS))

 vm/.bare: profile/bare
 	@$(call add,BASE_PACKAGES,interactivesystem lilo shadow-utils e2fsprogs)
-	@$(call set,KFLAVOURS,un-def)
-
-vm/bare: vm/.bare
-	@$(call add,BASE_PACKAGES,apt)

 endif