diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 7638934..dee8758 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -85,7 +85,7 @@ done ) # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_HASH CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES CONFIG_DEBUG_INFO_BTF_MODULES +%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_HASH CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES CONFIG_DEBUG_INFO_BTF_MODULES CONFIG_PREEMPT_DYNAMIC %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} %define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y") @@ -264,6 +264,13 @@ BuildArch: i686 %endif %endif +%if %build_default +%if "%CONFIG_PREEMPT_DYNAMIC" == "y" +Provides: kernel-preempt = %version-%release +Provides: kernel-preempt_%_target_cpu = %version-%source_rel +%endif +%endif + # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. # Usage: obsolete_kmp @@ -1185,6 +1192,12 @@ Supplements: packageand(product(Leap):%{name}_%_target_cpu) %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif +%if %build_default +%if "%CONFIG_PREEMPT_DYNAMIC" == "y" +Provides: kernel-preempt-extra = %version-%release +Provides: kernel-preempt-extra_%_target_cpu = %version-%source_rel +%endif +%endif %description extra @DESCRIPTION@ @@ -1248,6 +1261,12 @@ Supplements: packageand(product(Leap):%{name}_%_target_cpu) %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif +%if %build_default +%if "%CONFIG_PREEMPT_DYNAMIC" == "y" +Provides: kernel-preempt-optional = %version-%release +Provides: kernel-preempt-optional_%_target_cpu = %version-%source_rel +%endif +%endif %description optional @DESCRIPTION@ @@ -1342,6 +1361,11 @@ Supplements: packageand(%name:kernel-source-vanilla) %if "%CONFIG_DEBUG_INFO_BTF_MODULES" == "y" Requires: dwarves >= 1.22 %endif +%if %build_default +%if "%CONFIG_PREEMPT_DYNAMIC" == "y" +Provides: kernel-preempt-devel = %version-%release +%endif +%endif @PROVIDES_OBSOLETES_DEVEL@ %obsolete_rebuilds %name-devel PreReq: coreutils @@ -1433,6 +1457,11 @@ Provides: multiversion(kernel) # tell weak-modules2 to ignore this package Provides: kmp_in_kernel Requires(post): suse-module-tools >= 12.4 +%if %build_default +%if "%CONFIG_PREEMPT_DYNAMIC" == "y" +Provides: @KMP_NAME@-preempt = %version-%release +%endif +%endif Enhances: %name Supplements: packageand(%name:%@KMP_NAME@-%build_flavor) @KMP_DEPS@