diff --git a/1572.patch b/1572.patch new file mode 100644 index 00000000..49be5385 --- /dev/null +++ b/1572.patch @@ -0,0 +1,24 @@ +From 5e6248e3e0222af2f4c0cf564aad584fabf093f8 Mon Sep 17 00:00:00 2001 +From: Haibo Lin +Date: Nov 15 2021 06:38:53 +0000 +Subject: Generate images.json for extra_isos phase + + +JIRA: RHELCMP-7241 +Signed-off-by: Haibo Lin + +--- + +diff --git a/pungi/scripts/pungi_koji.py b/pungi/scripts/pungi_koji.py +index b8669d8..97db226 100644 +--- a/pungi/scripts/pungi_koji.py ++++ b/pungi/scripts/pungi_koji.py +@@ -553,6 +553,7 @@ def run_compose( + buildinstall_phase.skip() + and ostree_installer_phase.skip() + and createiso_phase.skip() ++ and extra_isos_phase.skip() + and liveimages_phase.skip() + and livemedia_phase.skip() + and image_build_phase.skip() + diff --git a/pungi.spec b/pungi.spec index cb825f4f..9f3b2138 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,12 +2,13 @@ Name: pungi Version: 4.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distribution compose tool License: GPLv2 URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: https://pagure.io/pungi/pull-request/1572.patch BuildRequires: make BuildRequires: python3-nose @@ -137,6 +138,9 @@ nosetests-3 --exe -e test_variant_repo_rpms %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Mon Nov 15 2021 Haibo Lin - 4.3.2-2 +- Backport patch for generating images.json + * Thu Nov 11 2021 Haibo Lin - 4.3.2-1 - gather: Load JSON mapping relative to config dir (lsedlar) - gather: Stop requiring all variants/arches in JSON (lsedlar)