From: Daan De Meyer Date: Fri, 10 Jan 2025 12:48:59 +0000 (+0100) Subject: Add perf to tools tree X-Git-Tag: v25~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f03944912a01573425def66ac99e40fd315113ea;p=thirdparty%2Fmkosi.git 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 247ffd925..81ff9446b 100644 --- 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 13f5409fe..504b9396f 100644 --- 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 62a185682..108a509a2 100644 --- 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 bf6ae2603..6021758f0 100644 --- 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 97ab9f76e..b1f26cf94 100644 --- 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 c56650c06..71790cbc3 100644 --- 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 e1b4b5dff..b4bc57254 100644 --- 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 e90de83a8..cde614e31 100644 --- 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 7d3555c84..8a3631145 100644 --- 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 af4862d4b..985c95ed9 100644 --- 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 index 000000000..50dfa11db --- /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 6f83642dd..4c14ab6ef 100644 --- 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 index 000000000..5b4a0aae0 --- /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 fd3f7aa32..b5a37e29a 100644 --- 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