ve.mk: refactor those ve/lxc-* dups

Part of mkimage-profiles' design is to make it easier to figure out the common parts and describe these as such; even if something's hastily implemented through copypaste, it's worth it to have a look (amending the debugged commit to make it pretty as well, fixing up the newcomers at the merge time, or at least spotting crap and taking care afterwards -- the latter having more potential for "free" merge conflicts, doing this sort of cleanup rather earlier than later rather pays off albeit premature optimization can take place here either when too many "layers of beforehand indirection" are introduced; ve/.lxc-bare in this very commit is bordering just that, so use your common sense and experience or ask in devel-distro@ when in doubt). Fixes: 37e088da

ve.mk: refactor those ve/lxc-* dups
501e74b4 · Michael Shigorin · Anton Midyukov · 51ae114e · 501e74b4
Commit 501e74b4 authored Oct 25, 2021 by Michael Shigorin Committed by Anton Midyukov Oct 25, 2021
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

ve.mk conf.d/ve.mk +6 -7

No files found.
--- a/conf.d/ve.mk
+++ b/conf.d/ve.mk
@@ -55,16 +55,15 @@ ve/systemd-etcnet: ve/systemd-bare use/net/etcnet
 	@$(call add,BASE_PACKAGES,systemd-settings-disable-kill-user-processes)
 	@$(call add,BASE_PACKAGES,glibc-gconv-modules glibc-locales tzdata bash-completion iptables curl)
-ve/lxc-sysvinit-etcnet: ve/sysvinit-etcnet use/net-eth use/lxc-guest
+ve/.lxc-bare: use/lxc-guest
-	@$(call add,BASE_PACKAGES,vim-console)
 	@$(call add,NET_ETH,eth0:dhcp)
-ve/lxc-systemd-networkd: ve/systemd-networkd use/net-eth/networkd use/lxc-guest
+ve/.lxc-base: ve/.lxc-bare
 	@$(call add,BASE_PACKAGES,vim-console)
-	@$(call add,NET_ETH,eth0:dhcp)
-ve/lxc-systemd-etcnet: ve/systemd-etcnet use/net-eth use/lxc-guest
+ve/lxc-sysvinit-etcnet: ve/.lxc-base ve/sysvinit-etcnet use/net-eth; @:
-	@$(call add,BASE_PACKAGES,vim-console)
+ve/lxc-systemd-etcnet: ve/.lxc-base ve/systemd-etcnet use/net-eth; @:
-	@$(call add,NET_ETH,eth0:dhcp)
+ve/lxc-systemd-networkd: ve/.lxc-base \
+	ve/systemd-networkd use/net-eth/networkd; @:
 endif