From 7cf0efd8ecc45694d64e42bc244fd477d11644c8 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 5 May 2024 15:03:37 +0200 Subject: [PATCH] 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. --- .../system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot | 4 ++++ 1 file changed, 4 insertions(+) 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) \ -- 2.47.3