diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-20 20:53:02 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-20 21:04:27 -0500 |
| commit | b7e5e1b1d1a429e402a1c22a9a1b1dfea3c608df (patch) | |
| tree | 57e5d4848d6cbfc0abdb498e14b21a960a9258c5 | |
| parent | eaa431c101ff69612a09f7f6ffaf41d102a2195d (diff) | |
| download | kernel-b7e5e1b1d1a429e402a1c22a9a1b1dfea3c608df.tar.gz kernel-b7e5e1b1d1a429e402a1c22a9a1b1dfea3c608df.tar.xz kernel-b7e5e1b1d1a429e402a1c22a9a1b1dfea3c608df.zip | |
Allow debuginfo to be multiply-installed
Patch from aris@ on fedora-kernel.
| -rw-r--r-- | kernel.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index fb3f4e66e..dd67ea681 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1084,17 +1084,17 @@ else fi # Now build the fedora kernel tree. -if [ -d linux-%{kversion}.%{_target_cpu} ]; then +if [ -d linux-%{KVERREL} ]; then # Just in case we ctrl-c'd a prep already rm -rf deleteme.%{_target_cpu} # Move away the stale away, and delete in background. - mv linux-%{kversion}.%{_target_cpu} deleteme.%{_target_cpu} + mv linux-%{KVERREL} deleteme.%{_target_cpu} rm -rf deleteme.%{_target_cpu} & fi -cp -rl vanilla-%{vanillaversion} linux-%{kversion}.%{_target_cpu} +cp -rl vanilla-%{vanillaversion} linux-%{KVERREL} -cd linux-%{kversion}.%{_target_cpu} +cd linux-%{KVERREL} # released_kernel with possible stable updates %if 0%{?stable_base} @@ -1630,7 +1630,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/boot mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -cd linux-%{kversion}.%{_target_cpu} +cd linux-%{KVERREL} %if %{with_debug} BuildKernel %make_target %kernel_image debug @@ -1696,7 +1696,7 @@ find Documentation -type d | xargs chmod u+w %install -cd linux-%{kversion}.%{_target_cpu} +cd linux-%{KVERREL} %if %{with_doc} docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion} @@ -1959,6 +1959,11 @@ fi # || || %changelog +* Sat Nov 20 2010 Kyle McMartin <kyle@redhat.com> +- Merge patch from Aris to allow kernel-debuginfo to be multiply-installed + (means we had to move the build dir, kind of a bummer, but I verified + that a -gitN to -gitN+1 worked.) + * Sat Nov 20 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36.1-6.rc1 - Linux 2.6.36.1-rc1 - Comment out upstreamed patches: |