diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-06 10:41:38 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-06 12:04:28 -0500 |
| commit | 4b3b40727e6ba302124850e2a5d3ef8b6bf2cfef (patch) | |
| tree | 28e6f76c7a5034874122917cb80d85c0757879f8 /kernel.spec | |
| parent | 8002c02cae42afb7b947b90fc4e579379232043c (diff) | |
| download | kernel-4b3b40727e6ba302124850e2a5d3ef8b6bf2cfef.tar.gz kernel-4b3b40727e6ba302124850e2a5d3ef8b6bf2cfef.tar.xz kernel-4b3b40727e6ba302124850e2a5d3ef8b6bf2cfef.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.
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 16631dc55..0f274d957 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1572,9 +1572,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 {} \; } ### @@ -1693,8 +1696,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 |