@@ -13,11 +13,11 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
LIBSENSORS=""
SAM2OBJ="isensor2.o ievents2.o"
-SYSTEMD_DIR=/usr/share/ipmiutil
-
+
AC_ARG_ENABLE([useflags],
[ --enable-useflags include environment CFLAGS and LDFLAGS.],
@@ -211,29 +210,42 @@ AC_ARG_ENABLE([gpl],
-
+
dnl Does this Linux have systemd enabled? Otherwise use sysv init.
AC_ARG_ENABLE([systemd],
- [ --enable-systemd enable systemd service type=notify support and %_unitdir [[default=disabled]]],)
@@ -79,7 +79,7 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
+ fi
+fi
fi
-
+
dnl start main logic
@@ -563,7 +575,7 @@ AC_SUBST(INS_LIB)
AC_SUBST(SUBDIR_S)
@@ -89,7 +89,7 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
+AC_SUBST(systemddir)
AC_SUBST(SHR_LINK)
AC_SUBST(pkgconfigdir)
-
+
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,7 +17,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily
@@ -101,7 +101,7 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
+systemddir = @systemddir@
sysvinit = ${datato}
sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm iuser
-
+
@@ -47,10 +48,13 @@ install:
${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port
${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info
@@ -117,6 +117,6 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
+ ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}; \
+ ${INSTALL_DATA_SH} ipmi_port.service ${sysdto}; \
+ fi
- ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato}
- ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato}/ipmiutil.env
+ ${INSTALL_SCRIPT_SH} ipmiutil.env.template ${datato}
${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato}
+ ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato}
similarity index 95%
rename from meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.1.9.bb
rename to meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.2.2.bb
@@ -23,7 +23,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \
file://fix_systemd_path.patch \
file://0001-ihpm-Include-stdlib.h-for-malloc-free-atoi-functions.patch \
"
-SRC_URI[sha256sum] = "5ae99bdd1296a8e25cea839784ec39ebca57b0e3701b2d440b8e02e22dc4bc95"
+SRC_URI[sha256sum] = "37f9bc8e6b18c1155e4d5ea38c87b83908b7acc7a44fbc5e3af493f26ef8b767"
inherit autotools-brokensep pkgconfig systemd
Refresh fix_systemd_path.patch for 3.2.2. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- .../ipmiutil/ipmiutil/fix_systemd_path.patch | 14 +++++++------- .../{ipmiutil_3.1.9.bb => ipmiutil_3.2.2.bb} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta-oe/recipes-kernel/ipmiutil/{ipmiutil_3.1.9.bb => ipmiutil_3.2.2.bb} (95%)