diff options
| author | Jarod Wilson <jarod@redhat.com> | 2015-03-17 09:12:56 -0400 |
|---|---|---|
| committer | Jarod Wilson <jarod@redhat.com> | 2015-03-17 09:13:01 -0400 |
| commit | 0cd8df96b530b5b7714681e5cc1a30e0102c280c (patch) | |
| tree | 9e59a647d0edba5e1662cbe21218c1e9b5ddee80 | |
| parent | 35466ad3b6fbc7836fb8a95a00f0e6d8ef402d48 (diff) | |
| download | kernel-0cd8df96b530b5b7714681e5cc1a30e0102c280c.tar.gz kernel-0cd8df96b530b5b7714681e5cc1a30e0102c280c.tar.xz kernel-0cd8df96b530b5b7714681e5cc1a30e0102c280c.zip | |
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@redhat.com>
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 59a03c352..874cec027 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@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 - Linux v4.0-rc4 - Drop arm64 RCU revert patch. Should be fixed properly upstream now. |