From da683d763523ddcb08d5579c9cd12c55be94599c Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 26 2014 18:53:37 +0000 Subject: import OpenIPMI-2.0.19-11.el7.src.rpm --- diff --git a/SOURCES/openipmi.modalias b/SOURCES/openipmi.modalias index 5f635ac..58950a4 100644 --- a/SOURCES/openipmi.modalias +++ b/SOURCES/openipmi.modalias @@ -4,7 +4,7 @@ # Feel free to update as needed. # -alias IPI0001 ipmi_si -alias IPI0001 ipmi_devintf -alias IPI0001 ipmi_msghandler +alias acpi:IPI000*:* ipmi_si +alias acpi:IPI000*:* ipmi_devintf +alias acpi:IPI000*:* ipmi_msghandler diff --git a/SPECS/OpenIPMI.spec b/SPECS/OpenIPMI.spec index c50405e..176a264 100644 --- a/SPECS/OpenIPMI.spec +++ b/SPECS/OpenIPMI.spec @@ -4,8 +4,10 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: IPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI +%global once %{_localstatedir}/run/%{name}/first_installation + Version: 2.0.19 -Release: 7%{?dist} +Release: 11%{?dist} License: LGPLv2+ and GPLv2+ or BSD Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -42,6 +44,8 @@ This package contains the tools of the OpenIPMI project. %package modalias Group: System Environment/Kernel Summary: Module aliases for IPMI subsystem +Requires: systemd +Requires: kmod %description modalias The OpenIPMI-modalias provides configuration file with module aliases @@ -126,6 +130,7 @@ install -d ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d install -m 644 %SOURCE4 ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/OpenIPMI.conf +install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name} rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1 @@ -138,6 +143,22 @@ if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{ %{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz fi +%posttrans modalias +if [ -f "%{once}" ]; then + if /usr/bin/udevadm info --export-db | grep -qie 'acpi:IPI0'; then + /sbin/modprobe ipmi_si || :; + /sbin/modprobe ipmi_devintf || :; + /sbin/modprobe ipmi_msghandler || :; + %{__rm} -f %{once} || :; + /usr/bin/udevadm settle + fi +fi + +%post modalias +if [ "$1" -eq 1 ]; then + /bin/touch %{once} +fi + %post %systemd_post ipmi.service @@ -205,8 +226,22 @@ fi %files modalias %config(noreplace) %{_sysconfdir}/modprobe.d/OpenIPMI.conf +%{_localstatedir}/run/%{name} %changelog +* Fri Jan 24 2014 Daniel Mach - 2.0.19-11 +- Mass rebuild 2014-01-24 + +* Fri Jan 17 2014 Ledvinka Ales - 2.0.19-10 +- Probe kernel modules once after installation finished. + In posttrans. (#1029561) + +* Fri Dec 27 2013 Daniel Mach - 2.0.19-9 +- Mass rebuild 2013-12-27 + +* Wed Nov 13 2013 Ledvinka Ales - 2.0.19-8 +- Correct aliases matching module strings. + * Fri Jul 19 2013 Ledvinka Ales - 2.0.19-7 - Hint compilation to avoid strict aliasing and prevent type-punned pointer issues. - Fix rPath regression for OpenIPMI-perl library.