From 53455140abeb5eba3a409a4a89f2a1358362f164 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 25 Jan 2024 07:25:00 -0600 Subject: [PATCH] kernel-6.8.0-0.rc1.20240125git6098d87eaf31.15 * Thu Jan 25 2024 Fedora Kernel Team [6.8.0-0.rc1.6098d87eaf31.15] - Remove separate license tag for libperf (Justin M. Forbes) - Don't use upstream bpftool version for Fedora package (Justin M. Forbes) - Don't ship libperf.a in libperf-devel (Justin M. Forbes) - add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 - kernel-aarch64-16k-fedora.config | 2 - kernel-aarch64-64k-debug-rhel.config | 1 - kernel-aarch64-64k-rhel.config | 1 - kernel-aarch64-debug-fedora.config | 2 - kernel-aarch64-debug-rhel.config | 1 - kernel-aarch64-fedora.config | 2 - kernel-aarch64-rhel.config | 1 - kernel-aarch64-rt-debug-rhel.config | 1 - kernel-aarch64-rt-rhel.config | 1 - kernel-ppc64le-debug-fedora.config | 2 - kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-fedora.config | 2 - kernel-ppc64le-rhel.config | 1 - kernel-s390x-debug-fedora.config | 2 - kernel-s390x-debug-rhel.config | 1 - kernel-s390x-fedora.config | 2 - kernel-s390x-rhel.config | 1 - kernel-s390x-zfcpdump-rhel.config | 1 - kernel-x86_64-debug-fedora.config | 2 - kernel-x86_64-debug-rhel.config | 2 - kernel-x86_64-fedora.config | 2 - kernel-x86_64-rhel.config | 2 - kernel-x86_64-rt-debug-rhel.config | 2 - kernel-x86_64-rt-rhel.config | 2 - kernel.changelog | 16 ++++ kernel.spec | 101 +++++++++++++++++++++++-- mod-extra.list.fedora | 1 - mod-extra.list.rhel | 1 - mod-internal.list | 1 + sources | 6 +- 32 files changed, 116 insertions(+), 51 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1805083e6..165802773 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 13 +RHEL_RELEASE = 15 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c5e65d5fa..72bdcf11d 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -880,7 +880,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 @@ -1712,7 +1711,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 4ba0af216..54e319eaf 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -880,7 +880,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 @@ -1712,7 +1711,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 8b7be587b..31966489b 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -646,7 +646,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 4f735567d..ebebe677f 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -646,7 +646,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 27d9f1ab3..13c224048 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -880,7 +880,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 @@ -1712,7 +1711,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index cda7e39cc..3078f2c01 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -643,7 +643,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1ade4ca77..eb52cdd49 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -880,7 +880,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 @@ -1712,7 +1711,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 34442a970..328c6b073 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -643,7 +643,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 0ed413113..80650c4fe 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -643,7 +643,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 277611a32..386bc715f 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -643,7 +643,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 1b2213b8f..38b95893d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -611,7 +611,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1262,7 +1261,6 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUGGER=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 678181aab..81bf9625f 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -501,7 +501,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 219808e59..058aa7192 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -609,7 +609,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1260,7 +1259,6 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUGGER=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1101b6255..a0b673248 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -501,7 +501,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2f2532fbd..ef8374e91 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -614,7 +614,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1270,7 +1269,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index fdda163af..f437af331 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -500,7 +500,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e8e52dd9d..435959180 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -612,7 +612,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1268,7 +1267,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 0bde976a6..7166b87b5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -500,7 +500,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 5c106cd08..08d135d72 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -502,7 +502,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6978dc453..03ab1dbc0 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -668,7 +668,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1374,7 +1373,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set CONFIG_DEBUG_HIGHMEM=y -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 74ecaae97..c2a08b23e 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -530,7 +530,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -CONFIG_BOOTPARAM_HOTPLUG_CPU0=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1168,7 +1167,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 00ffee636..584f21c04 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -666,7 +666,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1372,7 +1371,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index eb307cc26..0e46f061f 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -530,7 +530,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -CONFIG_BOOTPARAM_HOTPLUG_CPU0=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1168,7 +1167,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index c83629818..be68a7376 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -530,7 +530,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -CONFIG_BOOTPARAM_HOTPLUG_CPU0=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1170,7 +1169,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 7d87aeccc..652bae9f3 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -530,7 +530,6 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -CONFIG_BOOTPARAM_HOTPLUG_CPU0=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y @@ -1170,7 +1169,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y diff --git a/kernel.changelog b/kernel.changelog index a97e3f558..62fbda616 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,19 @@ +* Thu Jan 25 2024 Fedora Kernel Team [6.8.0-0.rc1.6098d87eaf31.15] +- Remove separate license tag for libperf (Justin M. Forbes) +- Don't use upstream bpftool version for Fedora package (Justin M. Forbes) +- Don't ship libperf.a in libperf-devel (Justin M. Forbes) +- add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) +Resolves: + +* Thu Jan 25 2024 Fedora Kernel Team [6.8.0-0.rc1.6098d87eaf31.14] +- redhat/Makefile: fix setup-source and document its caveat (Ondrej Mosnacek) +- redhat/Makefile: fix race condition when making the KABI tarball (Ondrej Mosnacek) +- redhat/Makefile: refactor KABI tarball creation (Ondrej Mosnacek) +- redhat/configs: Remove HOTPLUG_CPU0 configs (Prarit Bhargava) +- gitlab-ci: merge ark-latest before building in MR pipelines (Michael Hofmann) +- Linux v6.8.0-0.rc1.6098d87eaf31 +Resolves: + * Wed Jan 24 2024 Fedora Kernel Team [6.8.0-0.rc1.615d30064886.13] - CI: include aarch64 in CKI container image gating (Tales Aparecida) - redhat: spec: Fix update_scripts run for CentOS builds (Neal Gompa) diff --git a/kernel.spec b/kernel.spec index fa2d1d395..3d01083a9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc1.20240124git615d30064886.13 +%define pkgrelease 0.rc1.20240125git6098d87eaf31.15 %define kversion 6 -%define tarfile_release 6.8-rc1-29-g615d30064886 +%define tarfile_release 6.8-rc1-49-g6098d87eaf31 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240124git615d30064886.13%{?buildid}%{?dist} +%define specrelease 0.rc1.20240125git6098d87eaf31.15%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -224,6 +224,8 @@ Summary: The Linux kernel %define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1} # perf %define with_perf %{?_without_perf: 0} %{?!_without_perf: 1} +# libperf +%define with_libperf %{?_without_libperf: 0} %{?!_without_libperf: 1} # tools %define with_tools %{?_without_tools: 0} %{?!_without_tools: 1} # bpf tool @@ -300,9 +302,10 @@ Summary: The Linux kernel # no stablelist %define with_kernel_abi_stablelists 0 # Fedora builds these separately -%define with_perf 0 -%define with_tools 0 -%define with_bpftool 0 +%define with_perf 1 +%define with_libperf 1 +%define with_tools 1 +%define with_bpftool 1 # No realtime fedora variants %define with_realtime 0 %define with_arm64_64k 0 @@ -388,6 +391,7 @@ Summary: The Linux kernel %define with_realtime 0 %define with_vdso_install 0 %define with_perf 0 +%define with_libperf 0 %define with_tools 0 %define with_bpftool 0 %define with_kernel_abi_stablelists 0 @@ -402,6 +406,7 @@ Summary: The Linux kernel %define with_base 0 %define with_vdso_install 0 %define with_perf 0 +%define with_libperf 0 %define with_tools 0 %define with_bpftool 0 %define with_kernel_abi_stablelists 0 @@ -417,6 +422,7 @@ Summary: The Linux kernel %define with_debuginfo 0 %define with_vdso_install 0 %define with_perf 0 +%define with_libperf 0 %define with_tools 0 %define with_bpftool 0 %define with_kernel_abi_stablelists 0 @@ -480,6 +486,7 @@ Summary: The Linux kernel %define with_cross_headers 0 %define with_tools 0 %define with_perf 0 +%define with_libperf 0 %define with_bpftool 0 %define with_selftests 0 %define with_debug 0 @@ -572,6 +579,7 @@ Summary: The Linux kernel %define with_debuginfo 0 %define with_perf 0 +%define with_libperf 0 %define with_tools 0 %define with_bpftool 0 %define with_selftests 0 @@ -1124,6 +1132,21 @@ This package provides debug information for the perf python bindings. # with_perf %endif +%if %{with_libperf} +%package -n libperf +Summary: The perf library from kernel source +%description -n libperf +This package contains the kernel source perf library. + +%package -n libperf-devel +Summary: Developement files for the perf library from kernel source +%description -n libperf-devel +This package includes libraries and header files needed for development +of applications which use perf library from kernel source. + +# with_libperf +%endif + %if %{with_tools} %package -n %{package_name}-tools Summary: Assortment of tools for the Linux kernel @@ -1202,7 +1225,14 @@ analysing the logical and timing behavior of Linux. %if %{with_bpftool} +%if 0%{?fedora} +# bpftoolverion doesn't bump with stable updates so let's stick with +# upstream kernel version for the package name. We still get correct +# output with bpftool -V. +%define bpftoolversion %specrpmversion +%else %define bpftoolversion 7.4.0 +%endif %package -n bpftool Summary: Inspection and simple manipulation of eBPF programs and maps @@ -2728,6 +2758,12 @@ chmod +x tools/perf/check-headers.sh %{perf_make} DESTDIR=$RPM_BUILD_ROOT all %endif +%if %{with_libperf} +%global libperf_make \ + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/lib/perf V=1 +%{libperf_make} DESTDIR=$RPM_BUILD_ROOT +%endif + %global tools_make \ CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{make} %{?make_opts} @@ -3009,6 +3045,12 @@ mkdir -p %{buildroot}/%{_mandir}/man1 rm -rf %{buildroot}%{_libdir}/traceevent %endif +%if %{with_libperf} +%{libperf_make} DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} install install_headers +# This is installed on some arches and we don't want to ship it +rm -rf %{buildroot}%{_libdir}/libperf.a +%endif + %if %{with_tools} %ifarch %{cpupowerarchs} %{make} -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install @@ -3494,6 +3536,37 @@ fi\ # with_perf %endif +%if %{with_libperf} +%files -n libperf +%{_libdir}/libperf.so.0 +%{_libdir}/libperf.so.0.0.1 + +%files -n libperf-devel +%{_libdir}/libperf.so +%{_libdir}/pkgconfig/libperf.pc +%{_includedir}/internal/*.h +%{_includedir}/perf/bpf_perf.h +%{_includedir}/perf/core.h +%{_includedir}/perf/cpumap.h +%{_includedir}/perf/perf_dlfilter.h +%{_includedir}/perf/event.h +%{_includedir}/perf/evlist.h +%{_includedir}/perf/evsel.h +%{_includedir}/perf/mmap.h +%{_includedir}/perf/threadmap.h +%{_mandir}/man3/libperf.3.gz +%{_mandir}/man7/libperf-counting.7.gz +%{_mandir}/man7/libperf-sampling.7.gz +%{_docdir}/libperf/examples/sampling.c +%{_docdir}/libperf/examples/counting.c +%{_docdir}/libperf/html/libperf.html +%{_docdir}/libperf/html/libperf-counting.html +%{_docdir}/libperf/html/libperf-sampling.html + +# with_libperf +%endif + + %if %{with_tools} %ifnarch %{cpupowerarchs} %files -n %{package_name}-tools @@ -3543,6 +3616,8 @@ fi\ %files -n %{package_name}-tools-libs-devel %{_libdir}/libcpupower.so %{_includedir}/cpufreq.h +%{_includedir}/cpuidle.h +%{_includedir}/powercap.h %endif %files -n rtla @@ -3768,6 +3843,20 @@ fi\ # # %changelog +* Thu Jan 25 2024 Fedora Kernel Team [6.8.0-0.rc1.6098d87eaf31.15] +- Remove separate license tag for libperf (Justin M. Forbes) +- Don't use upstream bpftool version for Fedora package (Justin M. Forbes) +- Don't ship libperf.a in libperf-devel (Justin M. Forbes) +- add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) + +* Thu Jan 25 2024 Fedora Kernel Team [6.8.0-0.rc1.6098d87eaf31.14] +- redhat/Makefile: fix setup-source and document its caveat (Ondrej Mosnacek) +- redhat/Makefile: fix race condition when making the KABI tarball (Ondrej Mosnacek) +- redhat/Makefile: refactor KABI tarball creation (Ondrej Mosnacek) +- redhat/configs: Remove HOTPLUG_CPU0 configs (Prarit Bhargava) +- gitlab-ci: merge ark-latest before building in MR pipelines (Michael Hofmann) +- Linux v6.8.0-0.rc1.6098d87eaf31 + * Wed Jan 24 2024 Fedora Kernel Team [6.8.0-0.rc1.615d30064886.13] - CI: include aarch64 in CKI container image gating (Tales Aparecida) - redhat: spec: Fix update_scripts run for CentOS builds (Neal Gompa) diff --git a/mod-extra.list.fedora b/mod-extra.list.fedora index 9e2e1b11c..327c7fea1 100644 --- a/mod-extra.list.fedora +++ b/mod-extra.list.fedora @@ -196,6 +196,5 @@ wanrouter.ko warrior.ko whci.ko wire.ko -wwan_hwsim.ko yam.ko zhenhua.ko diff --git a/mod-extra.list.rhel b/mod-extra.list.rhel index b70a00823..27be547ba 100644 --- a/mod-extra.list.rhel +++ b/mod-extra.list.rhel @@ -257,7 +257,6 @@ wanrouter.ko warrior.ko whci.ko wire.ko -wwan_hwsim.ko xt_addrtype.ko xt_AUDIT.ko xt_bpf.ko diff --git a/mod-internal.list b/mod-internal.list index 364e652e8..5a473b1d8 100644 --- a/mod-internal.list +++ b/mod-internal.list @@ -96,3 +96,4 @@ test_sort test_vmalloc time_test torture +wwan_hwsim diff --git a/sources b/sources index 0a3419954..804cd4c73 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.8-rc1-29-g615d30064886.tar.xz) = eab9bbeebaf82000e53e564f2fdc745e1831e071b3998478f043b2bd37659c3251e16e732836bf16d2b71d46b8a3adb035e3b8e5ce33d0ff7d6c8f341267a72b -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = dd8aed630808e7602001294d52c1ae2eb63a5a6aab63d20889afcf30202a83d90c8684dacc6e151dc093832444d9b90998b7eb2805b016687d443c797e3f3104 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 05598cc6323673a054796a0f579a5094e8447076f4df9c9dcf9bd323bef58bc8c97c110edc023fff0e18d2747962d21ce7db35a10554ee881a468f33a91de649 +SHA512 (linux-6.8-rc1-49-g6098d87eaf31.tar.xz) = bb7235d8d576ce1c576ca5734b0cd0de0138182673881c23e96dde5dc646f819fcb3c0fc9b2b70d3098e4dd552c9a80f9d5115282914ff88f07e0cd04d39783a +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = fbcadabe79b40915ccf50bfd30398a07997b9fbaaaa53f0856933e9afebb5e835859d69183cb2714793fd88b6e8270ef2340721b316ad3735bcd71ead54fe4dc +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = a67d610860bb2fd4507c2b899d3efcb024529c09f96feb4b749960eca5d55381af1d6303bf251e41b6f8d5263729631911c3407e8321ecf873f0f300503c45c4