ALT Linux Distributions development
 help / color / mirror / Atom feed
From: Michael Shigorin <>
Subject: [devel-distro] [PATCH 1/3] refactor those ve/lxc-* dups
Date: Mon, 25 Oct 2021 12:13:14 +0300
Message-ID: <> (raw)
In-Reply-To: <>

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: 37e088dac925477ab58c25f27118b5d14ba39214
 conf.d/ | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf.d/ b/conf.d/
index 0497f9aea..75957af5d 100644
--- a/conf.d/
+++ b/conf.d/
@@ -51,16 +51,15 @@ ve/systemd-networkd: ve/systemd-bare use/net/networkd
 ve/systemd-etcnet: ve/systemd-bare use/net/etcnet
 	@$(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
-	@$(call add,BASE_PACKAGES,vim-console)
+ve/.lxc-bare: use/lxc-guest; @:
 	@$(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
-	@$(call add,BASE_PACKAGES,vim-console)
-	@$(call add,NET_ETH,eth0:dhcp)
+ve/lxc-sysvinit-etcnet: ve/.lxc-base ve/sysvinit-etcnet use/net-eth; @:
+ve/lxc-systemd-etcnet: ve/.lxc-base ve/systemd-etcnet use/net-eth; @:
+ve/lxc-systemd-networkd: ve/.lxc-base \
+	ve/systemd-networkd use/net-eth/networkd; @:

  reply	other threads:[~2021-10-25  9:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-25  9:13 [devel-distro] [PATCH 0/3] замеченное Michael Shigorin
2021-10-25  9:13 ` Michael Shigorin [this message]
2021-10-25  9:13 ` [devel-distro] [PATCH 2/3] don't call rpmquery with empty list Michael Shigorin
2021-10-25  9:13 ` [devel-distro] [PATCH 3/3] initial ve/lxc-builder Michael Shigorin
2021-10-25 14:31 ` [devel-distro] [PATCH 0/3] замеченное Антон Мидюков

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

ALT Linux Distributions development

This inbox may be cloned and mirrored by anyone:

	git clone --mirror devel-distro/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel-distro devel-distro/ \
	public-inbox-index devel-distro

Example config snippet for mirrors.
Newsgroup available over NNTP:

AGPL code for this site: git clone