summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-05-01 08:10:04 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-05-01 08:10:04 +0100
commit5865c6939346cfe1d2b18e09e66aa477b60f5086 (patch)
treec258ad1e516c592c06cabcfddf314d8d3ac722b3
parent31e9d3500ae3d61411315adefd59e0f92e63135a (diff)
downloadkernel-5865c6939346cfe1d2b18e09e66aa477b60f5086.tar.gz
kernel-5865c6939346cfe1d2b18e09e66aa477b60f5086.tar.xz
kernel-5865c6939346cfe1d2b18e09e66aa477b60f5086.zip
cleanup a few remanent s390 arch defines
-rw-r--r--kernel.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 0b6167554..15cd1ca73 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -219,7 +219,7 @@ Summary: The Linux kernel
%if %{with_vdso_install}
# These arches install vdso/ directories.
-%define vdso_arches %{all_x86} x86_64 %{power64} s390 s390x aarch64
+%define vdso_arches %{all_x86} x86_64 %{power64} s390x aarch64
%endif
# Overrides for generic default options
@@ -329,7 +329,7 @@ Summary: The Linux kernel
# Which is a BadThing(tm).
# We only build kernel-headers on the following...
-%define nobuildarches i386 s390
+%define nobuildarches i386
%ifarch %nobuildarches
%define with_up 0
@@ -364,7 +364,7 @@ Version: %{rpmversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le
+ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390x %{arm} aarch64 ppc64le
ExclusiveOS: Linux
%ifnarch %{nobuildarches}
Requires: kernel-core-uname-r = %{KVERREL}%{?variant}
@@ -385,7 +385,7 @@ BuildRequires: sparse
%if %{with_perf}
BuildRequires: zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel
BuildRequires: audit-libs-devel
-%ifnarch s390 s390x %{arm}
+%ifnarch s390x %{arm}
BuildRequires: numactl-devel
%endif
%endif