From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 5 Mar 2024 18:42:18 +0000 (+0100)
Subject: mkosi: Use specifier to refer to the output directory
X-Git-Tag: v256-rc1~636^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb478caa86b153b1fc5c1269c5cd87020c3a34e5;p=thirdparty%2Fsystemd.git

mkosi: Use specifier to refer to the output directory

Otherwise the output directory cannot be configured by users.
---

diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf
index 8e38dc1b782..36684c7f16f 100644
--- a/mkosi.images/initrd/mkosi.conf
+++ b/mkosi.images/initrd/mkosi.conf
@@ -7,8 +7,8 @@ Dependencies=base
 Format=cpio
 
 [Content]
-BaseTrees=../../mkosi.output/base
-ExtraTrees=../../mkosi.output/base-systemd
+BaseTrees=%O/base
+ExtraTrees=%O/base-systemd
 MakeInitrd=yes
 Bootable=no
 BuildPackages=
diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 9646bbefde0..5bcf6967c78 100644
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -8,8 +8,8 @@ Dependencies=base
 
 [Content]
 Autologin=yes
-BaseTrees=../../mkosi.output/base
-ExtraTrees=../../mkosi.output/base-systemd
+BaseTrees=%O/base
+ExtraTrees=%O/base-systemd
 Packages=
         acl
         bash-completion
diff --git a/mkosi.images/system/mkosi.conf.d/05-initrd.conf b/mkosi.images/system/mkosi.conf.d/05-initrd.conf
index 9f217540581..23685871c62 100644
--- a/mkosi.images/system/mkosi.conf.d/05-initrd.conf
+++ b/mkosi.images/system/mkosi.conf.d/05-initrd.conf
@@ -9,4 +9,4 @@ Format=|directory
 Dependencies=initrd
 
 [Content]
-Initrds=../../mkosi.output/initrd
+Initrds=%O/initrd