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 a65d427067..69d1723ca1 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 6ac0b58495..c97f5deff2 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 c42f9916ee..b11b13f709 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 00338fa4d1..653efa8f0c 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 ea94c14346..97091859d1 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 aec631f1af..6d25af5af2 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 5505b41a86..838ab005c8 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