From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 2 Nov 2023 11:01:03 +0000 (+0100)
Subject: Various followups for merged PRs
X-Git-Tag: v19~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d72e3bade5deabae4287e93e072776baa2b6487e;p=thirdparty%2Fmkosi.git

Various followups for merged PRs
---

diff --git a/NEWS.md b/NEWS.md
index 074c67ebc..83f205121 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -37,12 +37,7 @@
   initrd based on what type of kernel is passed by the user via
   `-kernel` or `QemuKernel=`
 - We don't create subdirectories beneath the configured cache directory
-  anymore. To get back the previous behavior, configure the cache directory
-  with subdirectories:
-
-  ```conf
-  CacheDirectory=mkosi.cache/%d~%r~%a
-  ```
+  anymore.
 
 ## v18
 
diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index efe4160e1..3fb03490e 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -53,8 +53,7 @@ class QemuDeviceNode(StrEnum):
             return False
 
         try:
-            fd = os.open(self.device(), flags)
-            os.close(fd)
+            os.close(os.open(self.device(), flags))
         except OSError:
             if log:
                 logging.warning(
diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 0cab7b9c7..b289971ae 100644
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -1641,7 +1641,7 @@ available via `$PATH` to simplify common usecases.
 * `mkosi-as-caller`: This script uses `setpriv` to switch from
   the user `root` in the user namespace used for various build steps
   back to the original user that called mkosi. This is useful when
-  we want to invoke build steps which will write to $BUILDDIR and
+  we want to invoke build steps which will write to `$BUILDDIR` and
   we want to have the files owned by the calling user.
 
   For example, a complete `mkosi.build` script might be the following:
@@ -1649,7 +1649,6 @@ available via `$PATH` to simplify common usecases.
   ```sh
   set -ex
 
-  rm -rf "$BUILDDIR/build"
   mkosi-as-caller meson setup "$BUILDDIR/build" "$SRCDIR"
   mkosi-as-caller meson compile -C "$BUILDDIR/build"
   meson install -C "$BUILDDIR/build" --no-rebuild