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/.
2024-07-21 18:24:38 +00:00 · 2023-05-04 15:45:42 +02:00 · 2023-05-04 15:45:42 +02:00 · bfb7635544
parent 9107ef5637
commit bfb7635544
9 changed files with 8 additions and 8 deletions
--- a/mkosi.presets/20-final/mkosi.kernel.config
+++ b/mkosi.presets/20-final/mkosi.kernel.config
--- 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
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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
--- a/mkosi.presets/20-final/mkosi.kernel.build
+++ b/mkosi.presets/20-final/mkosi.kernel.build