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

Fix modules.* removal from /lib/modules/$KernelVer

Browse Source
This commit is contained in:
Kyle McMartin 2013-05-23 22:54:14 -04:00
parent ba455ab11f
commit 6345227b0b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel.spec
View File

@ -1670,9 +1670,6 @@ BuildKernel() {
cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
%endif %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 find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
# mark modules executable so that strip-to-file can strip them # 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 | \ ( 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 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 # Call the modules-extra script to move things around
%{SOURCE17} $RPM_BUILD_ROOT/lib/modules/$KernelVer %{SOURCE16} %{SOURCE17} $RPM_BUILD_ROOT/lib/modules/$KernelVer %{SOURCE16}
@ -2218,6 +2220,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %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> * Thu May 23 2013 Josh Boyer <jwboyer@redhat.com>
- Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367) - Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367)