[kernel/f16] 3.1-rc3-git5

[Josh Boyer]

commit d1ab8a1bfd855c68b1b04a6e64ef68e823cdd7d8
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Aug 26 08:30:26 2011 -0400

    3.1-rc3-git5
    
    cleanup some of the cpupowerutils build stuff

 fix-cdc-ncm-dma-stack-vars.patch |  109 --------------------------------------
 kernel.spec                      |   43 +++++++--------
 sources                          |    1 +
 3 files changed, 22 insertions(+), 131 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 5677e05..2041575 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -712,7 +712,6 @@ Patch12016: disable-i8042-check-on-apple-mac.patch
 
 Patch12021: udlfb-bind-framebuffer-to-interface.patch
 
-Patch12022: fix-cdc-ncm-dma-stack-vars.patch
 Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
 Patch12024: epoll-fix-spurious-lockdep-warnings.patch
 Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
@@ -1342,7 +1341,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch
 ApplyPatch add-appleir-usb-driver.patch
 
 ApplyPatch udlfb-bind-framebuffer-to-interface.patch
-ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
 ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
 ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
 ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
@@ -1699,20 +1697,17 @@ make %{?_smp_mflags} -C tools/perf -s V=1 prefix=%{_prefix} man || %{doc_build_f
 # cpupower
 # make sure version-gen.sh is executable.
 chmod +x tools/power/cpupower/utils/version-gen.sh
-make %{?_smp_mflags} -C tools/power/cpupower CPUFRQ_BENCH=false
-# this is fairly unnecessary at the moment.  The x86_64 dir just contains
-# symlinks to the i386 dir in the tarball, but patch hates that.  We'll just
-# build the i386 dir in all cases for now.
-#ifarch {ix86}
+make %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
+%ifarch %{ix86}
     cd tools/power/cpupower/debug/i386
     make %{?_smp_mflags} centrino-decode powernow-k8-decode
     cd -
-#endif
-#ifarch x86_64
-#    cd tools/power/cpupower/debug/x86_64
-#    make {?_smp_mflags}
-#    cd -
-#endif
+%endif
+%ifarch x86_64
+    cd tools/power/cpupower/debug/x86_64
+    make %{?_smp_mflags} centrino-decode powernow-k8-decode
+    cd -
+%endif
 %endif
 %endif
 
@@ -1805,21 +1800,22 @@ make -C tools/perf -s V=1 DESTDIR=$RPM_BUILD_ROOT HAVE_CPLUS_DEMANGLE=1 prefix=%
 make -C tools/perf  -s V=1 DESTDIR=$RPM_BUILD_ROOT HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install-man || %{doc_build_fail}
 
 %ifarch %{cpupowerarchs}
-make -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFRQ_BENCH=false install
+make -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
 rm -f %{buildroot}%{_libdir}/*.{a,la}
 %find_lang cpupower
 mv cpupower.lang ../
-#ifarch #{ix86}
+%ifarch %{ix86}
     cd tools/power/cpupower/debug/i386
     install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
     install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
     cd -
-#endif
-#ifarch x86_64
-#    cd tools/power/cpupower/debug/x86_64
-#    install -m755 powernow-k8-decode {buildroot}{_bindir}/powernow-k8-decode
-#    cd -
-#endif
+%endif
+%ifarch x86_64
+    cd tools/power/cpupower/debug/x86_64
+    install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
+    install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
+    cd -
+%endif
 chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
 mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
@@ -2068,6 +2064,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 26 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.1-rc3-git5
+
 * Wed Aug 24 2011 Josh Boyer <jwboyer at redhat.com>
 - Revert 'iwlwifi: advertise max aggregate size'. (rhbz 708747)
 
diff --git a/sources b/sources
index c733b51..9045d10 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
 b9a15f79846c4d01fa3019a3112a8d04  patch-3.1-rc3.bz2
+d616dde9b999388576b12d9ad7edeca1  patch-3.1-rc3-git5.bz2