From 2791af18e41d7410023943197ed4470f865cb5fd Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 19 Dec 2025 11:33:13 +0000
Subject: [PATCH 1/2] tools: use -f in mkosi summary in fetch-distro.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

$ ./tools/fetch-distro.py -u fedora
+ mkosi --json -d fedora summary
‣ Ignoring --distribution from the CLI. Run with -f to rebuild the image with this setting

Follow-up for 35f6e5c3278bda935b67249a9ee61e9f6252bb6f
---
 tools/fetch-distro.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py
index 2dad51be24..4387af8397 100755
--- a/tools/fetch-distro.py
+++ b/tools/fetch-distro.py
@@ -35,7 +35,7 @@ def parse_args():
     return p.parse_args()
 
 def read_config(distro: str):
-    cmd = ['mkosi', '--json', '-d', distro, 'summary']
+    cmd = ['mkosi', '--json', '-d', distro, '-f', 'summary']
     if args.profile:
         cmd += ['--profile', args.profile]
     print(f"+ {shlex.join(cmd)}")

From 56a53a5974d5d58f52f7ba3fb0fac2e6cf130fc1 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 19 Dec 2025 11:35:09 +0000
Subject: [PATCH 2/2] mkosi: update fedora commit reference to
 cac8dde28a1298bbc2bee40e9ab3b9308392f691

* cac8dde28a test: Allow passing in extra tests to skip via TEST_SKIP
* 56377438ba Disable sysinit-path for upstream builds
* 0c8ea706f9 Fix links to patches
* 4f5b5a9615 Version 259
* bf8019c840 Version 259~rc3
* ef777d6572 Check if --max-lines is supported by meson
* b562e38e22 Fix use of removed $LOCAL_CONF variable
* 0289127dae Patch machined to continue after selinux denial
* 7e409130ee Version 259~rc2
* 33b38cdbc7 Suppress errors from tar
* ddb6474e94 Drop provides for removed sysvinit tools
* 9ac8c36307 Set meson auto features to auto when building for upstream
---
 .packit.yml                                        | 2 +-
 mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.packit.yml b/.packit.yml
index c2a719a212..726ad4c1c3 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -39,7 +39,7 @@ jobs:
   trigger: pull_request
   fmf_url: https://src.fedoraproject.org/rpms/systemd
   # This is automatically updated by tools/fetch-distro.py --update fedora
-  fmf_ref: 12f95f807fef5075a8842dd107f83b4c41d5ac26
+  fmf_ref: cac8dde28a1298bbc2bee40e9ab3b9308392f691
   targets:
   - fedora-rawhide-x86_64
   # testing-farm in the Fedora repository is explicitly configured to use testing-farm bare metal runners as
diff --git a/mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf b/mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf
index f43ed51c93..b80d9f64aa 100644
--- a/mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf
+++ b/mkosi/mkosi.pkgenv/mkosi.conf.d/centos-fedora.conf
@@ -9,5 +9,5 @@ Profiles=!hyperscale
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
         GIT_BRANCH=rawhide
-        GIT_COMMIT=12f95f807fef5075a8842dd107f83b4c41d5ac26
+        GIT_COMMIT=cac8dde28a1298bbc2bee40e9ab3b9308392f691
         PKG_SUBDIR=fedora