From 130a3a31cff47d978f801c718d6282c6c0bd7b2b36ee98dcbdf3ce62c39a8857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 2 Dec 2015 07:39:39 +0000 Subject: [PATCH] - Update to 1.5.1 o Update Intel Node Manager support for 3.0 specification. - Update API and fiid templates in libfreeipmi. - Support new OEM SEL events - Update ipmi-oem commands. - Support new get/set-turbo-synchronization-ratio - Support new 'policypowerdomain' option in get-node-manager-capabilities and set-node-manager-policy. - Update output of get-node-manager-policy and get-node-manager-capabilities for changes. - get/set-node-manager-alert-thresholds converted to get/set-node-manager-policy-alert-thresholds. Legacy commands still supported. o Update libfreeipmi for IPMI 2.0 Errata 7. - Support/handle FRU Multirecord NVM Express type. o Support Get Device SDR Info, Get Device SDR, and Reserve Device SDR Repository commands in libfreeipmi. o Support ipmi-sel OEM interpretation of Linux kernel panics. o Re-organize OEM header files into per-vendor files. o In ipmi-oem, fix error in "DNS Register BMC" output in "get-dns-config" output in Inventec, Quanta, and Wistron vendor sections. o Support systemd through --with-systemdsystemunitdir configure option. o Minor corner case bug fixes. OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/freeipmi?expand=0&rev=73 --- bmc-watchdog.service | 12 --------- freeipmi-1.4.11.tar.gz | 3 --- freeipmi-1.4.11.tar.gz.sig | Bin 65 -> 0 bytes freeipmi-1.5.1.tar.gz | 3 +++ freeipmi-1.5.1.tar.gz.sig | Bin 0 -> 65 bytes freeipmi.changes | 29 +++++++++++++++++++++ freeipmi.spec | 52 ++++++++++++++++++++++--------------- ipmidetectd.service | 10 ------- ipmiseld.service | 10 ------- 9 files changed, 63 insertions(+), 56 deletions(-) delete mode 100644 bmc-watchdog.service delete mode 100644 freeipmi-1.4.11.tar.gz delete mode 100644 freeipmi-1.4.11.tar.gz.sig create mode 100644 freeipmi-1.5.1.tar.gz create mode 100644 freeipmi-1.5.1.tar.gz.sig delete mode 100644 ipmidetectd.service delete mode 100644 ipmiseld.service diff --git a/bmc-watchdog.service b/bmc-watchdog.service deleted file mode 100644 index 45f3f6e..0000000 --- a/bmc-watchdog.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=BMC Watchdog Timer Daemon -After=network.target - -[Service] -Type=forking -PIDFile=/run/bmc-watchdog.pid -EnvironmentFile=-/etc/sysconfig/bmc-watchdog -ExecStart=/usr/sbin/bmc-watchdog $OPTIONS - -[Install] -WantedBy=multi-user.target diff --git a/freeipmi-1.4.11.tar.gz b/freeipmi-1.4.11.tar.gz deleted file mode 100644 index 047ee41..0000000 --- a/freeipmi-1.4.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7460ce6c6fd8dfc0672db36ddcba85cdf8935c052f33d1eb637dfe20d7856f2e -size 3203918 diff --git a/freeipmi-1.4.11.tar.gz.sig b/freeipmi-1.4.11.tar.gz.sig deleted file mode 100644 index 2952e16e67a14fcdcb5b68d0dc681a3eceba91209455d7b42c379c46ebbe9226..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-Rx+GbKKp!2=rB1a5dxNj0HB@n{FYHSLt6AmESumPSbPdOW-I`n XIkLU=TkwmihoX)a!NLLcP;^V#P39b8 diff --git a/freeipmi-1.5.1.tar.gz b/freeipmi-1.5.1.tar.gz new file mode 100644 index 0000000..fb54dab --- /dev/null +++ b/freeipmi-1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47985ab902a62e23aba60e30a9fba5190599eecbc107d442e8b948a220ed1252 +size 3239829 diff --git a/freeipmi-1.5.1.tar.gz.sig b/freeipmi-1.5.1.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..875f39ec4fa8df7786941a2644e8d447c745c7b53feb299b35b6cf7c46f5583b GIT binary patch literal 65 zcmV-H0KWf-KLZ5-R$d@2KKp!2=rB1a5dvZ_0H0gsRDs{3;g(&|&VogaTWZ!Q8a@D^ XlPDb!+@Tmz9SZM9RB#+XHSH|V7DgEi literal 0 HcmV?d00001 diff --git a/freeipmi.changes b/freeipmi.changes index 27355e7..875d62b 100644 --- a/freeipmi.changes +++ b/freeipmi.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Dec 2 07:09:14 UTC 2015 - kkaempf@suse.com + +- Update to 1.5.1 + o Update Intel Node Manager support for 3.0 specification. + - Update API and fiid templates in libfreeipmi. + - Support new OEM SEL events + - Update ipmi-oem commands. + - Support new get/set-turbo-synchronization-ratio + - Support new 'policypowerdomain' option in + get-node-manager-capabilities and set-node-manager-policy. + - Update output of get-node-manager-policy and + get-node-manager-capabilities for changes. + - get/set-node-manager-alert-thresholds converted to + get/set-node-manager-policy-alert-thresholds. Legacy + commands still supported. + o Update libfreeipmi for IPMI 2.0 Errata 7. + - Support/handle FRU Multirecord NVM Express type. + o Support Get Device SDR Info, Get Device SDR, and Reserve + Device SDR Repository commands in libfreeipmi. + o Support ipmi-sel OEM interpretation of Linux kernel panics. + o Re-organize OEM header files into per-vendor files. + o In ipmi-oem, fix error in "DNS Register BMC" output in + "get-dns-config" output in Inventec, Quanta, and Wistron vendor + sections. + o Support systemd through --with-systemdsystemunitdir configure + option. + o Minor corner case bug fixes. + ------------------------------------------------------------------- Fri Oct 30 08:27:34 UTC 2015 - kkaempf@suse.com diff --git a/freeipmi.spec b/freeipmi.spec index e610b80..16e2839 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -17,8 +17,14 @@ # +%if 0%{?suse_version} > 1140 || 0%{?fedora_version} > 14 +%define has_systemd 1 +%else +%define has_systemd 0 +%endif + %define name freeipmi -%define version 1.4.11 +%define version 1.5.1 %define srcversion %{version} %if %{?_with_debug:1}%{!?_with_debug:0} %define release 1.debug%{?dist} @@ -35,9 +41,6 @@ Url: http://www.gnu.org/software/freeipmi/ Source0: http://ftp.gnu.org/gnu/freeipmi/%{name}-%{srcversion}.tar.gz Source4: http://ftp.gnu.org/gnu/freeipmi/%{name}-%{srcversion}.tar.gz.sig Source5: %{name}.keyring -Source1: bmc-watchdog.service -Source2: ipmidetectd.service -Source3: ipmiseld.service Summary: FreeIPMI License: GPL-3.0+ Group: System/Management @@ -49,7 +52,7 @@ BuildRequires: texinfo %if 0%{?suse_version} > 1010 BuildRequires: fdupes %endif -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} BuildRequires: pkgconfig(systemd) %endif %if 0%{?fedora_version} == 20 || 0%{?rhel_version} >= 700 @@ -83,7 +86,7 @@ Summary: FreeIPMI BMC watchdog Group: System/Management %if 0%{?suse_version} Requires(pre): %fillup_prereq -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %{?systemd_requires} %endif %endif @@ -105,7 +108,7 @@ Requires: freeipmi = %{version} Requires(post): chkconfig Requires(preun): chkconfig %endif -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %{?systemd_requires} %endif @@ -139,8 +142,14 @@ automake --gnu --include-deps --copy --add-missing %else %define docpath %{_docdir}/%{name} %endif + +%if %{has_systemd} +%define configure_systemd --with-systemdsystemunitdir=%{_unitdir} +%endif + %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ --docdir=%{docpath} \ + %{?configure_systemd} \ %{?_enable_debug} --disable-static CFLAGS="%{optflags}" make %{?_smp_mflags} @@ -169,13 +178,6 @@ rm -f %{buildroot}%{_datadir}/doc/packages/freeipmi/INSTALL (cd %{buildroot}/%{_sysconfdir}; rm init.d) %endif -# Add systemd support for openSUSE >= 12.3 -%if 0%{?suse_version} >=1230 -mkdir -p %{buildroot}%{_unitdir} -%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{buildroot}%{_unitdir}/ -rm -r %{buildroot}%{_initddir} -%endif - # fix coherance problems with associated script filenames rm -f %{buildroot}%{_infodir}/dir # kludge to get around rpmlint complaining about 0 length semephore file @@ -214,7 +216,7 @@ fi %if 0%{?suse_version} %{fillup_only} %endif -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %service_add_post bmc-watchdog.service %else if [ "$1" = 1 ]; then @@ -235,7 +237,7 @@ fi %endif %preun bmc-watchdog -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %service_del_preun bmc-watchdog.service %else # @@ -252,7 +254,7 @@ fi %endif %post ipmidetectd -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %service_add_post ipmidetectd.service %else if [ "$1" = 1 ]; then @@ -273,7 +275,7 @@ fi %endif %preun ipmidetectd -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %service_del_preun ipmidetectd.service %else # @@ -338,7 +340,7 @@ fi %{docpath} %endif %config %{_sysconfdir}/freeipmi/ipmiseld.conf -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %{_unitdir}/ipmiseld.service %else %{_initddir}/ipmiseld @@ -442,11 +444,15 @@ fi %dir %{_includedir}/freeipmi/locate %dir %{_includedir}/freeipmi/payload %dir %{_includedir}/freeipmi/record-format +%dir %{_includedir}/freeipmi/record-format/oem %dir %{_includedir}/freeipmi/sdr +%dir %{_includedir}/freeipmi/sdr/oem %dir %{_includedir}/freeipmi/sel %dir %{_includedir}/freeipmi/sensor-read %dir %{_includedir}/freeipmi/spec +%dir %{_includedir}/freeipmi/spec/oem %dir %{_includedir}/freeipmi/templates +%dir %{_includedir}/freeipmi/templates/oem %dir %{_includedir}/freeipmi/util %{_includedir}/ipmiconsole.h @@ -466,11 +472,15 @@ fi %{_includedir}/freeipmi/locate/*.h %{_includedir}/freeipmi/payload/ipmi-sol-payload.h %{_includedir}/freeipmi/record-format/*.h +%{_includedir}/freeipmi/record-format/oem/*.h %{_includedir}/freeipmi/sdr/*.h +%{_includedir}/freeipmi/sdr/oem/*.h %{_includedir}/freeipmi/sel/*.h %{_includedir}/freeipmi/sensor-read/*.h %{_includedir}/freeipmi/spec/*.h +%{_includedir}/freeipmi/spec/oem/*.h %{_includedir}/freeipmi/templates/*.h +%{_includedir}/freeipmi/templates/oem/*.h %{_includedir}/freeipmi/util/*.h %{_mandir}/man3/* @@ -479,7 +489,7 @@ fi %doc COPYING.bmc-watchdog %doc DISCLAIMER.bmc-watchdog %doc DISCLAIMER.bmc-watchdog.UC -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %{_unitdir}/bmc-watchdog.service %else %config(noreplace) %{_initddir}/bmc-watchdog @@ -496,7 +506,7 @@ fi %files ipmidetectd %defattr(-,root,root) -%if 0%{?suse_version} >=1230 +%if %{has_systemd} %{_unitdir}/ipmidetectd.service %else %config(noreplace) %{_initddir}/ipmidetectd diff --git a/ipmidetectd.service b/ipmidetectd.service deleted file mode 100644 index 22c15fd..0000000 --- a/ipmidetectd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=IPMI Node Detection Monitoring Daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/ipmidetectd - -[Install] -WantedBy=multi-user.target diff --git a/ipmiseld.service b/ipmiseld.service deleted file mode 100644 index 9bf9ef3..0000000 --- a/ipmiseld.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=IPMI SEL syslog logging daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/ipmiseld - -[Install] -WantedBy=multi-user.target