From 7849500cd97e74b515236b3fef9c720f67053614 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Thu, 30 Jul 2026 12:09:54 +0200 Subject: [PATCH] mkosi: install bpftool in Debian/Ubuntu test images The centos-fedora, opensuse and postmarketos image configurations all install bpftool but the Debian/Ubuntu ones never did. Only their build image gets it via the packaging's Build-Depends. So the TEST-90-RESTRICT-FSACCESS guard and overlay subtests, both gated on 'command -v bpftool', just silently skip there. Mirror what the build image does. Plain bpftool everywhere except Ubuntu jammy and noble which still bundle it in linux-tools-generic. Signed-off-by: Christian Brauner (Amutable) --- .../debian-ubuntu/mkosi.conf.d/bpftool.conf | 13 +++++++++++++ .../mkosi.conf.d/linux-tools-generic.conf | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf create mode 100644 mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf new file mode 100644 index 0000000000..b41790a621 --- /dev/null +++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/bpftool.conf @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# bpftool was untangled in resolute; Debian ships it standalone everywhere + +[TriggerMatch] +Distribution=debian + +[TriggerMatch] +Distribution=ubuntu +Release=!jammy +Release=!noble + +[Content] +Packages=bpftool diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf new file mode 100644 index 0000000000..b777a41490 --- /dev/null +++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# bpftool was untangled in resolute, needs linux-tools-generic in older releases + +[TriggerMatch] +Distribution=ubuntu +Release=|jammy +Release=|noble + +[Content] +Packages=linux-tools-generic