From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 4 May 2023 13:45:42 +0000 (+0200)
Subject: mkosi: Look for mkosi.kernel/ in the top level directory
X-Git-Tag: v254-rc1~556^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfb76355440b983412c7baa83a13995cc43a3ef3;p=thirdparty%2Fsystemd.git

mkosi: Look for mkosi.kernel/ in the top level directory

Let's make this slightly easier to use by looking for mkosi.kernel/
in the top level directory instead of in mkosi.presets/20-final/.
---

diff --git a/mkosi.presets/20-final/mkosi.kernel.config b/mkosi.kernel.config
similarity index 100%
rename from mkosi.presets/20-final/mkosi.kernel.config
rename to mkosi.kernel.config
diff --git a/mkosi.presets/00-base/mkosi.conf b/mkosi.presets/00-base/mkosi.conf
index a65d427067d..69d1723ca10 100644
--- a/mkosi.presets/00-base/mkosi.conf
+++ b/mkosi.presets/00-base/mkosi.conf
@@ -5,7 +5,6 @@ Format=directory
 
 [Content]
 Bootable=no
-BuildSources=../..
 CleanPackageMetadata=no
 Packages=
         kmod
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf
index 6ac0b584953..c97f5deff2c 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-arch.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-PathExists=mkosi.kernel/
+PathExists=../../mkosi.kernel/
 Distribution=arch
 
 [Content]
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
index c42f9916eea..b11b13f7092 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-PathExists=mkosi.kernel/
+PathExists=../../mkosi.kernel/
 Distribution=centos fedora
 
 [Content]
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
index 00338fa4d17..653efa8f0c1 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-PathExists=mkosi.kernel/
+PathExists=../../mkosi.kernel/
 Distribution=debian ubuntu
 
 [Content]
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf
index ea94c143462..97091859d16 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-fedora.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-PathExists=mkosi.kernel/
+PathExists=../../mkosi.kernel/
 Distribution=fedora
 
 [Content]
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf
index aec631f1afc..6d25af5af2a 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-opensuse.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-PathExists=mkosi.kernel/
+PathExists=../../mkosi.kernel/
 Distribution=opensuse
 
 [Content]
diff --git a/mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf b/mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf
index 5505b41a86c..838ab005c87 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel.conf
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-PathExists=mkosi.kernel/
+PathExists=../../mkosi.kernel/
 
 [Content]
-BuildSources=./
+BuildScript=mkosi.kernel.build
+BuildSources=../..
 BuildPackages=
         bc
         binutils
diff --git a/mkosi.presets/20-final/mkosi.build b/mkosi.presets/20-final/mkosi.kernel.build
similarity index 100%
rename from mkosi.presets/20-final/mkosi.build
rename to mkosi.presets/20-final/mkosi.kernel.build