diff --git a/kernel.changelog b/kernel.changelog index 9859d09..eab86b7 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Tue Sep 10 2024 Neal Gompa [6.10.9-0.hs2] +- redhat/kernel: disable perl support in perf for Hyperscale Facebook (Davide Cavalca) +Resolves: + * Mon Sep 09 2024 Neal Gompa [6.10.9-0.hs1] - sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3 (Jan Stancek) - sign-file,extract-cert: avoid using deprecated ERR_get_error_line() (Jan Stancek) diff --git a/kernel.spec b/kernel.spec index 3210bd4..91c1fe5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,19 +159,19 @@ Summary: The Linux kernel # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%define buildid 1 +%define buildid 2 %define specrpmversion 6.10.9 %define specversion 6.10.9 %define patchversion 6.10 -%define pkgrelease 0.hs1 +%define pkgrelease 0.hs2 %define kversion 6 -%define tarfile_release 6.10.9-0.hs1.el10 +%define tarfile_release 6.10.9-0.hs2.el10 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 0.hs%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.10.9-0.hs1.el10 +%define kabiversion 6.10.9-0.hs2.el10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -685,7 +685,10 @@ BuildRequires: xmlto, asciidoc, python3-sphinx, python3-sphinx_rtd_theme BuildRequires: sparse %endif %if %{with_perf} -BuildRequires: zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison flex xz-devel +BuildRequires: zlib-devel binutils-devel newt-devel bison flex xz-devel +%if ! 0%{?facebook} +BuildRequires: perl(ExtUtils::Embed) +%endif BuildRequires: audit-libs-devel python3-setuptools BuildRequires: java-devel BuildRequires: libbpf-devel >= 0.6.0-1 @@ -2905,6 +2908,9 @@ fi %ifarch aarch64 %global perf_build_extra_opts CORESIGHT=1 %endif +%if 0%{?facebook} +%global perf_build_extra_opts %{perf_build_extra_opts} NO_LIBPERL=1 +%endif %global perf_make \ %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags} -Wl,-E" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 %{?perf_libbpf_dynamic} LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} @@ -3235,6 +3241,12 @@ mkdir -p %{buildroot}/%{_mandir}/man1 # LIBTRACEEVENT_DYNAMIC=1 above in perf_make macro). Those files should already # ship with libtraceevent package. rm -rf %{buildroot}%{_libdir}/traceevent + +%if 0%{?facebook} +rm %{buildroot}%{_libexecdir}/perf-core/tests/shell/common/check_all_lines_matched.pl +rm %{buildroot}%{_libexecdir}/perf-core/tests/shell/common/check_all_patterns_found.pl +rm %{buildroot}%{_libexecdir}/perf-core/tests/shell/common/check_no_patterns_found.pl +%endif %endif %if %{with_libperf} @@ -4047,6 +4059,9 @@ fi\ # # %changelog +* Tue Sep 10 2024 Neal Gompa [6.10.9-0.hs2] +- redhat/kernel: disable perl support in perf for Hyperscale Facebook (Davide Cavalca) + * Mon Sep 09 2024 Neal Gompa [6.10.9-0.hs1] - sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3 (Jan Stancek) - sign-file,extract-cert: avoid using deprecated ERR_get_error_line() (Jan Stancek) diff --git a/sources b/sources index 6033736..6a293f7 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (kernel-abi-stablelists-6.10.9-0.hs1.el10.tar.xz) = c033fad7f218832778e266d63b12ca435836abd0af4904532a45de9ac7c1d96809908bdb52ff72c98cbd7e2aebe1f19ed8e3e882ec905fdc7f7c2d3faf341c13 -SHA512 (kernel-kabi-dw-6.10.9-0.hs1.el10.tar.xz) = 2c4eb0976ede8708ce71db8b5c11e43da6681ec4a4a81307b41785aadaa0d153f7cd30d3212bb0344494a9c4319eba2f5db0f9ae982dc4fe451d90fddcece274 -SHA512 (linux-6.10.9-0.hs1.el10.tar.xz) = 456095f494f0eafdee899608b3d975bf3be9cf13cbdcb9a5b6eccd93c056acf95d37906602ac08d35e9d9a087d985c84ffd01bafe5746a60ea6b97d09efb486b +SHA512 (kernel-abi-stablelists-6.10.9-0.hs2.el10.tar.xz) = e64ab82b1461938c35aeef1efcbed72e56b4b6e10b82f46bb25bcc78ea41c2ea0d093b2c47a874cb80bc03e4b8af0b766f8ce8636a3bc983361c0d165d42f0f0 +SHA512 (kernel-kabi-dw-6.10.9-0.hs2.el10.tar.xz) = 2c4eb0976ede8708ce71db8b5c11e43da6681ec4a4a81307b41785aadaa0d153f7cd30d3212bb0344494a9c4319eba2f5db0f9ae982dc4fe451d90fddcece274 +SHA512 (linux-6.10.9-0.hs2.el10.tar.xz) = 39378d101cc273d1dbb03be61bd656d2d4fde6062f108b59dd39d128b68713a9026786c18375bbf08a9266c642e55a3cb816026fbb58e02572b79a9c8bef6bc1 SHA512 (fedoraimaca.x509) = e04809394f4472c17e86d7024dee34f03fb68e82a85502fd5b00535202c72e57626a8376b2cf991b7e1e46404aa5ab8d189ebf320e0dd37d49e7efbc925c7a2e SHA512 (nvidiagpuoot001.x509) = b42f836e1cfa07890cb6ca13de9c3950e306c9ec7686c4c09f050bb68869f5d82962b2cd5f3aa0eb7a0f3a3ae54e9c480eafbac5df53aa92c295ff511a8c59fe SHA512 (rheldup3.x509) = ebf56d821acb5c17bb1842a8ddc8f1014a9e112ef7569531eedbabc82c6b5740e2709f96c5ebc87ba837e8085d0b090a9e63ddd06507692b41dae54a2b48d21b