[kernel/f16] Move the depmod file removal below the compat-wireless build to make sure we clean them all out
Josh Boyer
jwboyer at fedoraproject.org
Thu Jan 5 18:41:30 UTC 2012
commit e0bcc4d2287fbbf031bafcc64fd7376eaeb62efe
Author: Josh Boyer <jwboyer at redhat.com>
Date: Thu Jan 5 13:38:54 2012 -0500
Move the depmod file removal below the compat-wireless build to make sure we
clean them all out
kernel.spec | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 76dfdf1..4a737aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -1909,12 +1909,6 @@ BuildKernel() {
rm -f modinfo modnames
- # 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
@@ -1938,6 +1932,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
+
}
###
@@ -2384,6 +2385,10 @@ fi
# and build.
%changelog
+* Thu Jan 05 2012 Josh Boyer <jwboyer at redhat.com>
+- Move the depmod file removal below the compat-wireless build to make sure we
+ clean them all out
+
* Wed Jan 04 2012 Neil Horman <nhorman at redhat.com>
- Fix warning about msi sysfs refcount (bz 771058)
More information about the scm-commits
mailing list