diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | rteval.spec | 33 | ||||
| -rw-r--r-- | rteval/cyclictest.py | 2 | ||||
| -rw-r--r-- | rteval/rteval.py | 2 |
5 files changed, 26 insertions, 17 deletions
@@ -111,7 +111,6 @@ rpms rpm: rpm_prep rtevalrpm loadrpm xmlrpcrpm rtevalrpm: tarfile cp rteval-$(VERSION).tar.bz2 rpm/SOURCES cp rteval.spec rpm/SPECS - cp loadsource/* rpm/SOURCES rpmbuild -ba --define "_topdir $(HERE)/rpm" rpm/SPECS/rteval.spec xmlrpcrpm: rteval-xmlrpc-$(XMLRPCVER).tar.gz @@ -5,8 +5,9 @@ 1. Write a man page. -2. Figure out some sort of config file to adjust load and measurement parameters, then -add an option to tell rteval to use a particular config file. +2. Figure out some sort of config file to adjust load and measurement + parameters, then add an option to tell rteval to use a particular + config file. 3. Figure out how to add more loads. Seems that we could do it two ways: diff --git a/rteval.spec b/rteval.spec index 0f6ad25..8827c14 100644 --- a/rteval.spec +++ b/rteval.spec @@ -2,8 +2,8 @@ %{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: rteval -Version: 1.11 -Release: 4%{?dist} +Version: 1.12 +Release: 2%{?dist} Summary: Utility to evaluate system suitability for RT Linux Group: Development/Tools @@ -12,6 +12,7 @@ URL: http://git.kernel.org/?p=linux/kernel/git/clrkwllms/rteval.git Source0: rteval-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python Requires: python Requires: python-schedutils python-ethtool libxslt-python >= 1.1.17 Requires: python-dmidecode >= 3.10 @@ -45,15 +46,10 @@ fi %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT} -#make DESTDIR=${RPM_BUILD_ROOT} LOADDIR=%{_sourcedir} install_rteval -make DESTDIR=${RPM_BUILD_ROOT} LOADDIR=${RPM_SOURCE_DIR} install_rteval - - -%posttrans -#ln -fs %{python_sitelib}/rteval/rteval.py /usr/bin/rteval - -%postun -rm -f /usr/bin/rteval +make DESTDIR=${RPM_BUILD_ROOT} install_rteval +mkdir -p ${RPM_BUILD_ROOT}/usr/bin +# note that python_sitelib has a leading slash... +ln -s ../..%{python_sitelib}/rteval/rteval.py ${RPM_BUILD_ROOT}/usr/bin/rteval %clean @@ -72,9 +68,22 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/rteval_*.xsl %config(noreplace) %{_sysconfdir}/rteval.conf %{python_sitelib}/rteval/ - +/usr/bin/rteval %changelog +* Thu Dec 3 2009 David Sommerseth <davids@redhat.com> - 1.12-2 +- Removed xmlrpc package during merge against master_ipv4 branch + +* Wed Nov 25 2009 Clark Williams <williams@redhat.com> - 1.12-1 +- fix incorrect reporting of measurement thread priorities + +* Mon Nov 16 2009 Clark Williams <williams@redhat.com> - 1.11-5 +- ensure that no double-slashes ("//") appear in the symlink + path for /usr/bin/rteval (problem with rpmdiff) + +* Tue Nov 10 2009 Clark Williams <williams@redhat.com> - 1.11-4 +- changed symlink back to install and tracked by %files + * Mon Nov 9 2009 Clark Williams <williams@redhat.com> - 1.11-3 - changed symlink generation from %post to %posttrans diff --git a/rteval/cyclictest.py b/rteval/cyclictest.py index 1c6f6f8..84d4024 100644 --- a/rteval/cyclictest.py +++ b/rteval/cyclictest.py @@ -164,7 +164,7 @@ class Cyclictest(Thread): for line in f: if line.startswith('processor'): core = line.split()[-1] - self.data[core] = RunData(core, 'core', self.priority - int(core)) + self.data[core] = RunData(core, 'core', self.priority) numcores += 1 if line.startswith('model name'): desc = line.split(': ')[-1][:-1] diff --git a/rteval/rteval.py b/rteval/rteval.py index f69f99c..263cb2d 100644 --- a/rteval/rteval.py +++ b/rteval/rteval.py @@ -57,7 +57,7 @@ import rtevalMailer class RtEval(object): def __init__(self): - self.version = "1.11" + self.version = "1.12" self.load_modules = [] self.workdir = os.getcwd() self.inifile = None |