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

use pushd/popd instead of cd/cd- (since cd - && cd - is idempotent)

Browse Source
This commit is contained in:
Kyle McMartin 2013-01-25 10:29:40 -05:00
parent f1447139c1
commit 0769445f2d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kernel.spec
View File

@ -1831,22 +1831,22 @@ BuildKernel %make_target %kernel_image smp
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 CPUFREQ_BENCH=false make %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
%ifarch %{ix86} %ifarch %{ix86}
cd tools/power/cpupower/debug/i386 pushd tools/power/cpupower/debug/i386
make %{?_smp_mflags} centrino-decode powernow-k8-decode make %{?_smp_mflags} centrino-decode powernow-k8-decode
cd - popd
%endif %endif
%ifarch x86_64 %ifarch x86_64
cd tools/power/cpupower/debug/x86_64 pushd tools/power/cpupower/debug/x86_64
make %{?_smp_mflags} centrino-decode powernow-k8-decode make %{?_smp_mflags} centrino-decode powernow-k8-decode
cd - popd
%endif %endif
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
cd tools/power/x86/x86_energy_perf_policy/ pushd tools/power/x86/x86_energy_perf_policy/
make make
cd - popd
cd tools/power/x86/turbostat pushd tools/power/x86/turbostat
make make
cd - popd
%endif #turbostat/x86_energy_perf_policy %endif #turbostat/x86_energy_perf_policy
%endif %endif
%endif %endif
@ -2014,16 +2014,16 @@ 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 pushd 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 - popd
%endif %endif
%ifarch x86_64 %ifarch x86_64
cd tools/power/cpupower/debug/x86_64 pushd tools/power/cpupower/debug/x86_64
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 - popd
%endif %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
@ -2032,12 +2032,12 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
%endif %endif
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_mandir}/man8
cd tools/power/x86/x86_energy_perf_policy pushd tools/power/x86/x86_energy_perf_policy
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
cd - popd
cd tools/power/x86/turbostat pushd tools/power/x86/turbostat
make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install
cd - popd
%endif #turbostat/x86_energy_perf_policy %endif #turbostat/x86_energy_perf_policy
%endif %endif