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

Fix kernel-uname-r Requires/Provides variant mismatches

Browse Source 
There was some discontinuity between the Requires and Provides with
respect to variant builds. They have to match, or you wind up with variant
builds that can't install w/o forcing them to ignore dependencies.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
This commit is contained in:
Jarod Wilson 2015-03-18 09:17:15 -04:00
parent 6d8ef07aa7
commit a96d89f582
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel.spec
View File

@ -370,8 +370,8 @@ Release: %{pkg_release}
ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le
ExclusiveOS: Linux ExclusiveOS: Linux
%ifnarch %{nobuildarches} %ifnarch %{nobuildarches}
Requires: kernel%{?variant}-core-uname-r = %{KVERREL}%{?variant} Requires: kernel-core-uname-r = %{KVERREL}%{?variant}
Requires: kernel%{?variant}-modules-uname-r = %{KVERREL}%{?variant} Requires: kernel-modules-uname-r = %{KVERREL}%{?variant}
%endif %endif
@ -669,7 +669,7 @@ The kernel meta package
Provides: kernel = %{rpmversion}-%{pkg_release}\ Provides: kernel = %{rpmversion}-%{pkg_release}\
Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\ Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\ Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\ Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\ Requires(pre): %{initrd_prereq}\
Requires(pre): linux-firmware >= 20130724-29.git31f6b30\ Requires(pre): linux-firmware >= 20130724-29.git31f6b30\
@ -841,7 +841,7 @@ Group: System Environment/Kernel\
Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\ Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
Provides: kernel-devel = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-devel = %{version}-%{release}%{?1:+%{1}}\
Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Provides: installonlypkg(kernel)\ Provides: installonlypkg(kernel)\
AutoReqProv: no\ AutoReqProv: no\
Requires(pre): /usr/bin/find\ Requires(pre): /usr/bin/find\
@ -863,9 +863,9 @@ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}
Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\ Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
AutoReq: no\ AutoReq: no\
AutoProv: yes\ AutoProv: yes\
%description -n kernel%{?variant}%{?1:-%{1}}-modules-extra\ %description -n kernel%{?variant}%{?1:-%{1}}-modules-extra\
@ -884,8 +884,8 @@ Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\ Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
AutoReq: no\ AutoReq: no\
AutoProv: yes\ AutoProv: yes\
%description -n kernel%{?variant}%{?1:-%{1}}-modules\ %description -n kernel%{?variant}%{?1:-%{1}}-modules\
@ -900,8 +900,8 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
%package %{1}\ %package %{1}\
summary: kernel meta-package for the %{1} kernel\ summary: kernel meta-package for the %{1} kernel\
group: system environment/kernel\ group: system environment/kernel\
Requires: kernel-%{1}%{?variant}-core-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{?variant}+%{1}\
Requires: kernel-%{1}%{?variant}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\
%description %{1}\ %description %{1}\
The meta-package for the %{1} kernel\ The meta-package for the %{1} kernel\
%{nil} %{nil}
@ -915,7 +915,7 @@ The meta-package for the %{1} kernel\
%package %{?1:%{1}-}core\ %package %{?1:%{1}-}core\
Summary: %{variant_summary}\ Summary: %{variant_summary}\
Group: System Environment/Kernel\ Group: System Environment/Kernel\
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
%{expand:%%kernel_reqprovconf}\ %{expand:%%kernel_reqprovconf}\
%if %{?1:1} %{!?1:0} \ %if %{?1:1} %{!?1:0} \
%{expand:%%kernel_meta_package %{?1:%{1}}}\ %{expand:%%kernel_meta_package %{?1:%{1}}}\
@ -2255,6 +2255,9 @@ fi
# #
# #
%changelog %changelog
* Wed Mar 18 2015 Jarod Wilson <jwilson@fedoraproject.org>
- Fix kernel-uname-r Requires/Provides variant mismatches
* Tue Mar 17 2015 Kyle McMartin <kmcmarti@redhat.com> - 4.0.0-0.rc4.git0.3 * Tue Mar 17 2015 Kyle McMartin <kmcmarti@redhat.com> - 4.0.0-0.rc4.git0.3
- Update kernel-arm64.patch, move EDAC to arm-generic, add EDAC_XGENE on arm64. - Update kernel-arm64.patch, move EDAC to arm-generic, add EDAC_XGENE on arm64.
- Add PCI_ECAM on generic, since it'll be selected most places anyway. - Add PCI_ECAM on generic, since it'll be selected most places anyway.