{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.

conf.d/ve.mk

@@ -0,0 +1,20 @@
+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

conf.d/vm.mk

@@ -1,6 +1,9 @@
 # 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

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

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