rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

don't prune kernel-devel in the %with_headers install section

Browse Source 
commit c1bdfc8b broke the build on s390 since it is headers only,
and had nothing installed in /usr/src/kernels... since kernel-devel
is only produced when there's a BuildKernel, just prune '*.cmd'
when doing BuildKernel for the same net result.
This commit is contained in:
Kyle McMartin 2010-12-06 10:41:38 -05:00
parent a67a18274b
commit 214d0ae2ff
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -1685,9 +1685,12 @@ BuildKernel() {
done done
# Move the devel headers out of the root file system # Move the devel headers out of the root file system
mkdir -p $RPM_BUILD_ROOT/usr/src/kernels mkdir -p $RPM_BUILD_ROOT/$DevelDir
mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
} }
### ###
@ -1807,8 +1810,6 @@ find $RPM_BUILD_ROOT/usr/include \
\( -name .install -o -name .check -o \ \( -name .install -o -name .check -o \
-name ..install.cmd -o -name ..check.cmd \) | xargs rm -f -name ..install.cmd -o -name ..check.cmd \) | xargs rm -f
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
# glibc provides scsi headers for itself, for now # glibc provides scsi headers for itself, for now
rm -rf $RPM_BUILD_ROOT/usr/include/scsi rm -rf $RPM_BUILD_ROOT/usr/include/scsi
rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h