diff --git a/kernel.spec b/kernel.spec index 6264d15da..55ff2fa29 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1791,12 +1791,6 @@ BuildKernel() { rm mod-extra.list mod-extra2.list mod-extra3.list popd - # remove files that will be auto generated by depmod at rpm -i time - for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap - do - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i - done - # Move the devel headers out of the root file system mkdir -p $RPM_BUILD_ROOT/usr/src/kernels mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir @@ -1820,6 +1814,13 @@ BuildKernel() { cd - %endif + + # remove files that will be auto generated by depmod at rpm -i time + for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap + do + rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i + done + } ### @@ -2286,6 +2287,10 @@ fi # ||----w | # || || %changelog +* Thu Jan 05 2012 Josh Boyer +- Move the depmod file removal below the compat-wireless build to make sure we + clean them all out + * Thu Jan 05 2012 Dave Jones - CONFIG_DEBUG_SET_MODULE_RONX should always be set.