From 1ca30ea8c5f242e68aa783d8cbee78cb24eed98b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 6 Sep 2023 12:57:57 +0200 Subject: [PATCH 1/2] mkosi: Don't build hid selftests We don't build our kernel with hid support so don't build the selftests either. --- mkosi.presets/system/mkosi.kernel.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi.presets/system/mkosi.kernel.build b/mkosi.presets/system/mkosi.kernel.build index 64cc48863f..5938330d4b 100755 --- a/mkosi.presets/system/mkosi.kernel.build +++ b/mkosi.presets/system/mkosi.kernel.build @@ -30,7 +30,7 @@ if [ -d "$SRCDIR"/mkosi.kernel/ ]; then make O="$BUILDDIR" VERSION=99 INSTALL_MOD_PATH="$DESTDIR/usr" modules_install make O="$BUILDDIR" VERSION=99 INSTALL_PATH="$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" install mkdir -p "$DESTDIR/usr/lib/kernel/selftests" - make -C tools/testing/selftests -j "$(nproc)" O="$BUILDDIR" VERSION=99 KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="" install + make -C tools/testing/selftests -j "$(nproc)" O="$BUILDDIR" VERSION=99 KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="hid" install mkdir -p "$DESTDIR"/usr/bin ln -sf /usr/lib/kernel/selftests/bpf/bpftool "$DESTDIR/usr/bin/bpftool" From cbe7778f4c2c31b73b542297da5ff496e2c916ba Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 6 Sep 2023 12:58:30 +0200 Subject: [PATCH 2/2] mkosi: Don't disable CONFIG_USB Having USB enabled seems useful enough, this wasn't doing anything regardless because we already enable CONFIG_USB earlier in the kconfig file so this just gets rid of warning. --- mkosi.kernel.config | 1 - 1 file changed, 1 deletion(-) diff --git a/mkosi.kernel.config b/mkosi.kernel.config index e287fd7075..77657c2240 100644 --- a/mkosi.kernel.config +++ b/mkosi.kernel.config @@ -214,7 +214,6 @@ CONFIG_XFS_POSIX_ACL=y # CONFIG_AGP is not set # CONFIG_FB is not set # CONFIG_HID is not set -# CONFIG_USB is not set # CONFIG_NETDEVSIM is not set # CONFIG_NET_VENDOR_3COM is not set