From 478fadde77441706611dc18c1ae3390d9fd2aa13 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 3 Apr 2025 09:59:13 +0200 Subject: [PATCH] mkosi: update fedora commit reference * b17e5d64a1 Don't try to modify mkosi.repart config if mkosi conf is in subdir * e2b2ea3776 fmf: Use mkosi/mkosi.local.conf if the mkosi/ directory exists --- .packit.yml | 2 +- mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.packit.yml b/.packit.yml index 19fbce9cdd..39db52bc7c 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: 617952132de4ed882b9b00ceeed077f843130f91 + fmf_ref: b17e5d64a1cd9f1ac2600c90ea93fcf9c5c11784 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.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf index 63caaede59..88970e3383 100644 --- a/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf +++ b/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf @@ -8,5 +8,5 @@ Distribution=|fedora Environment= GIT_URL=https://src.fedoraproject.org/rpms/systemd.git GIT_BRANCH=rawhide - GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91 + GIT_COMMIT=b17e5d64a1cd9f1ac2600c90ea93fcf9c5c11784 PKG_SUBDIR=fedora