From f5d916e83b00a3dfe3a7001197935ef3d63ffde3 Mon Sep 17 00:00:00 2001 From: Sergey Fokin Date: Thu, 3 Dec 2020 11:37:44 +0300 Subject: [PATCH] add patch that fix building CL OS iso --- fix_for_build_cl_iso.patch | 12 ++++++++++++ pungi.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fix_for_build_cl_iso.patch diff --git a/fix_for_build_cl_iso.patch b/fix_for_build_cl_iso.patch new file mode 100644 index 00000000..136717f5 --- /dev/null +++ b/fix_for_build_cl_iso.patch @@ -0,0 +1,12 @@ +diff -uprN a/pungi/phases/gather/sources/source_module.py b/pungi/phases/gather/sources/source_module.py +--- a/pungi/phases/gather/sources/source_module.py 2019-07-02 13:27:36.000000000 +0300 ++++ b/pungi/phases/gather/sources/source_module.py 2020-12-03 10:30:25.037856509 +0300 +@@ -38,7 +38,7 @@ class GatherSourceModule(pungi.phases.ga + + compatible_arches = pungi.arch.get_compatible_arches(arch, multilib=True) + +- for nsvc, mmd in variant.arch_mmds[arch].items(): ++ for nsvc, mmd in variant.arch_mmds.get(arch, {}).items(): + available_rpms = sum( + ( + variant.nsvc_to_pkgset[nsvc].rpms_by_arch.get(a, []) diff --git a/pungi.spec b/pungi.spec index 7f63f1b6..ff58b860 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,13 +2,15 @@ Name: pungi Version: 4.1.38 -Release: 1%{?dist}.2 +Release: 1%{?dist}.2.cloudlinux Summary: Distribution compose tool License: GPLv2 URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: fix_for_build_cl_iso.patch + BuildRequires: python3-nose BuildRequires: python3-mock %if 0%{?fedora} < 31 @@ -204,6 +206,9 @@ nosetests-3 --exe %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Thu Dec 03 2020 Sergey Fokin - 4.1.38-1.2.cloudlinux +- add patch for make possible building CL OS iso + * Thu Jul 25 2019 Stephen Smoogen - 4.1.38-1.2 - Find that I needed to change a libmodulemd elsewhere after it built