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

Fix bad variant usage in kernel dependencies

Browse Source 
This was resulting in a variant build with dependencies like so:

error: Failed dependencies:
	kernel--vanilla-core-uname-r = ...

The variant already has a - at the start of it, so the always-there one
should be after variant and variant will provide the one between kernel
and itself.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
This commit is contained in:
Jarod Wilson 2015-03-17 09:12:56 -04:00
parent 35466ad3b6
commit 0cd8df96b5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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:%{variant}-}core-uname-r = %{KVERREL}%{?variant} Requires: kernel%{?variant}-core-uname-r = %{KVERREL}%{?variant}
Requires: kernel-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant} Requires: kernel%{?variant}-modules-uname-r = %{KVERREL}%{?variant}
%endif %endif
@ -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:%{variant}-}core-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}%{?variant}-core-uname-r = %{KVERREL}%{?variant}+%{1}\
Requires: kernel-%{1}-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}%{?variant}-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}
@ -2255,6 +2255,9 @@ fi
# #
# #
%changelog %changelog
* Mon Mar 16 2015 Jarod Wilson <jwilson@fedoraproject.org>
- Fix bad variant usage in kernel dependencies
* Mon Mar 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git0.1 * Mon Mar 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git0.1
- Linux v4.0-rc4 - Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now. - Drop arm64 RCU revert patch. Should be fixed properly upstream now.