diff options
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 71 |
1 files changed, 68 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index f4cfbd895..dbc4fc500 100755 --- a/kernel.spec +++ b/kernel.spec @@ -128,13 +128,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc4.20220628git941e3e791269.34 +%define pkgrelease 0.rc4.20220630gitd9b2ba67917c.35 %define kversion 5 -%define tarfile_release 5.19-rc4-14-g941e3e791269 +%define tarfile_release 5.19-rc4-36-gd9b2ba67917c # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220628git941e3e791269.34%{?buildid}%{?dist} +%define specrelease 0.rc4.20220630gitd9b2ba67917c.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.0 @@ -819,6 +819,7 @@ Source81: process_configs.sh Source82: update_scripts.sh Source84: mod-internal.list +Source85: mod-partner.list Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -1283,10 +1284,34 @@ Requires: kernel-core-uname-r = %{KVERREL}\ %{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ %if %{-m:0}%{!-m:1}\ %{expand:%%kernel_modules_internal_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ +%if 0%{!?fedora:1}\ +%{expand:%%kernel_modules_partner_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ +%endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ %{nil} +# +# This macro creates a kernel-<subpackage>-modules-partner package. +# %%kernel_modules_partner_package <subpackage> <pretty-name> +# +%define kernel_modules_partner_package() \ +%package %{?1:%{1}-}modules-partner\ +Summary: Extra kernel modules to match the %{?2:%{2} }kernel\ +Group: System Environment/Kernel\ +Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{version}-%{release}\ +Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ +Provides: kernel%{?1:-%{1}}-modules-partner = %{version}-%{release}%{?1:+%{1}}\ +Provides: installonlypkg(kernel-module)\ +Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ +AutoReq: no\ +AutoProv: yes\ +%description %{?1:%{1}-}modules-partner\ +This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat partners usage.\ +%{nil} + # Now, each variant package. %if %{with_pae} @@ -2045,6 +2070,10 @@ BuildKernel() { %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list) # Identify modules in the kernel-modules-extras package %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal +%if 0%{!?fedora:1} + # Identify modules in the kernel-modules-partner package + %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner +%endif # # Generate the kernel-core and kernel-modules files lists @@ -2062,6 +2091,10 @@ BuildKernel() { xargs rm -rf < mod-extra.list # don't include anything going int kernel-modules-internal in the file lists xargs rm -rf < mod-internal.list +%if 0%{!?fedora:1} + # don't include anything going int kernel-modules-partner in the file lists + xargs rm -rf < mod-partner.list +%endif if [ $DoModules -eq 1 ]; then # Find all the module files and filter them out into the core and @@ -2117,6 +2150,9 @@ BuildKernel() { sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-core.list sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-extra.list >> ../kernel${Variant:+-${Variant}}-modules-extra.list sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-internal.list >> ../kernel${Variant:+-${Variant}}-modules-internal.list +%if 0%{!?fedora:1} + sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-partner.list >> ../kernel${Variant:+-${Variant}}-modules-partner.list +%endif # Cleanup rm -f $RPM_BUILD_ROOT/k-d.list @@ -2124,6 +2160,9 @@ BuildKernel() { rm -f $RPM_BUILD_ROOT/module-dirs.list rm -f $RPM_BUILD_ROOT/mod-extra.list rm -f $RPM_BUILD_ROOT/mod-internal.list +%if 0%{!?fedora:1} + rm -f $RPM_BUILD_ROOT/mod-partner.list +%endif %if %{signmodules} if [ $DoModules -eq 1 ]; then @@ -2707,6 +2746,19 @@ fi\ %{nil} # +# This macro defines a %%post script for a kernel*-modules-partner package. +# It also defines a %%postun script that does the same thing. +# %%kernel_modules_partner_post [<subpackage>] +# +%define kernel_modules_partner_post() \ +%{expand:%%post %{?1:%{1}-}modules-partner}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}modules-partner}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil} + +# # This macro defines a %%post script for a kernel*-modules package. # It also defines a %%postun script that does the same thing. # %%kernel_modules_post [<subpackage>] @@ -2756,6 +2808,9 @@ rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{ %{expand:%%kernel_modules_post %{?-v*}}\ %{expand:%%kernel_modules_extra_post %{?-v*}}\ %{expand:%%kernel_modules_internal_post %{?-v*}}\ +%if 0%{!?fedora:1}\ +%{expand:%%kernel_modules_partner_post %{?-v*}}\ +%endif\ %{expand:%%kernel_variant_posttrans %{?-v*}}\ %{expand:%%post %{?-v*:%{-v*}-}core}\ %{-r:\ @@ -3008,6 +3063,9 @@ fi %{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\ %config(noreplace) /etc/modprobe.d/*-blacklist.conf\ %{expand:%%files -f kernel-%{?3:%{3}-}modules-internal.list %{?3:%{3}-}modules-internal}\ +%if 0%{!?fedora:1}\ +%{expand:%%files -f kernel-%{?3:%{3}-}modules-partner.list %{?3:%{3}-}modules-partner}\ +%endif\ %if %{with_debuginfo}\ %ifnarch noarch\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ @@ -3050,6 +3108,13 @@ fi # # %changelog +* Thu Jun 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc4.d9b2ba67917c.34] +- redhat/Makefile: Deprecate BUILD_SCRATCH_TARGET (Prarit Bhargava) +- redhat: enable CONFIG_DEVTMPFS_SAFE (Mark Langsdorf) +- redhat/Makefile: Remove deprecated variables and targets (Prarit Bhargava) +- Split partner modules into a sub-package (Alice Mitchell) +- Enable kAFS and it's dependancies in RHEL (Alice Mitchell) + * Tue Jun 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc4.941e3e791269.33] - Enable Marvell OcteonTX2 crypto device in ARK (Vladis Dronov) - redhat/Makefile: Remove --scratch from BUILD_TARGET (Prarit Bhargava) |