Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkosi for openSUSE:Factory checked in at 2026-09-02 17:14:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkosi (Old) and /work/SRC/openSUSE:Factory/.mkosi.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkosi" Wed Sep 2 17:14:06 2026 rev:32 rq:1375346 version:26 Changes: -------- --- /work/SRC/openSUSE:Factory/mkosi/mkosi.changes 2026-08-28 19:59:32.517480130 +0200 +++ /work/SRC/openSUSE:Factory/.mkosi.new.1265/mkosi.changes 2026-09-02 17:14:08.765150837 +0200 @@ -2,58 +1,0 @@ -Fri Aug 28 06:00:24 UTC 2026 - Antonio Feijoo <[email protected]> - -- Add 0001-tests-skip-test_fork_and_wait-if-on-rc-1.patch: - * Backport upstream patch to fix test build in OBS. - -- Update to 27: - * Debug output (with --debug) will now show the duration of all steps. - * When booting an image it is always registered with user session machined - instance. - * gzip compressed outputs have been made reproducible. - * Generate locales configured in /etc/locale.gen. - * PORTABLE_PREFIXES= can be set via Environment=. - * The special value default is now understood for Initrds=, so that it can be - used in conjunction with custom initrds. - * Plugins for DNF can be configured via the environment variables - MKOSI_DNF_DISABLE_PLUGINS and MKOSI_DNF_ENABLE_PLUGINS. This is meant for - advanced use cases and is not supported further. - * A new option MakeScriptsExecutable= has been added to make scripts, that are - not executable, executable instead of exiting with an error. - * A new option OutputSize= has been added to resize output images to that size - after creation. - * Two new options OciLabels= and OciAnnotations= have been added to support - adding custom labels and annotations for images using the OCI output. - * Default initrds are no longer built by default for images using the - directory output. - * All cached images are removed when repository metadata will be synced to - avoid partial upgrade scenarios. - * When booting images the hostname is no longer set via the kernel command - line so as not to overwrite the hostname set via other means in the image. - * Support for using systemd-nsresourced's foreign UID range has been added for - directory images via the new ForeignUIDRange=. This is now the only - supported way for booting directory images unprivileged. Building images - unprivileged without a sufficiently new systemd-nsresourced is still - supported. - * If a mkosi/ directory exists and no output location is configured, the - .mkosi-private will be put there. - * LocalMirror= can now be set for tools trees. - * A new setting DriveType= has been added to configures the disk type to use - for the root disk when booting a virtual machine. - * Four new settings ElTorito=, ElToritoSystem=, ElToritoVolume=, and - ElToritoPublisher= for use with systemd-repart's El Torito support have been - added. - * mkosi box does not tint the background by itself anymore. - * The GitHub integration tests have been made runnable locally. - * Support for distribution-built UKIs have been fixed and they are picked up - as /usr/lib/modules/<kver>/vmlinuz*.efi if a signed bootloader or - UnifiedKernelImages=signed is requested. - * The update-grub trigger of APK is disabled for postmarketOS if - /etc/update-grub.conf does not exist. If you define the file yourself, you - must set disable_trigger=1 yourself, if you pull in the grub package. - * A new option ToolsTreeSnapshot was added, which defaults to the value of the - regular Snapshot= setting if the same distribution is used for the image and - the tools tree. - -- Remove 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch, merged - in version 27. - -------------------------------------------------------------------- Old: ---- 0001-tests-skip-test_fork_and_wait-if-on-rc-1.patch mkosi-27.tar.gz New: ---- 0001-distribution-do-not-default-to-release-VERSION_ID-fo.patch mkosi-26.tar.gz ----------(Old B)---------- Old: WARN: 0001-tests-skip-test_fork_and_wait-if-on-rc-1.patch not found in changes ----------(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.IkwoIh/_old 2026-09-02 17:14:09.458174740 +0200 +++ /var/tmp/diff_new_pack.IkwoIh/_new 2026-09-02 17:14:09.459174774 +0200 @@ -1,7 +1,7 @@ # # spec file for package mkosi # -# Copyright (c) 2026 SUSE LLC and contributors +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %endif Name: mkosi -Version: 27 +Version: 26 Release: 0 Summary: Build bespoke OS Images License: LGPL-2.1-or-later @@ -36,8 +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/4432 -Patch0: 0001-tests-skip-test_fork_and_wait-if-on-rc-1.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} ++++++ 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-27.tar.gz -> mkosi-26.tar.gz ++++++ /work/SRC/openSUSE:Factory/mkosi/mkosi-27.tar.gz /work/SRC/openSUSE:Factory/.mkosi.new.1265/mkosi-26.tar.gz differ: char 13, line 1
