Sync from SUSE:SLFO:Main kernel-source revision 4acf3239978bf545ff3db27333774d0f

This commit is contained in:
Adrian Schröter 2024-09-06 15:27:23 +02:00
parent 0cfe33dd2d
commit 7e7d72b3c9
36 changed files with 53214 additions and 46 deletions

View File

@ -15,6 +15,7 @@ declare -a IGNORED_CONFIGS_RE=(
'CC_VERSION_TEXT' 'CC_VERSION_TEXT'
'DYNAMIC_SIGFRAME' 'DYNAMIC_SIGFRAME'
'FTRACE_MCOUNT_USE_[A-Z_]*' 'FTRACE_MCOUNT_USE_[A-Z_]*'
'GCC_ASM_GOTO_OUTPUT_BROKEN'
'GCC_ASM_GOTO_OUTPUT_WORKAROUND' 'GCC_ASM_GOTO_OUTPUT_WORKAROUND'
'GCC_VERSION' 'GCC_VERSION'
'G*CC[0-9]*_NO_[A-Z_]*' 'G*CC[0-9]*_NO_[A-Z_]*'

View File

@ -24,3 +24,5 @@ SUPPORTED_MODULES_CHECK=Yes
BUILD_HTML=Yes BUILD_HTML=Yes
# build documentation in PDF format # build documentation in PDF format
BUILD_PDF=No BUILD_PDF=No
# Generate compile_commands.json
GENERATE_COMPILE_COMMANDS=Yes

BIN
config.tar.bz2 (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@
Name: dtb-aarch64 Name: dtb-aarch64
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif

View File

@ -1,7 +1,7 @@
#!/usr/bin/perl #!/usr/bin/perl
use File::Spec; use File::Spec;
use Getopt::Long; use Getopt::Long qw(:config no_ignore_case);
use strict; use strict;
&main(); &main();

4
guards
View File

@ -26,7 +26,7 @@
# #
use FileHandle; use FileHandle;
use Getopt::Long; use Getopt::Long qw(:config no_ignore_case);
use strict; use strict;
# Prototypes # Prototypes
@ -205,7 +205,7 @@ if ($check) {
# This is not an error if the entries are mutually exclusive... # This is not an error if the entries are mutually exclusive...
} }
} }
exit $problems ? 1 : 0; exit ($problems ? 1 : 0);
} elsif ($list) { } elsif ($list) {
parse($fh, sub { parse($fh, sub {

View File

@ -2,7 +2,7 @@
use strict; use strict;
use warnings; use warnings;
use Getopt::Long; use Getopt::Long qw(:config no_ignore_case);
use Data::Dumper; use Data::Dumper;
# ( { sym => regexp, mod => regexp, fail => 0/1 }, ... ) # ( { sym => regexp, mod => regexp, fail => 0/1 }, ... )

BIN
kabi.tar.bz2 (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%define compress_modules zstd %define compress_modules zstd
%define compress_vmlinux xz %define compress_vmlinux xz
@ -30,6 +30,7 @@
%define split_optional 0 %define split_optional 0
%define supported_modules_check 1 %define supported_modules_check 1
%define build_flavor 64kb %define build_flavor 64kb
%define generate_compile_commands 1
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -38,7 +39,7 @@
Name: kernel-64kb Name: kernel-64kb
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif
@ -133,7 +134,7 @@ ExclusiveArch: do_not_build
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -vc ^PTF) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") )
%define klp_symbols 1 %define klp_symbols 1
%endif %endif
@ -808,6 +809,9 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/li
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list %exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list
%if %generate_compile_commands
%exclude %obj_install_dir/%cpu_arch_flavor/compile_commands.json
%endif
%if "%kmp_target_cpu" != "%cpu_arch" %if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu /usr/src/linux-obj/%kmp_target_cpu
@ -1467,6 +1471,11 @@ done
# Generate list of symbols that are used to create kernel livepatches # Generate list of symbols that are used to create kernel livepatches
%if 0%{?klp_symbols} %if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list %_sourcedir/klp-symbols . Symbols.list
%if %generate_compile_commands
# Generate compile_commands.json
make compile_commands.json
%endif
%endif %endif
%install %install
@ -1660,6 +1669,11 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %generate_compile_commands
cp compile_commands.json %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/compile_commands.json >> %my_builddir/livepatch-files.no_dir
%endif
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y" %if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor

View File

@ -30,6 +30,7 @@
%define split_optional @SPLIT_OPTIONAL@ %define split_optional @SPLIT_OPTIONAL@
%define supported_modules_check @SUPPORTED_MODULES_CHECK@ %define supported_modules_check @SUPPORTED_MODULES_CHECK@
%define build_flavor @FLAVOR@ %define build_flavor @FLAVOR@
%define generate_compile_commands @GENERATE_COMPILE_COMMANDS@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -133,7 +134,7 @@ ExclusiveArch: do_not_build
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -vc ^PTF) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") )
%define klp_symbols 1 %define klp_symbols 1
%endif %endif
@ -614,6 +615,9 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/li
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list %exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list
%if %generate_compile_commands
%exclude %obj_install_dir/%cpu_arch_flavor/compile_commands.json
%endif
%if "%kmp_target_cpu" != "%cpu_arch" %if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu /usr/src/linux-obj/%kmp_target_cpu
@ -991,6 +995,11 @@ done
# Generate list of symbols that are used to create kernel livepatches # Generate list of symbols that are used to create kernel livepatches
%if 0%{?klp_symbols} %if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list %_sourcedir/klp-symbols . Symbols.list
%if %generate_compile_commands
# Generate compile_commands.json
make compile_commands.json
%endif
%endif %endif
%install %install
@ -1184,6 +1193,11 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %generate_compile_commands
cp compile_commands.json %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/compile_commands.json >> %my_builddir/livepatch-files.no_dir
%endif
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y" %if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%define compress_modules zstd %define compress_modules zstd
%define compress_vmlinux xz %define compress_vmlinux xz
@ -30,6 +30,7 @@
%define split_optional 0 %define split_optional 0
%define supported_modules_check 1 %define supported_modules_check 1
%define build_flavor debug %define build_flavor debug
%define generate_compile_commands 1
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -38,7 +39,7 @@
Name: kernel-debug Name: kernel-debug
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif
@ -133,7 +134,7 @@ ExclusiveArch: do_not_build
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -vc ^PTF) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") )
%define klp_symbols 1 %define klp_symbols 1
%endif %endif
@ -800,6 +801,9 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/li
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list %exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list
%if %generate_compile_commands
%exclude %obj_install_dir/%cpu_arch_flavor/compile_commands.json
%endif
%if "%kmp_target_cpu" != "%cpu_arch" %if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu /usr/src/linux-obj/%kmp_target_cpu
@ -1459,6 +1463,11 @@ done
# Generate list of symbols that are used to create kernel livepatches # Generate list of symbols that are used to create kernel livepatches
%if 0%{?klp_symbols} %if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list %_sourcedir/klp-symbols . Symbols.list
%if %generate_compile_commands
# Generate compile_commands.json
make compile_commands.json
%endif
%endif %endif
%install %install
@ -1652,6 +1661,11 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %generate_compile_commands
cp compile_commands.json %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/compile_commands.json >> %my_builddir/livepatch-files.no_dir
%endif
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y" %if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%define compress_modules zstd %define compress_modules zstd
%define compress_vmlinux xz %define compress_vmlinux xz
@ -30,6 +30,7 @@
%define split_optional 0 %define split_optional 0
%define supported_modules_check 1 %define supported_modules_check 1
%define build_flavor default %define build_flavor default
%define generate_compile_commands 1
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -38,7 +39,7 @@
Name: kernel-default Name: kernel-default
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif
@ -133,7 +134,7 @@ ExclusiveArch: do_not_build
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -vc ^PTF) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") )
%define klp_symbols 1 %define klp_symbols 1
%endif %endif
@ -892,6 +893,9 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/li
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list %exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list
%if %generate_compile_commands
%exclude %obj_install_dir/%cpu_arch_flavor/compile_commands.json
%endif
%if "%kmp_target_cpu" != "%cpu_arch" %if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu /usr/src/linux-obj/%kmp_target_cpu
@ -1551,6 +1555,11 @@ done
# Generate list of symbols that are used to create kernel livepatches # Generate list of symbols that are used to create kernel livepatches
%if 0%{?klp_symbols} %if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list %_sourcedir/klp-symbols . Symbols.list
%if %generate_compile_commands
# Generate compile_commands.json
make compile_commands.json
%endif
%endif %endif
%install %install
@ -1744,6 +1753,11 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %generate_compile_commands
cp compile_commands.json %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/compile_commands.json >> %my_builddir/livepatch-files.no_dir
%endif
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y" %if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%define build_html 1 %define build_html 1
%define build_pdf 0 %define build_pdf 0
@ -30,7 +30,7 @@
Name: kernel-docs Name: kernel-docs
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%define compress_modules zstd %define compress_modules zstd
%define compress_vmlinux xz %define compress_vmlinux xz
@ -30,6 +30,7 @@
%define split_optional 0 %define split_optional 0
%define supported_modules_check 1 %define supported_modules_check 1
%define build_flavor kvmsmall %define build_flavor kvmsmall
%define generate_compile_commands 1
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -38,7 +39,7 @@
Name: kernel-kvmsmall Name: kernel-kvmsmall
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif
@ -133,7 +134,7 @@ ExclusiveArch: do_not_build
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -vc ^PTF) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") )
%define klp_symbols 1 %define klp_symbols 1
%endif %endif
@ -824,6 +825,9 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/li
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list %exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list
%if %generate_compile_commands
%exclude %obj_install_dir/%cpu_arch_flavor/compile_commands.json
%endif
%if "%kmp_target_cpu" != "%cpu_arch" %if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu /usr/src/linux-obj/%kmp_target_cpu
@ -1483,6 +1487,11 @@ done
# Generate list of symbols that are used to create kernel livepatches # Generate list of symbols that are used to create kernel livepatches
%if 0%{?klp_symbols} %if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list %_sourcedir/klp-symbols . Symbols.list
%if %generate_compile_commands
# Generate compile_commands.json
make compile_commands.json
%endif
%endif %endif
%install %install
@ -1676,6 +1685,11 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %generate_compile_commands
cp compile_commands.json %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/compile_commands.json >> %my_builddir/livepatch-files.no_dir
%endif
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y" %if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,7 @@
%endif %endif
%endif %endif
%endif %endif
%global kernel_package kernel%kernel_flavor-srchash-b5f2243bd49b259f60713572120569056508d89f %global kernel_package kernel%kernel_flavor-srchash-6524e29997232b714e07a3528b494f81d5398a10
%endif %endif
%if 0%{?rhel_version} %if 0%{?rhel_version}
%global kernel_package kernel %global kernel_package kernel
@ -47,7 +47,7 @@
Name: kernel-obs-build Name: kernel-obs-build
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif

File diff suppressed because it is too large Load Diff

View File

@ -25,7 +25,7 @@
Name: kernel-obs-qa Name: kernel-obs-qa
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -28,7 +28,7 @@
Name: kernel-source Name: kernel-source
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif

File diff suppressed because it is too large Load Diff

View File

@ -16,7 +16,7 @@
# #
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -25,7 +25,7 @@ Name: kernel-syms
Version: 6.4.0 Version: 6.4.0
%if %using_buildservice %if %using_buildservice
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@
%define srcversion 6.4 %define srcversion 6.4
%define patchversion 6.4.0 %define patchversion 6.4.0
%define git_commit b5f2243bd49b259f60713572120569056508d89f %define git_commit 6524e29997232b714e07a3528b494f81d5398a10
%define variant %{nil} %define variant %{nil}
%define compress_modules zstd %define compress_modules zstd
%define compress_vmlinux xz %define compress_vmlinux xz
@ -30,6 +30,7 @@
%define split_optional 0 %define split_optional 0
%define supported_modules_check 1 %define supported_modules_check 1
%define build_flavor zfcpdump %define build_flavor zfcpdump
%define generate_compile_commands 1
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -38,7 +39,7 @@
Name: kernel-zfcpdump Name: kernel-zfcpdump
Version: 6.4.0 Version: 6.4.0
%if 0%{?is_kotd} %if 0%{?is_kotd}
Release: <RELEASE>.gb5f2243 Release: <RELEASE>.g6524e29
%else %else
Release: 0 Release: 0
%endif %endif
@ -133,7 +134,7 @@ ExclusiveArch: do_not_build
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
%if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -v ^PTF | grep -vc openSUSE) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") ) %if 0%{?_project:1} && ( %(echo %_project | grep -Ex -f %_sourcedir/release-projects | grep -vc ^PTF) || %(echo %_project | grep -Ec "^(Devel:)?Kernel:") )
%define klp_symbols 1 %define klp_symbols 1
%endif %endif
@ -808,6 +809,9 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/li
%dir /usr/src/linux-obj/%cpu_arch %dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor %ghost /usr/src/linux-obj/%cpu_arch_flavor
%exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list %exclude %obj_install_dir/%cpu_arch_flavor/Symbols.list
%if %generate_compile_commands
%exclude %obj_install_dir/%cpu_arch_flavor/compile_commands.json
%endif
%if "%kmp_target_cpu" != "%cpu_arch" %if "%kmp_target_cpu" != "%cpu_arch"
%obj_install_dir/%kmp_target_cpu %obj_install_dir/%kmp_target_cpu
/usr/src/linux-obj/%kmp_target_cpu /usr/src/linux-obj/%kmp_target_cpu
@ -1467,6 +1471,11 @@ done
# Generate list of symbols that are used to create kernel livepatches # Generate list of symbols that are used to create kernel livepatches
%if 0%{?klp_symbols} %if 0%{?klp_symbols}
%_sourcedir/klp-symbols . Symbols.list %_sourcedir/klp-symbols . Symbols.list
%if %generate_compile_commands
# Generate compile_commands.json
make compile_commands.json
%endif
%endif %endif
%install %install
@ -1660,6 +1669,11 @@ if [ %CONFIG_MODULES = y ]; then
cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor cp Symbols.list %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir echo %obj_install_dir/%cpu_arch/%build_flavor/Symbols.list > %my_builddir/livepatch-files.no_dir
%if %generate_compile_commands
cp compile_commands.json %rpm_install_dir/%cpu_arch/%build_flavor
echo %obj_install_dir/%cpu_arch/%build_flavor/compile_commands.json >> %my_builddir/livepatch-files.no_dir
%endif
%if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y" %if "%CONFIG_LIVEPATCH_IPA_CLONES" == "y"
find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list find %kernel_build_dir -name "*.ipa-clones" ! -size 0 | sed -e 's|^%kernel_build_dir/||' | sort > ipa-clones.list
cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor cp ipa-clones.list %rpm_install_dir/%cpu_arch/%build_flavor

