diff --git a/.gitignore b/.gitignore index c91a45f..eefad53 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ freeipmi-0.8.8.tar.gz /freeipmi-1.1.5.tar.gz /freeipmi-1.1.6.tar.gz /freeipmi-1.1.7.tar.gz +/freeipmi-1.2.1.tar.gz diff --git a/freeipmi.spec b/freeipmi.spec index ab1feb0..54fc8a6 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -5,13 +5,14 @@ Release: 1%{?dist} Name: freeipmi -Version: 1.1.7 +Version: 1.2.1 License: GPLv3+ Group: Applications/System URL: http://www.gnu.org/software/freeipmi/ Source: http://ftp.gnu.org/gnu/freeipmi/%{name}-%{version}.tar.gz Source1: bmc-watchdog.service Source2: ipmidetectd.service +Source3: ipmiseld.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel texinfo systemd-units Requires(preun): info systemd-units @@ -36,9 +37,6 @@ header files and libraries. Summary: IPMI BMC watchdog Group: Applications/System Requires: freeipmi = %{version}-%{release} -Requires(post): chkconfig -Requires(preun): chkconfig -Requires: logrotate %description bmc-watchdog Provides a watchdog daemon for OS monitoring and recovery. @@ -46,11 +44,16 @@ Provides a watchdog daemon for OS monitoring and recovery. Summary: IPMI node detection monitoring daemon Group: Applications/System Requires: freeipmi = %{version}-%{release} -Requires(post): chkconfig -Requires(preun): chkconfig %description ipmidetectd Provides a tool and a daemon for IPMI node detection. +%package ipmiseld +Summary: IPMI SEL syslog logging daemon +Group: Applications/System +Requires: freeipmi = %{version}-%{release} +%description ipmiseld +IPMI SEL syslog logging daemon. + %if %{?_with_debug:1}%{!?_with_debug:0} %define _enable_debug --enable-debug --enable-trace --enable-syslog %endif @@ -74,7 +77,7 @@ echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la # Install systemd units install -m 755 -d $RPM_BUILD_ROOT/%{_unitdir} -install -m 644 %SOURCE1 %SOURCE2 $RPM_BUILD_ROOT/%{_unitdir}/ +install -m 644 %SOURCE1 %SOURCE2 %SOURCE3 $RPM_BUILD_ROOT/%{_unitdir}/ # Remove initscripts rm -rf $RPM_BUILD_ROOT/%{_initrddir} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d @@ -112,6 +115,26 @@ if [ $1 -ge 1 ] ; then /bin/systemctl try-restart bmc-watchdog.service >/dev/null 2>&1 || : fi +%post ipmiseld +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun ipmiseld +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable ipmiseld.service > /dev/null 2>&1 || : + /bin/systemctl stop ipmiseld.service > /dev/null 2>&1 || : +fi + +%postun ipmiseld +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart ipmiseld.service >/dev/null 2>&1 || : +fi + %post ipmidetectd if [ $1 -eq 1 ] ; then # Initial installation @@ -300,15 +323,14 @@ fi %dir %{_includedir}/freeipmi/debug %dir %{_includedir}/freeipmi/driver %dir %{_includedir}/freeipmi/fiid -%dir %{_includedir}/freeipmi/fru-parse +%dir %{_includedir}/freeipmi/fru %dir %{_includedir}/freeipmi/interface %dir %{_includedir}/freeipmi/interpret %dir %{_includedir}/freeipmi/locate %dir %{_includedir}/freeipmi/payload %dir %{_includedir}/freeipmi/record-format -%dir %{_includedir}/freeipmi/sdr-cache -%dir %{_includedir}/freeipmi/sdr-parse -%dir %{_includedir}/freeipmi/sel-parse +%dir %{_includedir}/freeipmi/sdr +%dir %{_includedir}/freeipmi/sel %dir %{_includedir}/freeipmi/sensor-read %dir %{_includedir}/freeipmi/spec %dir %{_includedir}/freeipmi/templates @@ -322,15 +344,14 @@ fi %{_includedir}/freeipmi/debug/*.h %{_includedir}/freeipmi/driver/*.h %{_includedir}/freeipmi/fiid/*.h -%{_includedir}/freeipmi/fru-parse/*.h +%{_includedir}/freeipmi/fru/*.h %{_includedir}/freeipmi/interface/*.h %{_includedir}/freeipmi/interpret/*.h %{_includedir}/freeipmi/locate/*.h %{_includedir}/freeipmi/payload/*.h %{_includedir}/freeipmi/record-format/*.h -%{_includedir}/freeipmi/sdr-cache/*.h -%{_includedir}/freeipmi/sdr-parse/*.h -%{_includedir}/freeipmi/sel-parse/*.h +%{_includedir}/freeipmi/sdr/*.h +%{_includedir}/freeipmi/sel/*.h %{_includedir}/freeipmi/sensor-read/*.h %{_includedir}/freeipmi/spec/*.h %{_includedir}/freeipmi/templates/*.h @@ -344,11 +365,9 @@ fi %doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog %doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog.UC %config(noreplace) %{_sysconfdir}/sysconfig/bmc-watchdog -%config(noreplace) %{_sysconfdir}/logrotate.d/bmc-watchdog %{_sbindir}/bmc-watchdog %{_mandir}/man8/bmc-watchdog.8* %{_unitdir}/bmc-watchdog.service -%dir %{_localstatedir}/log/freeipmi %files ipmidetectd %defattr(-,root,root) @@ -358,7 +377,65 @@ fi %{_mandir}/man8/ipmidetectd.8* %{_unitdir}/ipmidetectd.service +%files ipmiseld +%defattr(-,root,root) +%doc %{_datadir}/doc/%{name}/COPYING.ipmiseld +%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiseld +%{_unitdir}/ipmiseld.service +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/ipmiseld.conf +%{_sbindir}/ipmiseld +%{_mandir}/man5/ipmiseld.conf.5* +%{_mandir}/man8/ipmiseld.8* +%dir %{_localstatedir}/cache/ipmiseld + %changelog +* Mon Aug 27 2012 Jan Safranek - 1.2.1-1 +- Updated to freeipmi-1.2.1: + - Support new ipmiseld daemon, a daemon that regularly polls the SEL + and stores the events to the local syslog. + - In ipmipower, support --oem-power-type option to support OEM + specific power control operations. Included in this support were + the follow changes to ipmipower: + - Support initial OEM power type of C410X. + - Re-architect to allow input of extra information for an OEM power + operation via the '+' operator after the hostname. + - Re-architect to allow input of target hostname multiple times + under OEM power cases. + - Re-architect to allow serialization of power control operations to + the same host. + - Globally in tools, support --target-channel-number and + --target-slave-address to specify specific targets. + - Globally in tools, support ability to specify alternate port via + optional [:port] in hostname or host config. + - In ipmi-fru, support --bridge-fru option to allow reading FRU entries + from satellite controllers. + - In bmc-config, add configuration support for + Maximum_Privilege_Cipher_Suite_Id_15 under RMCPplus_Conf_Privilege. + - Globally support Cipher Suite ID 15 and 16 based on comments from + Intel. + - In ipmi-sensors, support --output-sensor-thresholds, to allow + outputting of sensor thresholds in default output for scripting. + - In ipmi-sel, support new --post-clear option. + - In bmc-device, support new --set-sensor-reading-and-event-status + option. + - In ipmi-oem, support additional Intel Node Manager commands, + including: + - get-node-manager-capabilities + - node-manager-policy-control + - get-node-manager-policy + - set-node-manager-policy + - remove-node-manager-policy + - get-node-manager-alert-thresholds + - set-node-manager-alert-thresholds + - get-node-manager-policy-suspend-periods + - set-node-manager-policy-suspend-periods + - set-node-manager-power-draw-range + - In ipmi-oem, support Wistron OEM commands extensions. + - In ipmi-sel, support Wistron OEM SEL interpretations. + - In ipmi-fru, support Wistron OEM FRU records. + - In ipmi-pef-config, support configuration volatile Alert String 0 + and Lan Alert Destination 0. + * Tue Jul 31 2012 Jan Safranek - 1.1.7-1 - Updated to freeipmi-1.1.7: - In ipmi-sensors and ipmi-sel, fix units output corner case. diff --git a/ipmiseld.service b/ipmiseld.service new file mode 100644 index 0000000..77a5770 --- /dev/null +++ b/ipmiseld.service @@ -0,0 +1,10 @@ +[Unit] +Description=IPMI SEL syslog logging daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/ipmiseld + +[Install] +WantedBy=multi-user.target diff --git a/sources b/sources index c7b1eae..5159b07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70c4d9232e7525dd3221586a06f86fb4 freeipmi-1.1.7.tar.gz +2626e552ca969b88b7d99b32e5dd2be7 freeipmi-1.2.1.tar.gz