diff --git a/change-fitering-error-to-warning.patch b/change-fitering-error-to-warning.patch new file mode 100644 index 0000000..e51d2a4 --- /dev/null +++ b/change-fitering-error-to-warning.patch @@ -0,0 +1,27 @@ +From 3073c41cb968ad3c92ab0281b026f7cd8f7d1944 Mon Sep 17 00:00:00 2001 +From: Michael Schroeder +Date: Wed, 25 Jun 2025 11:39:52 +0200 +Subject: [PATCH] Change updateinfo filtering error to a warning + +The backend does not give us any updateinfo if there is no package +matching a selection. So it's better to build an empty product instead +of erroring out. + +We may want to revisit this in the future. +--- + src/productcomposer/utils/rpmutils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/productcomposer/utils/rpmutils.py b/src/productcomposer/utils/rpmutils.py +index d9ef49f..a028162 100644 +--- a/src/productcomposer/utils/rpmutils.py ++++ b/src/productcomposer/utils/rpmutils.py +@@ -161,7 +161,7 @@ def link_rpms_to_tree(rpmdir, yml, pool, arch, flavor, tree_report, supportstatu + referenced_update_rpms = None + if 'updateinfo_packages_only' in yml['build_options']: + if not pool.updateinfos: +- die("filtering for updates enabled, but no updateinfo found") ++ warn("filtering for updates enabled, but no updateinfo found") + if singlemode: + die("filtering for updates enabled, but take_all_available_versions is not set") + diff --git a/parse-supportstatus.patch b/parse-supportstatus.patch new file mode 100644 index 0000000..e720407 --- /dev/null +++ b/parse-supportstatus.patch @@ -0,0 +1,26 @@ +From 26c805f5b38bed987461ff51a0f6461827c43236 Mon Sep 17 00:00:00 2001 +From: Eugenio Paolantonio +Date: Fri, 20 Jun 2025 18:18:02 +0200 +Subject: [PATCH] commands: build: ensure supportstatus_override is passed to + parse_supportstatus() + +The function signature changed after the recent rework. + +Signed-off-by: Eugenio Paolantonio +--- + src/productcomposer/commands/build.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/productcomposer/commands/build.py b/src/productcomposer/commands/build.py +index 6c5318c..4cd8789 100644 +--- a/src/productcomposer/commands/build.py ++++ b/src/productcomposer/commands/build.py +@@ -69,7 +69,7 @@ def build(self, args): + + supportstatus_fn = os.path.join(directory, 'supportstatus.txt') + if os.path.isfile(supportstatus_fn): +- parse_supportstatus(supportstatus_fn) ++ parse_supportstatus(supportstatus_fn, supportstatus_override) + + if args.euladir and os.path.isdir(args.euladir): + parse_eulas(args.euladir, eulas) diff --git a/product-composer.changes b/product-composer.changes index e34ab99..19bdf52 100644 --- a/product-composer.changes +++ b/product-composer.changes @@ -1,10 +1,22 @@ +------------------------------------------------------------------- +Wed Jun 25 09:47:33 UTC 2025 - Dirk Müller + +- add change-fitering-error-to-warning.patch: + * Change updateinfo filtering error to a warning + +------------------------------------------------------------------- +Tue Jun 24 13:24:31 UTC 2025 - Dirk Müller + +- add parse-supportstatus.patch: + * fixes crash on parsing supportstatus information + ------------------------------------------------------------------- Wed Jun 4 14:34:39 UTC 2025 - Adrian Schröter - update to version 0.6.2 * crash fix for agama builds * Rework package set calculation - + The new code allows to reference package sets that are defined later in the recipe. It also allows to specify a flavor or architecture in the reference, so that a flavor can reuse the @@ -71,7 +83,7 @@ Wed Apr 30 12:36:01 UTC 2025 - Adrian Schröter Mon Mar 31 10:05:44 UTC 2025 - Adrian Schröter - update to version 0.5.12: - * Fix handling of internal updateinfo.xml attributes + * Fix handling of internal updateinfo.xml attributes supportstatus, superseded_by and embargo_date . ------------------------------------------------------------------- @@ -102,7 +114,7 @@ Mon Feb 24 10:35:48 UTC 2025 - Adrian Schröter - update to version 0.5.8 - Added missing bits for splitted source medium + Added missing bits for splitted source medium ------------------------------------------------------------------- Fri Feb 21 13:25:46 UTC 2025 - Adrian Schröter @@ -149,11 +161,11 @@ Thu Jan 30 09:14:14 UTC 2025 - Adrian Schröter - update to version 0.5.2 Handle baseisos like meta packages - + This means we don't expect them deployed in the build host system anymore. Instead we search for them in the given repositories for the product and unpack the containment rpm. - + The wanted side effect of this is that products will get rebuild, when the baseiso has changed now. @@ -320,11 +332,11 @@ Wed Mar 6 15:11:10 UTC 2024 - Adrian Schröter - update to version 0.4.0 Replacement of susedata tool, first part - + - Add supportstatus - Add gpg trusted keys - switch to SHA512 checksum - + Missing: - diskusage data - package translations diff --git a/product-composer.spec b/product-composer.spec index ab47a79..99698a0 100644 --- a/product-composer.spec +++ b/product-composer.spec @@ -31,8 +31,10 @@ Group: Development/Tools/Building URL: https://github.com/openSUSE/product-composer #!CreateArchive: product-composer Source: %name-%{version}.tar.xz +Patch0: https://github.com/openSUSE/product-composer/commit/26c805f5b38bed987461ff51a0f6461827c43236.patch#/parse-supportstatus.patch +Patch1: https://github.com/openSUSE/product-composer/commit/3073c41cb968ad3c92ab0281b026f7cd8f7d1944.patch#/change-fitering-error-to-warning.patch # Should become a build option -Patch1: sle-15-defaults.patch +Patch10: sle-15-defaults.patch BuildRequires: %{used_python}-pip BuildRequires: %{used_python}-poetry-core BuildRequires: %{used_python}-setuptools @@ -58,8 +60,10 @@ WARNING: please be aware that the code is still on the move and is %prep %setup -q -n %name-%version -%if "%{?sle_version}" == "150600" +%patch -P 0 -p1 %patch -P 1 -p1 +%if "%{?sle_version}" == "150600" +%patch -P 10 -p1 %endif %build