move modules.* removal, so we don't trounce useful stuff

This commit is contained in:
Kyle McMartin 2013-05-21 15:53:48 -04:00
parent bc6d3c8d25
commit 98438291c0

View File

@ -1664,6 +1664,9 @@ 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,9 +1705,6 @@ BuildKernel() {
cp signing_key.x509 signing_key.x509.sign${Flav} cp signing_key.x509 signing_key.x509.sign${Flav}
%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 {} \;
# 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/usr/src/kernels
mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
@ -2215,7 +2215,7 @@ fi
* Tue May 21 2013 Kyle McMartin <kyle@redhat.com> * Tue May 21 2013 Kyle McMartin <kyle@redhat.com>
- Rewrite the modinfo license check to generate significantly less noise in - Rewrite the modinfo license check to generate significantly less noise in
build logs. build logs.
- Ditto for the modules.* removal. - Ditto for the modules.* removal (and move it earlier, as pointed out by jwb)
* Tue May 21 2013 Peter Robinson <pbrobinson@fedoraproject.org> * Tue May 21 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Enable OMAP5 on ARM multiplatform - Enable OMAP5 on ARM multiplatform