Build tools on ppc64le (rhbz 1138884), Some minor ppc64 cleanups

This commit is contained in:
Peter Robinson 2014-09-08 19:31:10 +01:00
parent db4d0648e2
commit a3f68e4d7b

View File

@ -228,7 +228,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 ppc ppc64 ppc64p7 s390 s390x aarch64 ppc64le %define vdso_arches %{all_x86} x86_64 ppc %{power64} s390 s390x aarch64
%endif %endif
# Overrides for generic default options # Overrides for generic default options
@ -253,12 +253,9 @@ Summary: The Linux kernel
%endif %endif
# bootwrapper is only on ppc # bootwrapper is only on ppc
%ifnarch ppc ppc64 ppc64p7 ppc64le # sparse blows up on ppc
%ifnarch ppc %{power64}
%define with_bootwrapper 0 %define with_bootwrapper 0
%endif
# sparse blows up on ppc64 and sparc64
%ifarch ppc64 ppc ppc64p7 ppc64le
%define with_sparse 0 %define with_sparse 0
%endif %endif
@ -280,25 +277,19 @@ Summary: The Linux kernel
%define kernel_image arch/x86/boot/bzImage %define kernel_image arch/x86/boot/bzImage
%endif %endif
%ifarch %{power64}
%define asmarch powerpc
%define hdrarch powerpc
%define image_install_path boot
%define make_target vmlinux
%define kernel_image vmlinux
%define kernel_image_elf 1
%ifarch ppc64 ppc64p7 %ifarch ppc64 ppc64p7
%define asmarch powerpc
%define hdrarch powerpc
%define all_arch_configs kernel-%{version}-ppc64*.config %define all_arch_configs kernel-%{version}-ppc64*.config
%define image_install_path boot
%define make_target vmlinux
%define kernel_image vmlinux
%define kernel_image_elf 1
%endif %endif
%ifarch ppc64le %ifarch ppc64le
%define asmarch powerpc
%define hdrarch powerpc
%define all_arch_configs kernel-%{version}-ppc64le.config %define all_arch_configs kernel-%{version}-ppc64le.config
%define image_install_path boot %endif
%define make_target vmlinux
%define kernel_image vmlinux
%define kernel_image_elf 1
%define with_tools 0
%endif %endif
%ifarch s390x %ifarch s390x
@ -386,7 +377,7 @@ Summary: The Linux kernel
%endif %endif
# Architectures we build tools/cpupower on # Architectures we build tools/cpupower on
%define cpupowerarchs %{ix86} x86_64 ppc ppc64 ppc64p7 %{arm} aarch64 ppc64le %define cpupowerarchs %{ix86} x86_64 ppc %{power64} %{arm} aarch64
# #
# Packages that need to be installed before the kernel is, because the %%post # Packages that need to be installed before the kernel is, because the %%post
@ -1590,7 +1581,7 @@ BuildKernel() {
fi fi
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
%ifarch ppc ppc64 ppc64p7 %ifarch ppc %{power64}
cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
%endif %endif
if [ -d arch/%{asmarch}/include ]; then if [ -d arch/%{asmarch}/include ]; then
@ -2236,6 +2227,10 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Mon Sep 8 2014 Peter Robinson <pbrobinson@fedoraproject.org>
- Build tools on ppc64le (rhbz 1138884)
- Some minor ppc64 cleanups
* Fri Sep 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.2-300 * Fri Sep 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.2-300
- Linux v3.16.2 - Linux v3.16.2