From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 3 Jun 2024 09:49:34 +0000 (+0200)
Subject: mkosi: drop Debian /tmp hack
X-Git-Tag: v256-rc4~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c397b5c7018948b652312f5fa97839cab5be8e49;p=thirdparty%2Fsystemd.git

mkosi: drop Debian /tmp hack

/tmp is now a tmpfs in debian testing so let's drop our workaround.
---

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 2015a4b46c1..8819b46eaf1 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
@@ -44,10 +44,6 @@ 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) \