From b61614969dfa70dc78ee64b4a0929cd2471f7738 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 16 Sep 2024 12:57:35 +0300 Subject: [PATCH] - Add x86_64_v2 to arch list if x86_64 in list --- pungi.spec | 5 ++++- pungi/arch.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pungi.spec b/pungi.spec index 32816cce..9f63dae8 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,7 +2,7 @@ Name: pungi Version: 4.7.0 -Release: 4%{?dist}.alma +Release: 5%{?dist}.alma Summary: Distribution compose tool License: GPL-2.0-only @@ -174,6 +174,9 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-cache-cleanup %changelog +* Mon Sep 16 2024 Eduard Abdullin - 4.7.0-5 +- Add x86_64_v2 to arch list if x86_64 in list + * Fri Sep 06 2024 Stepan Oksanichenko - 4.7.0-4 - Truncate a volume ID to 32 bytes - Add new architecture `x86_64_v2` diff --git a/pungi/arch.py b/pungi/arch.py index 48048c72..3a927966 100644 --- a/pungi/arch.py +++ b/pungi/arch.py @@ -93,6 +93,9 @@ def split_name_arch(name_arch): def is_excluded(package, arches, logger=None): """Check if package is excluded from given architectures.""" + if package.arch == 'x86_64_v2' and 'x86_64' in package.exclusivearch: + package.exclusivearch.append('x86_64_v2') + if package.excludearch and set(package.excludearch) & set(arches): if logger: logger.debug(