git://git.onelab.eu
/
omf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use stable/tagged rpms from omf-5.3-federation-v1.1
[omf.git]
/
omf-resctl.spec
diff --git
a/omf-resctl.spec
b/omf-resctl.spec
index
f0bf4b8
..
d05a8c9
100644
(file)
--- a/
omf-resctl.spec
+++ b/
omf-resctl.spec
@@
-9,7
+9,7
@@
%define name omf-resctl
%define version 5.3
%define name omf-resctl
%define version 5.3
-%define taglevel
1
+%define taglevel
2
%define plc_name %{name}-%{version}-%{taglevel}
%define actual_name omf-resctl-5.3-1ubuntu2-2
%define plc_name %{name}-%{version}-%{taglevel}
%define actual_name omf-resctl-5.3-1ubuntu2-2
@@
-103,17
+103,20
@@
make libxmpp4r
make imagezip
(cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
make imagezip
(cd unwrap; rpm2cpio ../%{imagezip_actual_name}.i386.rpm | cpio -diu)
+# remove any default config if any
+rm -f unwrap/etc/omf-resctl-%{version}/omf-resctl.yaml
+
# cleanup any svn sequels
find unwrap -type d -name .svn -print0 | xargs -0 rm -rf
# cleanup any svn sequels
find unwrap -type d -name .svn -print0 | xargs -0 rm -rf
+
%install
rm -fr $RPM_BUILD_ROOT
%install
rm -fr $RPM_BUILD_ROOT
-install -D -m 600 omf-resctl.yaml.in $RPM_BUILD_ROOT/etc/omf-resctl-%{version}/omf-resctl.yaml.in
-ln -s omf-resctl-%{version} $RPM_BUILD_ROOT/etc/omf-resctl
-
rsync -a unwrap/ $RPM_BUILD_ROOT
rsync -a unwrap/ $RPM_BUILD_ROOT
+install -D -m 600 omf-resctl.yaml.in $RPM_BUILD_ROOT/etc/omf-resctl-%{version}/omf-resctl.yaml.in
+
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-128,8
+131,14
@@
rm -rf $RPM_BUILD_ROOT
#
%post
/sbin/chkconfig --add omf-resctl-%{version}
#
%post
/sbin/chkconfig --add omf-resctl-%{version}
+/sbin/chkconfig omf-resctl-%{version} on
service omf-resctl-%{version} restart
service omf-resctl-%{version} restart
+%preun
+service omf-resctl-%{version} stop
+/sbin/chkconfig omf-resctl-%{version} off
+/sbin/chkconfig --del omf-resctl-%{version}
+
####################
%files -n omf-common
%defattr(-,root,root)
####################
%files -n omf-common
%defattr(-,root,root)
@@
-164,3
+173,6
@@
ln -s /usr/bin/ruby /usr/bin/ruby1.8
####################
%changelog
####################
%changelog
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - omf-5.3-2
+- package the exp. controller as well for user convenience
+