Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkosi for openSUSE:Factory checked in at 2024-06-03 17:41:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkosi (Old) and /work/SRC/openSUSE:Factory/.mkosi.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkosi" Mon Jun 3 17:41:36 2024 rev:15 rq:1177944 version:22 Changes: -------- --- /work/SRC/openSUSE:Factory/mkosi/mkosi.changes 2024-03-27 20:42:56.121933795 +0100 +++ /work/SRC/openSUSE:Factory/.mkosi.new.24587/mkosi.changes 2024-06-03 17:41:47.727334292 +0200 @@ -1,0 +2,5 @@ +Mon May 27 15:50:17 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com> + +- Add opensuse-dont-install-distribution-release-by-default.patch + +------------------------------------------------------------------- New: ---- opensuse-dont-install-distribution-release-by-default.patch BETA DEBUG BEGIN: New: - Add opensuse-dont-install-distribution-release-by-default.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkosi.spec ++++++ --- /var/tmp/diff_new_pack.DbXQRj/_old 2024-06-03 17:41:48.195352089 +0200 +++ /var/tmp/diff_new_pack.DbXQRj/_new 2024-06-03 17:41:48.195352089 +0200 @@ -26,6 +26,8 @@ Group: System/Management URL: https://github.com/systemd/mkosi Source: https://github.com/systemd/mkosi/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/systemd/mkosi/pull/2606 +Patch0: opensuse-dont-install-distribution-release-by-default.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module wheel} @@ -60,7 +62,7 @@ supported (not plain MBR/BIOS). %prep -%setup -q +%autosetup -p1 %build tools/make-man-page.sh ++++++ opensuse-dont-install-distribution-release-by-default.patch ++++++ From 6cbf5cc1375525f71819416dfae8206ff3c4e1ea Mon Sep 17 00:00:00 2001 From: Daan De Meyer <daan.j.demeyer@gmail.com> Date: Mon, 8 Apr 2024 13:40:35 +0200 Subject: [PATCH] opensuse: Don't install distribution-release by default distribution-release is a virtual package that is satisfied by multiple packages. By installing it by default in the first transaction we can't override it anymore later. Let's fix the issue by not explicitly installing distribution-release. To make sure openSUSE-release is pulled in by default to satisfy distribution-release, we install patterns-base-minimal_base which has a Suggests dependency on openSUSE-release. --- mkosi.conf.d/20-opensuse.conf | 1 + mkosi/distributions/opensuse.py | 2 +- mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf | 2 ++ mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) Index: mkosi-22/mkosi.conf.d/20-opensuse.conf =================================================================== --- mkosi-22.orig/mkosi.conf.d/20-opensuse.conf +++ mkosi-22/mkosi.conf.d/20-opensuse.conf @@ -34,6 +34,7 @@ Packages= openssh-server openssl ovmf + patterns-base-minimal_base perf pesign python3-pefile Index: mkosi-22/mkosi/distributions/opensuse.py =================================================================== --- mkosi-22.orig/mkosi/distributions/opensuse.py +++ mkosi-22/mkosi/distributions/opensuse.py @@ -69,7 +69,7 @@ class Installer(DistributionInstaller): @classmethod def install(cls, context: Context) -> None: - cls.install_packages(context, ["filesystem", "distribution-release"], apivfs=False) + cls.install_packages(context, ["filesystem"], apivfs=False) @classmethod def install_packages(cls, context: Context, packages: Sequence[str], apivfs: bool = True) -> None: Index: mkosi-22/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf =================================================================== --- mkosi-22.orig/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf +++ mkosi-22/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf @@ -5,6 +5,8 @@ Distribution=opensuse [Content] Packages= + patterns-base-minimal_base + # Various libraries that are dlopen'ed by systemd libfido2-1 tpm2-0-tss Index: mkosi-22/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf =================================================================== --- mkosi-22.orig/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf +++ mkosi-22/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf @@ -16,6 +16,7 @@ Packages= grub2 openssh-clients ovmf + patterns-base-minimal_base pesign policycoreutils python3-pefile