From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 21 Mar 2025 21:02:19 +0000 (+0100)
Subject: mkosi: Hide patches on debian instead of removing them
X-Git-Tag: v258-rc1~1021
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fefcb935cd1181f580d9189b733673ce9abcf7e1;p=thirdparty%2Fsystemd.git

mkosi: Hide patches on debian instead of removing them
---

diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
index 03ff50211bf..ed3ba3b5b77 100755
--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot
@@ -34,8 +34,11 @@ fi
 # We transplant the debian/ folder from the deb package sources into the upstream sources.
 mount --mkdir --bind "$SRCDIR/pkg/$PKG_SUBDIR/debian" "$SRCDIR"/debian
 
-# We remove the patches so they don't get applied.
-rm -rf "$SRCDIR"/debian/patches/*
+# We hide the patches so they don't get applied.
+if [[ -d "$SRCDIR/debian/patches" ]]; then
+    mkdir /tmp/patches
+    mount --bind /tmp/patches "$SRCDIR/debian/patches"
+fi
 
 # While the build directory can be specified through DH_OPTIONS, the default one is hardcoded everywhere so
 # we have to use that. Because it is architecture dependent, we query it using dpkg-architecture first.