rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Add weak-modules packaging back for not-Fedora

Browse Source 
The weak-module scripts are used in EL, but have been problematic for
Fedora, so only include them if the build target isn't Fedora.

Signed-off-by: Jeremy Cline <jcline@redhat.com>
This commit is contained in:
Jeremy Cline 2020-03-12 11:41:51 -04:00
parent fc7e20c59e
commit 2027ad30fb
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel.spec
View File

@ -1883,6 +1883,9 @@ BuildKernel() {
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/internal mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/internal
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
%if 0%{!?fedora:1}
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates
%endif
# CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of
# testing so just delete # testing so just delete
find . -name *.h.s -delete find . -name *.h.s -delete
@ -2677,6 +2680,12 @@ fi\
# #
%define kernel_variant_posttrans() \ %define kernel_variant_posttrans() \
%{expand:%%posttrans %{?1:%{1}-}core}\ %{expand:%%posttrans %{?1:%{1}-}core}\
%if 0%{!?fedora:1}\
if [ -x %{_sbindir}/weak-modules ]\
then\
%{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
fi\
%endif\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%{nil} %{nil}
@ -2706,6 +2715,12 @@ fi}\
%define kernel_variant_preun() \ %define kernel_variant_preun() \
%{expand:%%preun %{?1:%{1}-}core}\ %{expand:%%preun %{?1:%{1}-}core}\
/bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%if 0%{!?fedora:1}\
if [ -x %{_sbindir}/weak-modules ]\
then\
%{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
fi\
%endif\
%{nil} %{nil}
%kernel_variant_preun %kernel_variant_preun
@ -2913,6 +2928,9 @@ fi
/lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/source\
/lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
/lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
%if 0%{!?fedora:1}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
%endif\
%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\
%ifarch s390x ppc64le\ %ifarch s390x ppc64le\
%if 0%{!?4:1}\ %if 0%{!?4:1}\