diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2013-05-23 22:54:14 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2013-05-23 22:54:14 -0400 |
| commit | 6345227b0b19ce659156640b31c47dfb44091637 (patch) | |
| tree | 6dd0ba2e3b3a2b1ff171b8a63e0931ec6b06848f /kernel.spec | |
| parent | ba455ab11fde0e5d0de6c5f83f8492747d9b109d (diff) | |
| download | kernel-6345227b0b19ce659156640b31c47dfb44091637.tar.gz kernel-6345227b0b19ce659156640b31c47dfb44091637.tar.xz kernel-6345227b0b19ce659156640b31c47dfb44091637.zip | |
Fix modules.* removal from /lib/modules/$KernelVer
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 5402a513a..f4f919130 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1670,9 +1670,6 @@ BuildKernel() { cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer %endif - # remove files that will be auto generated by depmod at rpm -i time - find $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.* -exec rm -f {} \; - find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames # mark modules executable so that strip-to-file can strip them @@ -1702,6 +1699,11 @@ BuildKernel() { ( find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name '*.ko' | xargs /sbin/modinfo -l | \ grep -E -v 'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' ) && exit 1 + # remove files that will be auto generated by depmod at rpm -i time + pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ + rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} + popd + # Call the modules-extra script to move things around %{SOURCE17} $RPM_BUILD_ROOT/lib/modules/$KernelVer %{SOURCE16} @@ -2218,6 +2220,9 @@ fi # ||----w | # || || %changelog +* Thu May 23 2013 Kyle McMartin <kyle@redhat.com> +- Fix modules.* removal from /lib/modules/$KernelVer + * Thu May 23 2013 Josh Boyer <jwboyer@redhat.com> - Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367) |