[devel-distro] [PATCH 0/3] замеченное

[devel-distro] [PATCH 0/3] замеченное

[Michael Shigorin]

	Здравствуйте.
Заглянул в mkimage-profiles по партнёрской надобности
(lxc-шаблон с разработкой) и хочу предложить три простых
патчика.

Один убирает дубли, ну некрасиво же было накопипащено.

Второй убирает "rpm: не заданы аргументы запроса"
при сборке, скажем, ve/* с REPORT=1.

Третий добавляет lxc-шаблон, аналогичный ve/builder.

Michael Shigorin (3):
  ve.mk: refactor those ve/lxc-* dups
  reports.mk: don't call rpmquery with empty list
  ve.mk: initial ve/lxc-builder

 conf.d/ve.mk | 16 +++++++++-------
 reports.mk   |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

-- 
2.25.4

[devel-distro] [PATCH 1/3] ve.mk: refactor those ve/lxc-* dups

[Michael Shigorin]

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/ve.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf.d/ve.mk b/conf.d/ve.mk
index 0497f9aea..75957af5d 100644
--- a/conf.d/ve.mk
+++ b/conf.d/ve.mk
@@ -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; @:
 
 endif
-- 
2.25.4

[devel-distro] [PATCH 2/3] reports.mk: don't call rpmquery with empty list

[Michael Shigorin]

xargs -r is a good habit usually.

Fixes: c771783654d9477c4798099db46687834200df5c
---
 reports.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reports.mk b/reports.mk
index 60ccfec16..585d998a5 100644
--- a/reports.mk
+++ b/reports.mk
@@ -108,7 +108,7 @@ reports/packages: reports/prep
 		cut -d' ' -f 1 | tr -d "'"'`' | \
 		tee /dev/stderr 2> >(sed 's,^.*/,,' | \
 			sort -u > "$(REPORTDIR)/list-rpms.txt") | \
-		xargs rpm -qp --queryformat '%{sourcerpm}\n' | \
+		xargs -r rpm -qp --queryformat '%{sourcerpm}\n' | \
 		sort -u > "$(REPORTDIR)/list-srpms.txt"
 
 else
-- 
2.25.4

[devel-distro] [PATCH 3/3] ve.mk: initial ve/lxc-builder

[Michael Shigorin]

I've doubted what to base it on but settled with ve/.lxc-base
for the common prefix reason. :)
---
 conf.d/ve.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf.d/ve.mk b/conf.d/ve.mk
index 75957af5d..136d3b611 100644
--- a/conf.d/ve.mk
+++ b/conf.d/ve.mk
@@ -62,4 +62,7 @@ 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; @:
 
+ve/lxc-builder: ve/lxc-sysvinit-etcnet use/dev/builder/base use/repo
+	@$(call add,BASE_LISTS,openssh)
+
 endif
-- 
2.25.4

Re: [devel-distro] [PATCH 0/3] замеченное

[Антон Мидюков]

25.10.2021 16:13, Michael Shigorin пишет:
> 	Здравствуйте.
> Заглянул в mkimage-profiles по партнёрской надобности
> (lxc-шаблон с разработкой) и хочу предложить три простых
> патчика.
> 
> Один убирает дубли, ну некрасиво же было накопипащено.
> 
> Второй убирает "rpm: не заданы аргументы запроса"
> при сборке, скажем, ve/* с REPORT=1.
> 
> Третий добавляет lxc-шаблон, аналогичный ve/builder.
> 

1 и 3 патч не подошли к последней версии 1.4.19.
Подправил и забрал все три.
В ветке next у меня на git.alt


-- 
С уважением, Антон Мидюков <antohami@altlinux.org>