]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Hide patches on debian instead of removing them
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 21 Mar 2025 21:02:19 +0000 (22:02 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 21 Mar 2025 21:36:27 +0000 (22:36 +0100)
mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.build.chroot

index 03ff50211bfe839ec92c0c2b2c6327131306d079..ed3ba3b5b77999282c51837b99478b5623086d91 100755 (executable)
@@ -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.