[kernel] Do a better job of cleaning-up compat-wireless between builds

John W. Linville linville at fedoraproject.org
Fri Dec 9 15:24:43 UTC 2011


commit 3a3b49403f37240b57359154a975bbde22af3ddd
Author: John W. Linville <linville at tuxdriver.com>
Date:   Fri Dec 9 10:24:35 2011 -0500

    Do a better job of cleaning-up compat-wireless between builds

 compat-wireless-ath9k-rate-control-fixup.patch |   16 ++++++++++++++++
 kernel.spec                                    |    6 ++++++
 2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/compat-wireless-ath9k-rate-control-fixup.patch b/compat-wireless-ath9k-rate-control-fixup.patch
new file mode 100644
index 0000000..b11cf2a
--- /dev/null
+++ b/compat-wireless-ath9k-rate-control-fixup.patch
@@ -0,0 +1,16 @@
+diff -up compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c.orig compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c
+--- compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c.orig	2011-12-09 10:08:18.951768673 -0500
++++ compat-wireless-2011-12-01/drivers/net/wireless/ath/ath9k/rc.c	2011-12-09 10:08:38.224527731 -0500
+@@ -1615,6 +1615,7 @@ static struct rate_control_ops ath_rate_
+ #endif
+ };
+ 
++#ifdef CONFIG_ATH9K_RATE_CONTROL
+ int ath_rate_control_register(void)
+ {
+ 	return ieee80211_rate_control_register(&ath_rate_ops);
+@@ -1624,3 +1625,4 @@ void ath_rate_control_unregister(void)
+ {
+ 	ieee80211_rate_control_unregister(&ath_rate_ops);
+ }
++#endif
diff --git a/kernel.spec b/kernel.spec
index 7a59310..64e1c4c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1474,6 +1474,9 @@ cd ..
 
 %if %{with_backports}
 
+# Always start fresh
+rm -rf compat-wireless-%{cwversion}
+
 # Extract the compat-wireless bits
 %setup -q -n kernel-%{kversion}%{?dist} -T -D -a 1
 
@@ -2225,6 +2228,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Dec 09 2011 John W. Linville <linville at redhat.com>
+- Do a better job of cleaning-up compat-wireless between builds
+
 * Fri Dec 09 2011 Dave Jones <davej at redhat.com> - 3.2.0-0.rc4.git6.1
 - Linux 3.2-rc4-git6 (09d9673d53005fdf40de4c759425893904292236)
 


More information about the scm-commits mailing list