cleanup a few remanent s390 arch defines

This commit is contained in:
Peter Robinson 2017-05-01 08:10:04 +01:00
parent 31e9d3500a
commit 5865c69393

View File

@ -219,7 +219,7 @@ Summary: The Linux kernel
%if %{with_vdso_install} %if %{with_vdso_install}
# These arches install vdso/ directories. # 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 %endif
# Overrides for generic default options # Overrides for generic default options
@ -329,7 +329,7 @@ Summary: The Linux kernel
# Which is a BadThing(tm). # Which is a BadThing(tm).
# We only build kernel-headers on the following... # We only build kernel-headers on the following...
%define nobuildarches i386 s390 %define nobuildarches i386
%ifarch %nobuildarches %ifarch %nobuildarches
%define with_up 0 %define with_up 0
@ -364,7 +364,7 @@ Version: %{rpmversion}
Release: %{pkg_release} Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD # 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 ExclusiveOS: Linux
%ifnarch %{nobuildarches} %ifnarch %{nobuildarches}
Requires: kernel-core-uname-r = %{KVERREL}%{?variant} Requires: kernel-core-uname-r = %{KVERREL}%{?variant}
@ -385,7 +385,7 @@ BuildRequires: sparse
%if %{with_perf} %if %{with_perf}
BuildRequires: zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel BuildRequires: zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel
%ifnarch s390 s390x %{arm} %ifnarch s390x %{arm}
BuildRequires: numactl-devel BuildRequires: numactl-devel
%endif %endif
%endif %endif