From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 5 May 2024 13:03:37 +0000 (+0200)
Subject: mkosi: Make sure tmp.mount is not messed with on Debian/Ubuntu
X-Git-Tag: v256-rc2~97^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cf0efd8ecc45694d64e42bc244fd477d11644c8;p=thirdparty%2Fsystemd.git

mkosi: Make sure tmp.mount is not messed with on Debian/Ubuntu

We want /tmp to be a tmpfs so let's hack the debian packaging to
make sure that's the case until the debian packaging is fixed to
make /tmp a tmpfs for UPSTREAM=1 builds.
---

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 e8921c2efed..52a23a53b59 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
@@ -40,6 +40,10 @@ EOF
 cat debian/changelog >>debian/changelog.new
 mv debian/changelog.new debian/changelog
 
+# FIXME: Remove after tmp.mount is kept intact in the debian packaging for UPSTREAM=1 builds.
+sed --in-place '/tmp.mount/d' debian/rules
+sed --in-place '/tmp.mount/d' debian/not-installed
+
 build() {
     DEB_BUILD_OPTIONS=$(awk '$1=$1' <<<"\
         $( ((WITH_TESTS)) || echo nocheck) \