Add perf to tools tree

We don't add it to Ubuntu as perf is very tightly coupled to the
kernel package there which makes installing it a royal pain.

diff --git a/mkosi.conf.d/20-arch.conf b/mkosi.conf.d/20-arch.conf
index 247ffd925a0a2676be0b6c5b26a7a1358a6b1b70..81ff9446b8efcbc6f59e90b02b50d57b55ec460e 100644 (file)
--- a/mkosi.conf.d/20-arch.conf
+++ b/mkosi.conf.d/20-arch.conf
@@ -7,7 +7,6 @@ Distribution=arch
 Packages=
         grub
         openssh
-        perf
         python
         qemu-user-static
         shim

diff --git a/mkosi.conf.d/20-centos/mkosi.conf b/mkosi.conf.d/20-centos/mkosi.conf
index 13f5409fe9015ae3eb995ae00c19b96af222dfda..504b9396f568216ecdf4be871b9ce242a7c69225 100644 (file)
--- a/mkosi.conf.d/20-centos/mkosi.conf
+++ b/mkosi.conf.d/20-centos/mkosi.conf
@@ -13,4 +13,3 @@ Release=9
 ShimBootloader=none
 Packages=
         linux-firmware
-        perf

diff --git a/mkosi.conf.d/20-debian/mkosi.conf b/mkosi.conf.d/20-debian/mkosi.conf
index 62a185682de21e973561b2be8b3851bc1d3bfd83..108a509a2897f4a65e575025221d5d07a1443e77 100644 (file)
--- a/mkosi.conf.d/20-debian/mkosi.conf
+++ b/mkosi.conf.d/20-debian/mkosi.conf
@@ -6,7 +6,3 @@ Distribution=debian
 [Distribution]
 Release=testing
 Repositories=non-free-firmware
-
-[Content]
-Packages=
-        linux-perf

diff --git a/mkosi.conf.d/20-fedora/mkosi.conf b/mkosi.conf.d/20-fedora/mkosi.conf
index bf6ae2603bc42a1e5c0157502b5183ae68763d15..6021758f05d42e6eb14c078a0e2f9b68af959860 100644 (file)
--- a/mkosi.conf.d/20-fedora/mkosi.conf
+++ b/mkosi.conf.d/20-fedora/mkosi.conf
@@ -9,6 +9,5 @@ Release=rawhide
 [Content]
 Packages=
         fish
-        perf
         qemu-user-static
         rpmautospec

diff --git a/mkosi.conf.d/20-kali/mkosi.conf b/mkosi.conf.d/20-kali/mkosi.conf
index 97ab9f76e41441071455f79be71dd77a77676d1e..b1f26cf949aad686b0cccba9d4fb7a7e97544934 100644 (file)
--- a/mkosi.conf.d/20-kali/mkosi.conf
+++ b/mkosi.conf.d/20-kali/mkosi.conf
@@ -5,7 +5,3 @@ Distribution=kali
 
 [Distribution]
 Repositories=non-free-firmware
-
-[Content]
-Packages=
-        linux-perf

diff --git a/mkosi.conf.d/20-opensuse/mkosi.conf b/mkosi.conf.d/20-opensuse/mkosi.conf
index c56650c06140e7450b1cdad469999a3d4e716d1b..71790cbc32c13f883564b60c96ee1d74cd0120c2 100644 (file)
--- a/mkosi.conf.d/20-opensuse/mkosi.conf
+++ b/mkosi.conf.d/20-opensuse/mkosi.conf
@@ -14,7 +14,6 @@ Packages=
         fish
         openssh-clients
         openssh-server
-        perf
         python3
         qemu-linux-user
         shim

diff --git a/mkosi.conf.d/20-ubuntu/mkosi.conf b/mkosi.conf.d/20-ubuntu/mkosi.conf
index e1b4b5dffa148e73b4d88b1460ba8f9d6231fbcf..b4bc572544c722bc4b8f22f3836de5c8f2a8ec4b 100644 (file)
--- a/mkosi.conf.d/20-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/20-ubuntu/mkosi.conf
@@ -6,7 +6,3 @@ Distribution=ubuntu
 [Distribution]
 Release=noble
 Repositories=universe
-
-[Content]
-Packages=
-        linux-tools-generic

diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index e90de83a86c3cbf7b90be6c9ec2eb128326917bb..cde614e31f66911bddbdf5e1a032fb957e23aacc 100644 (file)
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1282,6 +1282,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `openssh`               | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `openssl`               | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `pkcs11-provider`       | ✓      |        | ✓      | ✓    | ✓      | ✓    | ✓        |
+    | `perf`                  | ✓      | ✓      | ✓      | ✓    |        | ✓    | ✓        |
     | `sed`                   | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `pacman`                | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    |          |
     | `policycoreutils`       | ✓      | ✓      | ✓      | ✓    | ✓      |      | ✓        |

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
index 7d3555c8429edf6db5922ff6485713211c203ab1..8a3631145634a5f7b8949ee0ea76095bb1eef061 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
@@ -21,6 +21,7 @@ Packages=
         libseccomp
         openssh
         pacman
+        perf
         pipewire
         pipewire-audio
         pkcs11-provider

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
index af4862d4b147031ac251a0d823833b2afab1557e..985c95ed944ed92c7365dd67fd9a5dbc56756209 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
@@ -2,3 +2,7 @@
 
 [Match]
 Distribution=centos
+
+[Content]
+Packages=
+        perf

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf
new file mode 100644 (file)
index 0000000..50dfa11
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+
+[Content]
+Packages=
+        linux-perf

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
index 6f83642dd7676171f678027b1580f8f6c5f474d9..4c14ab6efd4f55ed8a7de497acf3489fce2b9814 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
@@ -15,6 +15,7 @@ Packages=
         erofs-utils
         fish
         pacman
+        perf
         pkcs11-provider
         qemu-system-aarch64-core
         qemu-system-ppc-core

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf
new file mode 100644 (file)
index 0000000..5b4a0aa
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=kali
+
+[Content]
+Packages=
+        linux-perf

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
index fd3f7aa322292b61689200c1c96c55160ae3ee33..b5a37e29a3cbc3d6db6357ae3c2968747e8d91f9 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
@@ -21,6 +21,7 @@ Packages=
         openssh-clients
         ovmf
         patterns-base-minimal_base
+        perf
         pkcs11-provider
         policycoreutils
         python3-cryptography