4
mkspec
View File

@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use File::Copy; use File::Copy;
use Getopt::Long; use Getopt::Long qw(:config no_ignore_case);
my $dir = "."; my $dir = ".";
my $rpmrelease; my $rpmrelease;
@ -64,6 +64,7 @@ my $split_optional = to_bool $vars{'SPLIT_OPTIONAL'};
my $supported_modules_check = to_bool $vars{'SUPPORTED_MODULES_CHECK'}; my $supported_modules_check = to_bool $vars{'SUPPORTED_MODULES_CHECK'};
my $build_pdf = to_bool $vars{'BUILD_PDF'}; my $build_pdf = to_bool $vars{'BUILD_PDF'};
my $build_html = to_bool $vars{'BUILD_HTML'}; my $build_html = to_bool $vars{'BUILD_HTML'};
my $generate_compile_commands = to_bool $vars{'GENERATE_COMPILE_COMMANDS'};
if (!defined ($rpmrelease)) { if (!defined ($rpmrelease)) {
$rpmrelease = $vars{'RELEASE'} || 0; $rpmrelease = $vars{'RELEASE'} || 0;
@ -140,6 +141,7 @@ my %macros = (
YEAR => (localtime time)[5] + 1900, YEAR => (localtime time)[5] + 1900,
COMPRESS_MODULES => $compress_modules, COMPRESS_MODULES => $compress_modules,
COMPRESS_VMLINUX => $compress_vmlinux, COMPRESS_VMLINUX => $compress_vmlinux,
GENERATE_COMPILE_COMMANDS => $generate_compile_commands,
); );
# binary spec files # binary spec files

View File

@ -3,7 +3,7 @@
use File::Basename; use File::Basename;
use File::Path; use File::Path;
use File::Find; use File::Find;
use Getopt::Long; use Getopt::Long qw(:config no_ignore_case);
use strict; use strict;
my %symbol_type_name = ( my %symbol_type_name = (

BIN
patches.kabi.tar.bz2 (Stored with Git LFS)

Binary file not shown.

BIN
patches.suse.tar.bz2 (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
2024-07-30 06:41:56 +0000 2024-09-03 11:36:54 +0000
GIT Revision: b5f2243bd49b259f60713572120569056508d89f GIT Revision: 6524e29997232b714e07a3528b494f81d5398a10
GIT Branch: ALP-current GIT Branch: ALP-current