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 a65d427067dd28c3bceeb562f3ec28989f0e093f..69d1723ca1072f9f05e7cb9a3f0379bd436dfca2 100644 (file)
--- 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 6ac0b5849532e9255681ec34fd6fcaa4a142accd..c97f5deff2c348277f30c3b9069344d4c8f5285f 100644 (file)
--- 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 c42f9916eea68baae8aab1f67528d72c29a690a4..b11b13f70926266e0ccf045bea2c38fe9171427d 100644 (file)
--- 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 00338fa4d175b8e7cd704ba8e4eb20c0da487d2f..653efa8f0c18fc38d52902c0baf78efa962dd880 100644 (file)
--- 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 ea94c14346225bd06fe17d10205be5032d108184..97091859d16ec96486f6a47402a4346946cfbc64 100644 (file)
--- 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 aec631f1afcf855c156af109230690140ff5916f..6d25af5af2a2ce0695efb06becf4e0fe0a295d77 100644 (file)
--- 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 5505b41a86c65d314cb2e3a1a8f7906bd5e35a1b..838ab005c872e116bb74932675326faa1f4258c8 100644 (file)
--- 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