diff options
author | Kyle McMartin <kyle@redhat.com> | 2010-12-06 10:41:38 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2010-12-06 10:41:38 -0500 |
commit | 214d0ae2ff118f73730e4c4532d5c2b758dd4d28 (patch) | |
tree | 5d9d3f35ca0a85f49408aee648f0cf94dd85b2b8 | |
parent | a67a18274b175bfa5b43183096d46710270b44d0 (diff) | |
download | kernel-214d0ae2ff118f73730e4c4532d5c2b758dd4d28.tar.gz kernel-214d0ae2ff118f73730e4c4532d5c2b758dd4d28.tar.xz kernel-214d0ae2ff118f73730e4c4532d5c2b758dd4d28.zip |
don't prune kernel-devel in the %with_headers install section
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.
-rw-r--r-- | kernel.spec | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index c9bd53beb..599cc82a3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1685,9 +1685,12 @@ BuildKernel() { done # 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 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.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 rm -rf $RPM_BUILD_ROOT/usr/include/scsi rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h |