From a531931cd4d05894bfb98b99b647e58761aa8ccc Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 28 Apr 2024 19:11:50 +0200 Subject: [PATCH] mkosi: Simply remove all the debian patches instead of mounting over them The build sources are ephemeral anyways, so we can just remove the patches instead of hiding them. --- .../system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot index e4f589d6b6e..e8921c2efed 100755 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot @@ -13,9 +13,8 @@ fi # We transplant the debian/ folder from the deb package sources into the upstream sources. mount --mkdir --bind "$SRCDIR/pkg/$ID/debian" "$SRCDIR"/debian -# We hide the patches/ directory by mounting an empty directory on top so they don't get applied. -TMP=$(mktemp -d) -mount --bind "$TMP" "$SRCDIR"/debian/patches +# We remove the patches so they don't get applied. +rm -rf "$SRCDIR"/debian/patches/* # 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. -- 2.47.3