Hello community,
here is the log from the commit of package OpenIPMI for openSUSE:Factory
checked in at 2018-01-24 15:24:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/OpenIPMI (Old)
and /work/SRC/openSUSE:Factory/.OpenIPMI.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenIPMI"
Wed Jan 24 15:24:49 2018 rev:43 rq:568575 version:2.0.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/OpenIPMI/OpenIPMI.changes 2017-11-30
12:40:32.020515336 +0100
+++ /work/SRC/openSUSE:Factory/.OpenIPMI.new/OpenIPMI.changes 2018-01-24
15:24:50.358260191 +0100
@@ -1,0 +2,10 @@
+Fri Jan 19 08:12:06 UTC 2018 - josef.moell...@suse.com
+
+- * added a section defining IPMI_SI_MODULE_NAME to sysconfig.ipmi
+ * added code to OpenIPMI.spec/%install to modify sysconfig.ipmi
+ according to architecture
+ * modified openipmi-helper to load "sysconfig.ipmi" AFTER setting
+ default IPMI_SI_MODULE_NAME=ipmi_si
+ [bsc#1059820, OpenIPMI.spec, openipmi-helper, sysconfig.ipmi]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenIPMI.spec ++++++
--- /var/tmp/diff_new_pack.Pui0MV/_old 2018-01-24 15:24:51.142223521 +0100
+++ /var/tmp/diff_new_pack.Pui0MV/_new 2018-01-24 15:24:51.142223521 +0100
@@ -1,7 +1,7 @@
#
# spec file for package OpenIPMI
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -134,7 +134,15 @@
install -d %{buildroot}%{_fillupdir}
install -d %{buildroot}%{_unitdir}
install -d %{buildroot}%{_sbindir}
+
+case "%{_arch}" in
+ppc64*) IPMI_SI_MODULE_NAME=ipmi_powernv;;
+aarch64|arm*) IPMI_SI_MODULE_NAME=ipmi_ssif;;
+*) IPMI_SI_MODULE_NAME=ipmi_si;;
+esac
+sed -i
"s/^IPMI_SI_MODULE_NAME=.*/IPMI_SI_MODULE_NAME=\"$IPMI_SI_MODULE_NAME\"/"
%{SOURCE1}
install -m 644 %{SOURCE1} %{buildroot}%{_fillupdir}
+
install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
ln -sv service %{buildroot}%{_sbindir}/rcipmi
install -d %{buildroot}%{_libexecdir}
++++++ openipmi-helper ++++++
--- /var/tmp/diff_new_pack.Pui0MV/_old 2018-01-24 15:24:51.214220154 +0100
+++ /var/tmp/diff_new_pack.Pui0MV/_new 2018-01-24 15:24:51.214220154 +0100
@@ -19,8 +19,6 @@
# bit 5 set = modules are loaded even when asked to be unloaded
CONFIGFILE=/etc/sysconfig/ipmi
-# source config info
-[ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
#############################################################################
# GLOBALS
@@ -36,6 +34,9 @@
IPMI_SI_MODULE_NAME="ipmi_si_drv"
fi
+# source config info
+[ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
+
MODULES_INTERFACES=""
[ "${DEV_IPMI}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES}
ipmi_devintf"
[ "${IPMI_IMB}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES}
ipmi_imb"
++++++ sysconfig.ipmi ++++++
--- /var/tmp/diff_new_pack.Pui0MV/_old 2018-01-24 15:24:51.238219031 +0100
+++ /var/tmp/diff_new_pack.Pui0MV/_new 2018-01-24 15:24:51.238219031 +0100
@@ -8,6 +8,15 @@
IPMI_SI=yes
## Path: Hardware/IPMI
+## Description: Name of driver to access hardware interfaces
+## Type: string
+## Default: "ipmi_si"
+## Config: ipmi
+# Name of driver to access hardware interfaces
+# This is only used when IPMI_SI=yes
+IPMI_SI_MODULE_NAME="ipmi_si"
+
+## Path: Hardware/IPMI
## Description: Enable /dev/ipmi0 interface, used by ipmitool, ipmicmd,
## Type: yesno
## Default: "yes"
