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/.

9 files changed, 8 insertions, 212 deletions

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
index ed355abd20..ed355abd20 100755
--- a/mkosi.presets/20-final/mkosi.build
+++ b/mkosi.presets/20-final/mkosi.kernel.build
diff --git a/mkosi.presets/20-final/mkosi.kernel.config b/mkosi.presets/20-final/mkosi.kernel.config
deleted file mode 100644
index ab3ffe2fea..0000000000
--- a/mkosi.presets/20-final/mkosi.kernel.config
+++ /dev/null
@@ -1,204 +0,0 @@
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_ATA=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_BINFMT_MISC=y
-CONFIG_BLK_CGROUP_IOCOST=y
-CONFIG_BLK_CGROUP_IOLATENCY=y
-CONFIG_BLK_CGROUP_IOPRIO=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BPF_EVENTS=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_LSM=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_BTRFS_FS=y
-CONFIG_CFG80211=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CGROUP_BPF=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CGROUP_MISC=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_RDMA=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUPS=y
-CONFIG_CONNECTOR=y
-CONFIG_CPUSETS=y
-CONFIG_CRASH_DUMP=y
-CONFIG_DEBUG_INFO_BTF=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DEVTMPFS=y
-CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y
-CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
-CONFIG_DM_VERITY=y
-CONFIG_DMI_SYSFS=y
-CONFIG_DMI=y
-CONFIG_EFI_MIXED=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_ZBOOT=y
-CONFIG_EFI=y
-CONFIG_EXPERT=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_HIBERNATION=y
-CONFIG_HIDRAW=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HPET=y
-CONFIG_HUGETLBFS=y
-CONFIG_HW_RANDOM_VIRTIO=y
-CONFIG_HW_RANDOM=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
-CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
-CONFIG_IMA=y
-CONFIG_INET=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_MISC=y
-CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
-CONFIG_INTEGRITY_MACHINE_KEYRING=y
-CONFIG_INTEGRITY_PLATFORM_KEYRING=y
-CONFIG_INTEGRITY_SIGNATURE=y
-CONFIG_IOSCHED_BFQ=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_ISO9660_FS=y
-CONFIG_KEXEC=y
-CONFIG_KPROBES=y
-CONFIG_LOAD_UEFI_KEYS=y
-CONFIG_MAC80211=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_MEMCG=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULES=y
-CONFIG_MSDOS_FS=y
-CONFIG_NAMESPACES=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_NET_9P=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_SCHED=y
-CONFIG_NET=y
-CONFIG_NETCONSOLE=y
-CONFIG_NETDEVICES=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER=y
-CONFIG_NETLABEL=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NF_NAT=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
-CONFIG_NO_HZ_FULL=y
-CONFIG_NUMA=y
-CONFIG_NVRAM=y
-CONFIG_PACKET=y
-CONFIG_PARAVIRT=y
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TRACE_RTC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_QUOTA=y
-CONFIG_RFKILL=y
-CONFIG_RTC_CLASS=y
-CONFIG_SATA_AHCI=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_SCSI=y
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_YAMA=y
-CONFIG_SECURITY=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250=y
-CONFIG_SMP=y
-CONFIG_SWAP=y
-CONFIG_SYSTEM_BLACKLIST_KEYRING=y
-CONFIG_SYSVIPC=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS=y
-CONFIG_UNIX=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MON=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB=y
-CONFIG_USER_NS=y
-CONFIG_VFAT_FS=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_VSOCKETS=y
-CONFIG_VSOCKETS=y
-CONFIG_WATCHDOG=y
-CONFIG_X86_ACPI_CPUFREQ=y
-CONFIG_X86_CPUID=y
-CONFIG_X86_MSR=y
-CONFIG_XFRM_USER=y
-CONFIG_XFS_FS=y
-CONFIG_XFS_POSIX_ACL=y