From 9c7762c943bd5612f02a93b2ec986141fcb5226d Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 2 Oct 2024 10:50:59 +0200
Subject: [PATCH 1/3] mkosi: Don't sync if the packaging specs repo is dirty

---
 mkosi.images/build/mkosi.sync | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mkosi.images/build/mkosi.sync b/mkosi.images/build/mkosi.sync
index 02d66e9939..eeaa73e98f 100755
--- a/mkosi.images/build/mkosi.sync
+++ b/mkosi.images/build/mkosi.sync
@@ -12,6 +12,10 @@ if [[ -d "pkg/$PKG_SUBDIR/.git" ]]; then
         exit 0
     fi
 
+    if [[ -n "$(git -C "pkg/$PKG_SUBDIR" status --porcelain)" ]]; then
+        exit 0
+    fi
+
     if ! git -C "pkg/$PKG_SUBDIR" show-ref --quiet "origin/$GIT_BRANCH"; then
         git -C "pkg/$PKG_SUBDIR" remote set-url origin "$GIT_URL"
         git -C "pkg/$PKG_SUBDIR" fetch origin "$GIT_BRANCH"

From 345a4fcbb6ed16ab19d0d5b0c7344e5cdfe29efd Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 2 Oct 2024 11:27:09 +0200
Subject: [PATCH 2/3] mkosi: Pass ASAN_OPTIONS to subimages

systemd built with sanitizers is installed in subimages and tools
might get invoked in postinstall scripts so we have to disable ASAN
in the subimages as well during the image build.
---
 mkosi.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkosi.conf b/mkosi.conf
index d98c97f86d..1566074ce5 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -21,6 +21,7 @@ PassEnvironment=
         MESON_OPTIONS
         SYSEXT
         WITH_DEBUG
+        ASAN_OPTIONS
 
 [Output]
 RepartDirectories=mkosi.repart

From d98b6c66ffaccbef1c86fc729f2f9601bfb02fd5 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 2 Oct 2024 11:27:55 +0200
Subject: [PATCH 3/3] mkosi: Stop installing bpftrace

bpftrace nudges the Fedora Rawhide images towards compiler-rt18 while the
sanitizer builds pull in clang19, leading to the sanitizer libraries
not being found at runtime. Let's drop bpftrace for now so that compiler-rt19
is pulled in in the main image.
---
 mkosi.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mkosi.conf b/mkosi.conf
index 1566074ce5..980147f760 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -86,7 +86,6 @@ Packages=
         attr
         bash-completion
         binutils
-        bpftrace
         coreutils
         curl
         diffutils