From c71bf8390b9a06fa498d2cb4f8a4924309f4875e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 11 Apr 2020 11:24:36 +0200 Subject: New upstream version 3.1.6 --- scripts/Makefile | 32 ++++++++++++++++---------------- scripts/Makefile.am | 2 +- scripts/Makefile.in | 2 +- scripts/checksel | 1 + scripts/ipmiutil.env | 22 ---------------------- scripts/ipmiutil.env.template | 22 ++++++++++++++++++++++ 6 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 scripts/ipmiutil.env create mode 100644 scripts/ipmiutil.env.template (limited to 'scripts') diff --git a/scripts/Makefile b/scripts/Makefile index c1e3f39..2961c6d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11 -AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run tar AR = ar -AUTOCONF = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoconf -AUTOHEADER = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoheader -AUTOMAKE = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run automake-1.11 +AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoconf +AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoheader +AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -99,13 +99,13 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump OBJEXT = o -OS_CFLAGS = -DLINUX -DSKIP_MD2 -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 +OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c OS_LFLAGS = OTOOL = @@ -113,9 +113,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.1.5 +PACKAGE_STRING = ipmiutil 3.1.6 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.1.5 +PACKAGE_VERSION = 3.1.6 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 3.1.5 -abs_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5/scripts -abs_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5/scripts -abs_top_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5 -abs_top_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5 +VERSION = 3.1.6 +abs_builddir = /usr/dev/ipmiutil-3.1.6/scripts +abs_srcdir = /usr/dev/ipmiutil-3.1.6/scripts +abs_top_builddir = /usr/dev/ipmiutil-3.1.6 +abs_top_srcdir = /usr/dev/ipmiutil-3.1.6 ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include @@ -159,7 +159,7 @@ host_vendor = redhat htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh +install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.6/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -408,7 +408,7 @@ install: ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto} ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto} ${INSTALL_DATA_SH} ipmi_port.service ${sysdto} - ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} + ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato} ${INSTALL_SCRIPT_SH} ipmi.init.basic ${datato} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 0c7779b..9a89e3b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -51,7 +51,7 @@ install: ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto} ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto} ${INSTALL_DATA_SH} ipmi_port.service ${sysdto} - ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} + ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato} ${INSTALL_SCRIPT_SH} ipmi.init.basic ${datato} diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 9e05d9e..f7dfcd3 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -408,7 +408,7 @@ install: ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto} ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto} ${INSTALL_DATA_SH} ipmi_port.service ${sysdto} - ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} + ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato} ${INSTALL_SCRIPT_SH} ipmi.init.basic ${datato} diff --git a/scripts/checksel b/scripts/checksel index 63ea9a9..11a047e 100755 --- a/scripts/checksel +++ b/scripts/checksel @@ -26,5 +26,6 @@ if [ $? -eq 0 ]; then $pdir/ipmiutil sel -e >$ddir/ipmisel_${today}.txt # Clear the IPMI SEL $pdir/ipmiutil sel -d + /bin/rm -f $ddir/sel.idx fi fi diff --git a/scripts/ipmiutil.env b/scripts/ipmiutil.env deleted file mode 100644 index e06bdda..0000000 --- a/scripts/ipmiutil.env +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# These environment variables go with ipmiutil systemd services. -# -IDATADIR=/usr/share/ipmiutil - -# For ipmiutil_evt -# Its log is /var/log/ipmiutil_evt.log -IPMIUTILEVTARGS="-s -b -t 0" -# to run a script for each IPMI event, use this instead: -# IPMIUTILEVTARGS="-s -b -t 0 -r /usr/share/ipmiutil/evt.sh" - -# For ipmiutil_asy: -# Its log is /var/log/ipmiutil_asy.log - -# For ipmi_port: -IPORTMAP=/etc/init.d/portmap -IMIBDIR=/usr/share/snmp/mibs -IVARDIR=/var/lib/ipmiutil -ISENSOROUT=${IVARDIR}/sensor_out.txt -# This threshold script could be created by ipmiutil sensor -p ... -ITHRESH="${IVARDIR}/thresholds.sh" -IINITDIR=/etc/init.d diff --git a/scripts/ipmiutil.env.template b/scripts/ipmiutil.env.template new file mode 100644 index 0000000..e06bdda --- /dev/null +++ b/scripts/ipmiutil.env.template @@ -0,0 +1,22 @@ +#!/bin/sh +# These environment variables go with ipmiutil systemd services. +# +IDATADIR=/usr/share/ipmiutil + +# For ipmiutil_evt +# Its log is /var/log/ipmiutil_evt.log +IPMIUTILEVTARGS="-s -b -t 0" +# to run a script for each IPMI event, use this instead: +# IPMIUTILEVTARGS="-s -b -t 0 -r /usr/share/ipmiutil/evt.sh" + +# For ipmiutil_asy: +# Its log is /var/log/ipmiutil_asy.log + +# For ipmi_port: +IPORTMAP=/etc/init.d/portmap +IMIBDIR=/usr/share/snmp/mibs +IVARDIR=/var/lib/ipmiutil +ISENSOROUT=${IVARDIR}/sensor_out.txt +# This threshold script could be created by ipmiutil sensor -p ... +ITHRESH="${IVARDIR}/thresholds.sh" +IINITDIR=/etc/init.d -- cgit v1.2.3