[kernel] Fix bad variant usage in kernel dependencies
Jarod Wilson
jwilson at fedoraproject.org
Tue Mar 17 13:17:05 UTC 2015
commit 0cd8df96b530b5b7714681e5cc1a30e0102c280c
Author: Jarod Wilson <jarod at redhat.com>
Date: Tue Mar 17 09:12:56 2015 -0400
Fix bad variant usage in kernel dependencies
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 at redhat.com>
kernel.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 59a03c3..874cec0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -370,8 +370,8 @@ Release: %{pkg_release}
ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le
ExclusiveOS: Linux
%ifnarch %{nobuildarches}
-Requires: kernel-%{?variant:%{variant}-}core-uname-r = %{KVERREL}%{?variant}
-Requires: kernel-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant}
+Requires: kernel%{?variant}-core-uname-r = %{KVERREL}%{?variant}
+Requires: kernel%{?variant}-modules-uname-r = %{KVERREL}%{?variant}
%endif
@@ -900,8 +900,8 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
%package %{1}\
summary: kernel meta-package for the %{1} kernel\
group: system environment/kernel\
-Requires: kernel-%{1}-%{?variant:%{variant}-}core-uname-r = %{KVERREL}%{?variant}+%{1}\
-Requires: kernel-%{1}-%{?variant:%{variant}-}modules-uname-r = %{KVERREL}%{?variant}+%{1}\
+Requires: kernel-%{1}%{?variant}-core-uname-r = %{KVERREL}%{?variant}+%{1}\
+Requires: kernel-%{1}%{?variant}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\
%description %{1}\
The meta-package for the %{1} kernel\
%{nil}
@@ -2255,6 +2255,9 @@ fi
#
#
%changelog
+* Mon Mar 16 2015 Jarod Wilson <jwilson at fedoraproject.org>
+- Fix bad variant usage in kernel dependencies
+
* Mon Mar 16 2015 Josh Boyer <jwboyer at fedoraproject.org> - 4.0.0-0.rc4.git0.1
- Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now.
More information about the scm-commits
mailing list