From 8b8b558fbc4e701aff1fe9566cf7e8328f9028d8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 19 Jun 2023 12:25:22 +0200 Subject: [PATCH 1/2] Rebuilt for Python 3.12 --- pungi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pungi.spec b/pungi.spec index 960e5c5b..d48c8fed 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,7 +2,7 @@ Name: pungi Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distribution compose tool License: GPL-2.0-only @@ -138,6 +138,9 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Mon Jun 19 2023 Python Maint - 4.4.0-2 +- Rebuilt for Python 3.12 + * Wed Jun 07 2023 Lubomír Sedlář - 4.4.0-1 - gather-dnf: Run latest() later (lsedlar) - iso: Support joliet long names (lsedlar) From 2362ef59c5345991dd9bce5487ceb4b9d188d902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 19 Jul 2023 07:55:30 +0200 Subject: [PATCH 2/2] Backport patch from upstream PR 1690 --- 1690.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ pungi.spec | 6 +++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 1690.patch diff --git a/1690.patch b/1690.patch new file mode 100644 index 00000000..a76d2fbe --- /dev/null +++ b/1690.patch @@ -0,0 +1,53 @@ +From bd64894a03628d52be8cbe89b79ef724293d2053 Mon Sep 17 00:00:00 2001 +From: Lubomír Sedlář +Date: Jul 18 2023 06:44:26 +0000 +Subject: ostree: Add configuration for custom runroot packages + + +Signed-off-by: Lubomír Sedlář + +--- + +diff --git a/doc/configuration.rst b/doc/configuration.rst +index 3912e47..70a0534 100644 +--- a/doc/configuration.rst ++++ b/doc/configuration.rst +@@ -1800,6 +1800,8 @@ repository with a new commit. + * ``tag_ref`` -- (*bool*, default ``True``) If set to ``False``, a git + reference will not be created. + * ``ostree_ref`` -- (*str*) To override value ``ref`` from ``treefile``. ++ * ``runroot_packages`` -- (*list*) A list of additional package names to be ++ installed in the runroot environment in Koji. + + Example config + -------------- +diff --git a/pungi/checks.py b/pungi/checks.py +index c5ef3f8..3bd334e 100644 +--- a/pungi/checks.py ++++ b/pungi/checks.py +@@ -1059,6 +1059,9 @@ def make_schema(): + "config_branch": {"type": "string"}, + "tag_ref": {"type": "boolean"}, + "ostree_ref": {"type": "string"}, ++ "runroot_packages": { ++ "$ref": "#/definitions/list_of_strings", ++ }, + }, + "required": [ + "treefile", +diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py +index cbfcd76..90578ae 100644 +--- a/pungi/phases/ostree.py ++++ b/pungi/phases/ostree.py +@@ -168,7 +168,9 @@ class OSTreeThread(WorkerThread): + ("unified-core", config.get("unified_core", False)), + ] + ) +- packages = ["pungi", "ostree", "rpm-ostree"] ++ default_packages = ["pungi", "ostree", "rpm-ostree"] ++ additional_packages = config.get("runroot_packages", []) ++ packages = default_packages + additional_packages + log_file = os.path.join(self.logdir, "runroot.log") + mounts = [compose.topdir, config["ostree_repo"]] + runroot = Runroot(compose, phase="ostree") + diff --git a/pungi.spec b/pungi.spec index d48c8fed..5cd821e6 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,12 +2,13 @@ Name: pungi Version: 4.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Distribution compose tool License: GPL-2.0-only URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: https://pagure.io/pungi/pull-request/1690.patch BuildRequires: make BuildRequires: python3-pytest @@ -138,6 +139,9 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Wed Jul 19 2023 Lubomír Sedlář - 4.4.0-3 +- Backport ostree runroot package additions + * Mon Jun 19 2023 Python Maint - 4.4.0-2 - Rebuilt for Python 3.12