rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup image_install_path definitions 

All arches define this to /boot, so just use one definition.  Also remove
redundant mkdir for the debuginfo /boot path.

Issues reported by Jarod Wilson
This commit is contained in:
Josh Boyer 2015-05-12 09:55:29 -04:00
parent a962393de3
commit 3ceaf1ed21
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -153,6 +153,7 @@ Summary: The Linux kernel
%define kversion 4.%{base_sublevel} %define kversion 4.%{base_sublevel}
%define make_target bzImage %define make_target bzImage
%define image_install_path boot
%define KVERREL %{version}-%{release}.%{_target_cpu} %define KVERREL %{version}-%{release}.%{_target_cpu}
%define hdrarch %_target_cpu %define hdrarch %_target_cpu
@ -245,21 +246,18 @@ Summary: The Linux kernel
%define hdrarch i386 %define hdrarch i386
%define pae PAE %define pae PAE
%define all_arch_configs kernel-%{version}-i?86*.config %define all_arch_configs kernel-%{version}-i?86*.config
%define image_install_path boot
%define kernel_image arch/x86/boot/bzImage %define kernel_image arch/x86/boot/bzImage
%endif %endif
%ifarch x86_64 %ifarch x86_64
%define asmarch x86 %define asmarch x86
%define all_arch_configs kernel-%{version}-x86_64*.config %define all_arch_configs kernel-%{version}-x86_64*.config
%define image_install_path boot
%define kernel_image arch/x86/boot/bzImage %define kernel_image arch/x86/boot/bzImage
%endif %endif
%ifarch %{power64} %ifarch %{power64}
%define asmarch powerpc %define asmarch powerpc
%define hdrarch powerpc %define hdrarch powerpc
%define image_install_path boot
%define make_target vmlinux %define make_target vmlinux
%define kernel_image vmlinux %define kernel_image vmlinux
%define kernel_image_elf 1 %define kernel_image_elf 1
@ -275,7 +273,6 @@ Summary: The Linux kernel
%define asmarch s390 %define asmarch s390
%define hdrarch s390 %define hdrarch s390
%define all_arch_configs kernel-%{version}-s390x.config %define all_arch_configs kernel-%{version}-s390x.config
%define image_install_path boot
%define make_target image %define make_target image
%define kernel_image arch/s390/boot/image %define kernel_image arch/s390/boot/image
%define with_tools 0 %define with_tools 0
@ -283,7 +280,6 @@ Summary: The Linux kernel
%ifarch %{arm} %ifarch %{arm}
%define all_arch_configs kernel-%{version}-arm*.config %define all_arch_configs kernel-%{version}-arm*.config
%define image_install_path boot
%define asmarch arm %define asmarch arm
%define hdrarch arm %define hdrarch arm
%define pae lpae %define pae lpae
@ -306,7 +302,6 @@ Summary: The Linux kernel
%define hdrarch arm64 %define hdrarch arm64
%define make_target Image.gz %define make_target Image.gz
%define kernel_image arch/arm64/boot/Image.gz %define kernel_image arch/arm64/boot/Image.gz
%define image_install_path boot
%endif %endif
# Should make listnewconfig fail if there's config options # Should make listnewconfig fail if there's config options
@ -1485,7 +1480,6 @@ BuildKernel() {
mkdir -p $RPM_BUILD_ROOT/%{image_install_path} mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
%if %{with_debuginfo} %if %{with_debuginfo}
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/boot
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path} mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
%endif %endif