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

Allow debuginfo to be multiply-installed

Browse Source 
Patch from aris@ on fedora-kernel.
This commit is contained in:
Kyle McMartin 2010-11-20 20:53:02 -05:00
parent eaa431c101
commit b7e5e1b1d1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel.spec
View File

@ -1084,17 +1084,17 @@ else
fi fi
# Now build the fedora kernel tree. # 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 # Just in case we ctrl-c'd a prep already
rm -rf deleteme.%{_target_cpu} rm -rf deleteme.%{_target_cpu}
# Move away the stale away, and delete in background. # 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} & rm -rf deleteme.%{_target_cpu} &
fi 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 # released_kernel with possible stable updates
%if 0%{?stable_base} %if 0%{?stable_base}
@ -1630,7 +1630,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/boot mkdir -p $RPM_BUILD_ROOT/boot
mkdir -p $RPM_BUILD_ROOT%{_libexecdir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
cd linux-%{kversion}.%{_target_cpu} cd linux-%{KVERREL}
%if %{with_debug} %if %{with_debug}
BuildKernel %make_target %kernel_image debug BuildKernel %make_target %kernel_image debug
@ -1696,7 +1696,7 @@ find Documentation -type d | xargs chmod u+w
%install %install
cd linux-%{kversion}.%{_target_cpu} cd linux-%{KVERREL}
%if %{with_doc} %if %{with_doc}
docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion} docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}
@ -1959,6 +1959,11 @@ fi
# || || # || ||
%changelog %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 * Sat Nov 20 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36.1-6.rc1
- Linux 2.6.36.1-rc1 - Linux 2.6.36.1-rc1
- Comment out upstreamed patches: - Comment out upstreamed patches: