rpms/kernel
7
2
Fork 4
Code Issues Pull Requests Releases Activity

3.1-rc3-git5

Browse Source 
cleanup some of the cpupowerutils build stuff
This commit is contained in:
Josh Boyer 2011-08-26 08:30:26 -04:00
parent 28597795d3
commit 9c44ba9cff
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kernel.spec
View File

@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 3 %define rcrev 3
# The git snapshot level # The git snapshot level
%define gitrev 3 %define gitrev 5
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0 %define rpmversion 3.%{upstream_sublevel}.0
%endif %endif
@ -1694,20 +1694,17 @@ make %{?_smp_mflags} -C tools/perf -s V=1 prefix=%{_prefix} man || %{doc_build_f
# cpupower # cpupower
# make sure version-gen.sh is executable. # make sure version-gen.sh is executable.
chmod +x tools/power/cpupower/utils/version-gen.sh chmod +x tools/power/cpupower/utils/version-gen.sh
make %{?_smp_mflags} -C tools/power/cpupower CPUFRQ_BENCH=false make %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
# this is fairly unnecessary at the moment. The x86_64 dir just contains %ifarch %{ix86}
# 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}
cd tools/power/cpupower/debug/i386 cd tools/power/cpupower/debug/i386
make %{?_smp_mflags} centrino-decode powernow-k8-decode make %{?_smp_mflags} centrino-decode powernow-k8-decode
cd - cd -
#endif %endif
#ifarch x86_64 %ifarch x86_64
# cd tools/power/cpupower/debug/x86_64 cd tools/power/cpupower/debug/x86_64
# make {?_smp_mflags} make %{?_smp_mflags} centrino-decode powernow-k8-decode
# cd - cd -
#endif %endif
%endif %endif
%endif %endif
@ -1800,21 +1797,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} make -C tools/perf -s V=1 DESTDIR=$RPM_BUILD_ROOT HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install-man || %{doc_build_fail}
%ifarch %{cpupowerarchs} %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} rm -f %{buildroot}%{_libdir}/*.{a,la}
%find_lang cpupower %find_lang cpupower
mv cpupower.lang ../ mv cpupower.lang ../
#ifarch #{ix86} %ifarch %{ix86}
cd tools/power/cpupower/debug/i386 cd tools/power/cpupower/debug/i386
install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
cd - cd -
#endif %endif
#ifarch x86_64 %ifarch x86_64
# cd tools/power/cpupower/debug/x86_64 cd tools/power/cpupower/debug/x86_64
# install -m755 powernow-k8-decode {buildroot}{_bindir}/powernow-k8-decode install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
# cd - install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
#endif cd -
%endif
chmod 0755 %{buildroot}%{_libdir}/libcpupower.so* chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
@ -2072,6 +2070,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Fri Aug 26 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-rc3-git5
* Thu Aug 25 2011 Josh Boyer <jwboyer@redhat.com> * Thu Aug 25 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-rc3-git3 - Linux 3.1-rc3-git3

2
sources
View File

@ -1,3 +1,3 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
b9a15f79846c4d01fa3019a3112a8d04 patch-3.1-rc3.bz2 b9a15f79846c4d01fa3019a3112a8d04 patch-3.1-rc3.bz2
15b485bfe634c60bcb1e7de916b1bc41 patch-3.1-rc3-git3.bz2 d616dde9b999388576b12d9ad7edeca1 patch-3.1-rc3-git5.bz2