Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkosi for openSUSE:Factory checked in at 2025-12-22 22:51:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkosi (Old) and /work/SRC/openSUSE:Factory/.mkosi.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkosi" Mon Dec 22 22:51:56 2025 rev:30 rq:1324173 version:26 Changes: -------- --- /work/SRC/openSUSE:Factory/mkosi/mkosi.changes 2025-08-25 20:41:37.048937259 +0200 +++ /work/SRC/openSUSE:Factory/.mkosi.new.1928/mkosi.changes 2025-12-22 22:55:38.584860961 +0100 @@ -1,0 +2,51 @@ +Mon Dec 22 09:37:12 UTC 2025 - Antonio Feijoo <[email protected]> + +- Add 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch: + * Backport upstream patch to fix mkosi-initrd in openSUSE Tumbleweed. + Without this patch, mkosi thinks that it's Leap and the call fails. + +- Update to 26: + * Extra options to commands invoked by mkosi (e.g. when using mkosi boot + or mkosi shell) should now be delimited from regular options using + --. Options passed after the verb without using the -- delimiter + are now interpreted as regular mkosi options. + * Boolean options specified on the command line now always expect a + boolean argument. For example, --repository-key-check needs to + become --repository-key-check=yes. The reason for this change is to + remove ambiguity when parsing e.g. --repository-key-check build + where build would be interpreted as the argument for + --repository-key-check whereas now it'll be properly interpreted as + the verb. + * Teach --verity a new hash value, which skips the verity signature + partition for extension / portable images. To align the possible values, + yes is renamed to signed. + * Teach --verity a new defer value, which defers creation of the + verity signature partition for disk, extension and portable images (but + still allocates space for it). This is useful to implement offline + signing of the verity roothash. + * A new way to specify modules included in the initrd has been added. + The new default is that modules need to be specified to be included. + Previous separate Include and Exclude options that take regexps are now + deprecated and are replaced by a single option that takes a list of + positive and negative globs. The new options are KernelModules= + and KernelInitrdModules=. + * A new way to specify firmware files included in the initrd has been added. + Previous separate Include and Exclude options that take regexps are now + deprecated and are replaced by a single option that takes a list of + positive and negative globs. The new option is FirmwareFiles=. + * The RuntimeScratch= option has been dropped. Use RuntimeSize= + instead to grow the image before booting it. + * The CDROM= option has been dropped. + * Unknown settings now generate a warning message instead of failing the + image build. This allows configs to work across a wider range of mkosi + versions while still taking advantage of newer settings. MinimumVersion + can still be used to enforce a minimum version of mkosi that knows all + required settings. + +- Remove 0002-Include-sys-conf-ext-info-in-metadata-file.patch, merged in + version 26. + +- Remove 0001-Drop-microsecond-resolution-for-datetime.now.patch, merged in + version 26. + +------------------------------------------------------------------- Old: ---- 0001-Drop-microsecond-resolution-for-datetime.now.patch 0002-Include-sys-conf-ext-info-in-metadata-file.patch mkosi-25.3.tar.gz New: ---- 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch mkosi-26.tar.gz ----------(Old B)---------- Old: - Remove 0001-Drop-microsecond-resolution-for-datetime.now.patch, merged in version 26. Old: - Remove 0002-Include-sys-conf-ext-info-in-metadata-file.patch, merged in version 26. ----------(Old E)---------- ----------(New B)---------- New: - Add 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch: * Backport upstream patch to fix mkosi-initrd in openSUSE Tumbleweed. ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkosi.spec ++++++ --- /var/tmp/diff_new_pack.438pvc/_old 2025-12-22 22:55:39.384893955 +0100 +++ /var/tmp/diff_new_pack.438pvc/_new 2025-12-22 22:55:39.384893955 +0100 @@ -28,7 +28,7 @@ %endif Name: mkosi -Version: 25.3 +Version: 26 Release: 0 Summary: Build bespoke OS Images License: LGPL-2.1-or-later @@ -36,10 +36,8 @@ URL: https://github.com/systemd/mkosi Source0: https://github.com/systemd/mkosi/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: mkosi-initrd.conf -# PATCH-FIX-UPSTREAM https://github.com/systemd/mkosi/pull/3841 -Patch0: 0001-Drop-microsecond-resolution-for-datetime.now.patch -# PATCH-FIX-UPSTREAM https://github.com/systemd/mkosi/pull/3823 -Patch1: 0002-Include-sys-conf-ext-info-in-metadata-file.patch +# PATCH-FIX-UPSTREAM https://github.com/systemd/mkosi/pull/4079 +Patch0: 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module wheel} @@ -142,8 +140,8 @@ # See man mkosi(1) for details. #[Content] #ExtraTrees= -#KernelModulesInclude= -#KernelModulesExclude= +#FirmwareFiles= +#KernelModules= EOF fi %{?regenerate_initrd_post} ++++++ 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch ++++++ >From d53761c4dd2fe4a86a203d81c5bf1bbcf4e06ead Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo <[email protected]> Date: Fri, 19 Dec 2025 12:14:11 +0100 Subject: [PATCH] distribution: do not default to release=VERSION_ID for openSUSE Tumbleweed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `config_default_release()` calls `detect_distribution()` to get the default release if it's not set, which picks the value from os-release's `VERSION_ID`. In openSUSE Tumbleweed this property has the snapshot number. Since `mkosi-initrd` does not set `Release=` via config, mkosi thinks that it's Leap and fails: ``` $ mkosi-initrd ‣ Validating certificates and keys ‣ Building main image ‣ Copying in sandbox trees… ‣ Installing openSUSE Warning: Enforced setting: $releasever=20251217 Loading repository data... Reading installed packages... 'Leap-release' not found in package names. Trying capabilities. No provider of 'Leap-release' found. ‣ "zypper --installroot=/buildroot --cache-dir=/var/cache/zypp --non-interactive --no-refresh --releasever=20251217 --no-gpg-checks install --download in-advance --no-recommends --force-resolution filesystem Leap-release" returned non-zero exit code 104. ‣ "mkosi --force --directory= --format=cpio --output=initrd --output-directory=/tmp/tmpcvx9let7 --extra-tree=/usr/lib/modules/6.17.0-2-default:/usr/lib/modules/6.17.0-2-default --extra-tree=/usr/lib/firmware:/usr/lib/firmware '--remove-files=/usr/lib/firmware/*-ucode' --build-sources= --include=mkosi-initrd --kernel-modules=host --extra-tree=/usr/lib/modules/6.17.0-1-default/updates/hdaps.ko:/usr/lib/modules/6.17.0-1-default/updates/hdaps.ko --extra-tree=/usr/lib/modules/6.17.0-1-default/updates/thinkpad_ec.ko:/usr/lib/modules/6.17.0-1-default/updates/thinkpad_ec.ko --extra-tree=/usr/lib/modules/6.17.0-1-default/updates/tp_smapi.ko:/usr/lib/modules/6.17.0-1-default/updates/tp_smapi.ko --package-cache-dir=/var --cache-only=metadata --output-mode=600 --include /usr/lib/mkosi-initrd --include /etc/mkosi-initrd --sandbox-tree=/tmp/tmp0tjr7mwr --extra-tree=/etc/vconsole.conf:/etc/vconsole.conf" returned non-zero exit code 104. ``` Fixes 0b701c690ddcf3543bc1a698a1977ea390dbfd36 --- mkosi/distribution/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/distribution/__init__.py b/mkosi/distribution/__init__.py index 2b8b632b..e59025ac 100644 --- a/mkosi/distribution/__init__.py +++ b/mkosi/distribution/__init__.py @@ -162,7 +162,7 @@ def detect_distribution(root: Path = Path("/")) -> tuple[Optional[Distribution], dist_id = os_release.get("ID", "linux") dist_id_like = os_release.get("ID_LIKE", "").split() - version_id = os_release.get("VERSION_ID", None) + version_id = os_release.get("VERSION_ID", None) if dist_id != "opensuse-tumbleweed" else "tumbleweed" version_codename = os_release.get("VERSION_CODENAME", None) quirks = { -- 2.51.0 ++++++ mkosi-25.3.tar.gz -> mkosi-26.tar.gz ++++++ ++++ 29131 lines of diff (skipped)
