From fa512072a0c266e5374faa58122c66a4c12996c3 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 30 Jan 2024 20:39:38 +0300 Subject: [PATCH] Disable rt, perf, tools, bpftool, selftests, kabi check --- SPECS/kernel.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 0d63040..bad8c6a 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -197,24 +197,25 @@ Summary: The Linux kernel # 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) -%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1} +%define with_realtime 0 # kernel-doc %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} %define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1} # perf -%define with_perf %{?_without_perf: 0} %{?!_without_perf: 1} +#%%define with_perf %%{?_without_perf: 0} %%{?!_without_perf: 1} +%define with_perf 0 # tools -%define with_tools %{?_without_tools: 0} %{?!_without_tools: 1} +%define with_tools 0 # bpf tool -%define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1} +%define with_bpftool 0 # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-abi-stablelists %define with_kernel_abi_stablelists %{?_without_kernel_abi_stablelists: 0} %{?!_without_kernel_abi_stablelists: 1} # internal samples and selftests -%define with_selftests %{?_without_selftests: 0} %{?!_without_selftests: 1} +%define with_selftests 0 # # Additional options for user-friendly one-off kernel building: # @@ -227,7 +228,7 @@ Summary: The Linux kernel # Only build the realtime kernel (--with rtonly): %define with_rtonly %{?_with_rtonly: 1} %{?!_with_rtonly: 0} # Control whether we perform a compat. check against published ABI. -%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} +%define with_kabichk 0 # Control whether we perform a compat. check against DUP ABI. %define with_kabidupchk %{?_with_kabidupchk: 1} %{?!_with_kabidupchk: 0} # @@ -249,7 +250,7 @@ Summary: The Linux kernel %define with_release %{?_with_release: 1} %{?!_with_release: 0} # verbose build, i.e. no silent rules and V=1 -%define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} +%define with_verbose 0 # # check for mismatched config options @@ -627,7 +628,7 @@ Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ Version: %{specversion} -Release: %{pkg_release}.inferit+fuzzing +Release: %{pkg_release}.inferit.0.fuzzing # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD %if 0%{?fedora} @@ -649,7 +650,8 @@ Provides: installonlypkg(kernel) # BuildRequires: kmod, bash, coreutils, tar, git-core, which BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk -BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ +BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++, gcc-plugin-annobin +#BuildRequires: gcc-toolset-12-gcc, gcc-toolset-12-gcc-c++, gcc-toolset-12-gcc-plugin-annobin BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel @@ -1708,6 +1710,9 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \ Documentation \ scripts/clang-tools +# Is it necessary? +sed -i 's/GCC_VERSION >= 120000/GCC_VERSION >= 110000/' lib/Kconfig.debug + # only deal with configs if we are going to build for the arch %ifnarch %nobuildarches @@ -3723,9 +3728,10 @@ fi # # %changelog -* Mon Jan 29 2024 Arkady L. Shane - 5.14.0-362.18.1.inferit+fuzzing +* Mon Jan 29 2024 Arkady L. Shane - 5.14.0-362.18.1.inferit.0.fuzzing - Enable fuzzing iptions: https://github.com/google/syzkaller/blob/master/docs/linux/kernel_configs.md +- Disable rt, perf, tools, bpftool, selftests, kabi check * Wed Jan 03 2024 Jan Stancek [5.14.0-362.18.1.el9_3] - nfp: fix use-after-free in area_cache_get() (Ricardo Robaina) [RHEL-19456 RHEL-19536 RHEL-6566 RHEL-7241] {CVE-2022-3545}