From 191e6381bcf418092644217723001bca7c154c45 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 12 Nov 2025 09:39:19 +0100 Subject: [PATCH 1/2] lkl: fix default build target to include progs lklfuse, fs2tar and cptofs were accidentally dropped from the default build target via a typo in commit 6d360d164e5d5 ("lkl: link tests against common private library"). The install target was still triggering progs-y builds, which is probably why this took longer to notice than expected. Fixes: 6d360d164e5d5 ("lkl: link tests against common private library") Signed-off-by: David Disseldorp --- tools/lkl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile index 2929944d77b3..d3d91841014e 100644 --- a/tools/lkl/Makefile +++ b/tools/lkl/Makefile @@ -53,7 +53,7 @@ export CFLAGS += -I$(OUTPUT)/include -Iinclude -Wall -g -O2 -Wextra \ include Targets TARGETS := $(progs-y:%=$(OUTPUT)%$(EXESUF)) -TARGETS := $(tests-y:%=$(OUTPUT)%$(EXESUF)) +TARGETS += $(tests-y:%=$(OUTPUT)%$(EXESUF)) TARGETS += $(libs-y:%=$(OUTPUT)%$(SOSUF)) all: $(TARGETS) From 101d4a4d0fdd6fe6203831b917ce74bbb7a77fe0 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 12 Nov 2025 10:49:52 +0100 Subject: [PATCH 2/2] lkl: systemd: fix udev rule to properly filter for USB devs The previous filter accepted non-usb block devices, which resulted in unexpected EFI partition mounts. Split the filter and check for ENV{ID_BUS}!="usb". Tested on systemd-udevd 254 and 257 systems. Signed-off-by: David Disseldorp --- tools/lkl/systemd/61-lklfuse.rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lkl/systemd/61-lklfuse.rules b/tools/lkl/systemd/61-lklfuse.rules index bdb6f493543d..899d36140b5e 100644 --- a/tools/lkl/systemd/61-lklfuse.rules +++ b/tools/lkl/systemd/61-lklfuse.rules @@ -1,4 +1,5 @@ -SUBSYSTEM!="block", SUBSYSTEMS!="usb", GOTO="lklfuse_end" +SUBSYSTEM!="block", GOTO="lklfuse_end" +ENV{ID_BUS}!="usb", GOTO="lklfuse_end" #TAG+="lklfuse-dbg-block-filter" # XXX remove should be handled by systemd service ConditionPathExists for %k # device node, but it doesn't appear to work, so manually stop.