From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 12 Jun 2023 12:40:54 +0000 (+0200)
Subject: mkosi: Add bpftool to final image
X-Git-Tag: v254-rc1~221^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63e5ee409623e989bac850041bd33e209bc6ccd5;p=thirdparty%2Fsystemd.git

mkosi: Add bpftool to final image

Useful for debugging bpf.
---

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf b/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
index b0bbcf0c6ad..0b15677ff29 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-arch.conf
@@ -5,6 +5,7 @@ Distribution=arch
 
 [Content]
 Packages=
+        bpf
         btrfs-progs
         compsize
         dhcp
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
index f22aed37006..cb68c8dd1ad 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
@@ -6,6 +6,7 @@ Distribution=|fedora
 
 [Content]
 Packages=
+        bpftool
         cryptsetup
         dhcp-server
         dnf
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf b/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
index 3eb7a5453e3..d4cd53e6f2c 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-debian.conf
@@ -5,4 +5,5 @@ Distribution=debian
 
 [Content]
 Packages=
+        bpftool
         linux-image-cloud-amd64
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf b/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
index 54b79e06d14..60a2b6dbfc5 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf
@@ -5,6 +5,7 @@ Distribution=opensuse
 
 [Content]
 Packages=
+        bpftool
         btrfs-progs
         cryptsetup
         dbus-broker
diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf b/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
index e677797c734..3290987824c 100644
--- a/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf
@@ -8,3 +8,5 @@ Packages=
         # We would like to use linux-image-kvm but it does not have support for dm-verity
         # See https://bugs.launchpad.net/ubuntu/+source/linux-meta-kvm/+bug/2019040.
         linux-image-generic
+        linux-tools-common
+        linux-tools-generic