summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-12 09:55:29 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-12 09:55:29 -0400
commit3ceaf1ed21fbc2d55bd37af961eccdf528fc5e05 (patch)
tree67d3d3cccba496d6893b28361b46e02ea797806b /kernel.spec
parenta962393de3cfc92ef3ee3aadc4f50490e3d79281 (diff)
downloadkernel-3ceaf1ed21fbc2d55bd37af961eccdf528fc5e05.tar.gz
kernel-3ceaf1ed21fbc2d55bd37af961eccdf528fc5e05.tar.xz
kernel-3ceaf1ed21fbc2d55bd37af961eccdf528fc5e05.zip
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
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index d361859ad..f9fe9dd42 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -153,6 +153,7 @@ Summary: The Linux kernel
%define kversion 4.%{base_sublevel}
%define make_target bzImage
+%define image_install_path boot
%define KVERREL %{version}-%{release}.%{_target_cpu}
%define hdrarch %_target_cpu
@@ -245,21 +246,18 @@ Summary: The Linux kernel
%define hdrarch i386
%define pae PAE
%define all_arch_configs kernel-%{version}-i?86*.config
-%define image_install_path boot
%define kernel_image arch/x86/boot/bzImage
%endif
%ifarch x86_64
%define asmarch x86
%define all_arch_configs kernel-%{version}-x86_64*.config
-%define image_install_path boot
%define kernel_image arch/x86/boot/bzImage
%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
@@ -275,7 +273,6 @@ Summary: The Linux kernel
%define asmarch s390
%define hdrarch s390
%define all_arch_configs kernel-%{version}-s390x.config
-%define image_install_path boot
%define make_target image
%define kernel_image arch/s390/boot/image
%define with_tools 0
@@ -283,7 +280,6 @@ Summary: The Linux kernel
%ifarch %{arm}
%define all_arch_configs kernel-%{version}-arm*.config
-%define image_install_path boot
%define asmarch arm
%define hdrarch arm
%define pae lpae
@@ -306,7 +302,6 @@ Summary: The Linux kernel
%define hdrarch arm64
%define make_target Image.gz
%define kernel_image arch/arm64/boot/Image.gz
-%define image_install_path boot
%endif
# 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/lib/modules/$KernelVer
%if %{with_debuginfo}
- mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/boot
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
%endif