diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e0fdae4a..ae6229694 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 = 27 +RHEL_RELEASE = 28 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 7e6a507f5..493603978 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2688,7 +2688,7 @@ CONFIG_INPUT_APANEL=m # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BBNSM_PWRKEY is not set +CONFIG_INPUT_BBNSM_PWRKEY=m # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 0af8eb97b..0420616bf 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2672,7 +2672,7 @@ CONFIG_INPUT_APANEL=m # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BBNSM_PWRKEY is not set +CONFIG_INPUT_BBNSM_PWRKEY=m # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 94ff97e98..f1fd27aa9 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2684,7 +2684,7 @@ CONFIG_INPUT_APANEL=m # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BBNSM_PWRKEY is not set +CONFIG_INPUT_BBNSM_PWRKEY=m # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 3eb2f5fa0..dca997c5a 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2668,7 +2668,7 @@ CONFIG_INPUT_APANEL=m # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BBNSM_PWRKEY is not set +CONFIG_INPUT_BBNSM_PWRKEY=m # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index acbef43ad..19bb2d1c9 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2724,7 +2724,7 @@ CONFIG_INPUT_APANEL=m # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BBNSM_PWRKEY is not set +CONFIG_INPUT_BBNSM_PWRKEY=m # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index fd9b7be0f..cc5dafe02 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2708,7 +2708,7 @@ CONFIG_INPUT_APANEL=m # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_ATLAS_BTNS=m # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -# CONFIG_INPUT_BBNSM_PWRKEY is not set +CONFIG_INPUT_BBNSM_PWRKEY=m # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CMA3000 is not set diff --git a/kernel.spec b/kernel.spec index c62257666..e670d3a17 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.6.0 %define specversion 6.6.0 %define patchversion 6.6 -%define pkgrelease 0.rc3.27 +%define pkgrelease 0.rc3.20230927git0e945134b680.28 %define kversion 6 -%define tarfile_release 6.6-rc3 +%define tarfile_release 6.6-rc3-38-g0e945134b680 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.27%{?buildid}%{?dist} +%define specrelease 0.rc3.20230927git0e945134b680.28%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.6.0 @@ -187,9 +187,12 @@ Summary: The Linux kernel # should not be exported to RPM provides %global __provides_exclude_from ^%{_libexecdir}/kselftests -# The following build options are enabled by default, but may become disabled -# by later architecture-specific checks. These can also be disabled by using -# --without in the rpmbuild command, or by forcing these values to 0. +# The following build options are (mostly) enabled by default, but may become +# enabled/disabled by later architecture-specific checks. +# Where disabled by default, they can be enabled by using --with in the +# rpmbuild command, or by forcing these values to 1. +# Where enabled by default, they can be disabled by using --without in +# the rpmbuild command, or by forcing these values to 0. # # standard kernel %define with_up %{?_without_up: 0} %{?!_without_up: 1} @@ -200,7 +203,7 @@ Summary: The Linux kernel # kernel-zfcpdump (s390 specific kernel for zfcpdump) %define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1} # kernel-16k (aarch64 kernel with 16K page_size) -%define with_arm64_16k %{?_without_arm64_16k: 0} %{?!_without_arm64_16k: 1} +%define with_arm64_16k %{?_with_arm64_16k: 1} %{?!_with_arm64_16k: 0} # kernel-64k (aarch64 kernel with 64K page_size) %define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1} # kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel) @@ -300,16 +303,11 @@ Summary: The Linux kernel %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -# selftests turns on bpftool -%define with_selftests 0 # No realtime fedora variants %define with_realtime 0 %define with_arm64_64k 0 %endif -# No arm64-16k flavor for now -%define with_arm64_16k 0 - %if %{with_verbose} %define make_opts V=1 %else @@ -448,9 +446,9 @@ Summary: The Linux kernel %define use_vdso 1 %endif -# selftests require bpftool to be built -%if %{with_selftests} -%define with_bpftool 1 +# selftests require bpftool to be built. If bpftools is disabled, then disable selftests +%if %{with_bpftool} == 0 +%define with_selftests 0 %endif %ifnarch noarch @@ -2719,12 +2717,14 @@ if [ -f $DevelDir/vmlinux.h ]; then RPM_VMLINUX_H=$DevelDir/vmlinux.h fi +%if %{with_bpftool} %global bpftool_make \ %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1 -%if %{with_bpftool} pushd tools/bpf/bpftool %{bpftool_make} popd +%else +echo "bpftools disabled ... disabling selftests" %endif %if %{with_selftests} @@ -3697,6 +3697,17 @@ fi\ # # %changelog +* Wed Sep 27 2023 Fedora Kernel Team [6.6.0-0.rc3.0e945134b680.28] +- kernel.spec: adjust build option comment (Michael Hofmann) +- kernel.spec: allow to enable arm64_16k variant (Michael Hofmann) +- gitlab-ci: enable build-only pipelines for Rawhide/16k/aarch64 (Michael Hofmann) +- kernel.spec.template: Fix --without bpftool (Prarit Bhargava) +- redhat/configs: NXP BBNSM Power Key Driver (Steve Best) +- redhat/self-test: Update data for cross compile fields (Prarit Bhargava) +- redhat/Makefile.cross: Add message for disabled subpackages (Prarit Bhargava) +- redhat/Makefile.cross: Update cross targets with disabled subpackages (Prarit Bhargava) +- Linux v6.6.0-0.rc3.0e945134b680 + * Tue Sep 26 2023 Fedora Kernel Team [6.6.0-0.rc3.27] - Remove XFS_ASSERT_FATAL from pending-fedora (Justin M. Forbes) diff --git a/sources b/sources index 8052d9490..009bea3b2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.6-rc3.tar.xz) = c08e6629d5171b8ffac859de5272054ef6a80a8d77f1622063bbdc49bc6d3dcb580cb26fe285b801a783b314ba07bb9c740b5c2c986c33fece38bd2f539b37bf -SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 801506bd4a85bd245fc7d762fbd6890f03c087f2476263e2000e5a8d1289b4c3182089d3dfcaff0e58655faebb9b831d01f5ae2236c22d109255980dee003cf9 -SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 9f9f9c83fde01573cf2fcf9f3f56c03caa1dc6631abfd5cad50efa50078d40a6c5d1afd0c20b52595ae8ec0da1cc0396254db0b46039fdd7ba1416f9efa7567a +SHA512 (linux-6.6-rc3-38-g0e945134b680.tar.xz) = 7c88cb7a815a0fe6413202eba4acee8d75faa1bdb9c14546e26c46e5e46276bf2b35f5bc09e59cfb0cf5368a11ed0fc7e8e67d3c97baa083ad6aa0bda3d875ed +SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 3116bb25c3831c5ed338b2d0925ad60add2b911287948c07467cd0c46716bda2fbf2071560d1ad68c66835e8b9fb4c07071d3b92f8fee15f18e4a95fcd7a4cc6 +SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 6175e77bcf5d9322c95f47118e1a901a2fb11d853669ed1ae61f8e4d3056ff37f502cf19b382d22902250abcefffcde4318c5ba029765a4688964f5a81ec3b73