mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

ipmiutil: Update to 3.0.5

Browse Source 
for license change information see
https://sourceforge.net/p/ipmiutil/code-git/ci/647a155e219e56d9cec8ffc61ad5f43a35a1af3a/tree/COPYING?diff=adb40a4caea4873586803ba5030b79de1bfca601

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-06-27 23:14:18 -07:00
committed by Martin Jansa
parent b62538284d
commit 8707287f6d
2 changed files with 30 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch
+25 -216
View File
@@ -6,115 +6,11 @@ Upstream Status: Inappropriate [Embedded]
Signed-off-By: Armin Kuster <akuster@mvista.com> Signed-off-By: Armin Kuster <akuster@mvista.com>
Index: ipmiutil-2.9.6/configure Index: ipmiutil-3.0.5/configure.ac
=================================================================== ===================================================================
--- ipmiutil-2.9.6.orig/configure --- ipmiutil-3.0.5.orig/configure.ac
+++ ipmiutil-2.9.6/configure +++ ipmiutil-3.0.5/configure.ac
@@ -792,7 +792,6 @@ LTLIBOBJS @@ -149,7 +149,6 @@ CROSS_LFLAGS=""
LIBOBJS
pkgconfigdir
SHR_LINK
-SYSTEMD_DIR
CROSS_LFLAGS
CROSS_CFLAGS
SUBDIR_S
@@ -999,7 +998,7 @@ psdir='${docdir}'
libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale'
mandir='${datarootdir}/man'
-
+systemddir='${datarootdir}/ipmiutil'
ac_prev=
ac_dashdash=
for ac_option
@@ -1594,7 +1593,10 @@ Optional Features:
--enable-standalone build standalone, with no GPL or LanPlus libs.
--enable-libsensors build libipmiutil with sensor modules [default=no]
--enable-gpl build with some GPL code [default=no]
- --enable-systemd enable systemd service type=notify support and %_unitdir [default=disabled]
+ --enable-systemd[=systemddir] install systemd unit file. If 'yes'
+ probe the system for unit directory.
+ If a path is specified, assume that
+ is a valid install path. [default=disabled]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -12980,7 +12982,6 @@ CROSS_LFLAGS=""
CROSS_CFLAGS=""
LIBSENSORS=""
SAM2OBJ="isensor2.o ievents2.o"
-SYSTEMD_DIR=/usr/share/ipmiutil
# Check whether --enable-useflags was given.
if test "${enable_useflags+set}" = set; then
@@ -13032,31 +13033,43 @@ if test "${enable_gpl+set}" = set; then
fi
fi
-
+#
+# Check for systemd unit files direectory exists if unit file installation
+# is requested
+#
# Check whether --enable-systemd was given.
-if test "${enable_systemd+set}" = set; then
- enableval=$enable_systemd;
-fi
-
-if test "x$enable_systemd" = "xyes"; then
- GPL_CFLAGS="$GPL_CFLAGS -DENABLE_SYSTEMD"
- # if systemd enabled, install service scripts in unitdir
- SYSTEMD_DIR=`rpm --eval "%{_unitdir}"`
-else
- # otherwise install the systemd service scripts in the data dir
- if test "x$sysname" = "xDarwin" ; then
- # MacOS 'which' command returns 0 always
- SYSTEMD_DIR=/usr/share/ipmiutil
- else
+if test "${enable_systemd+set}" = set; then :
+ withval=$enable_systemd; if test "$withval" = yes; then
+ GPL_CFLAGS="$GPL_CFLAGS -DENABLE_SYSTEMD"
+ if test -z "$systemddir"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking location of the systemd unit files directory" >&5
+$as_echo_n "checking location of the systemd unit files directory... " >&6; }
+ _rpmdir = ""
which rpm >/dev/null 2>&1
if test $? -eq 0 ; then
- datad=`rpm --eval "%{_datadir}"`
- SYSTEMD_DIR=${datad}/ipmiutil
- else
- SYSTEMD_DIR=/usr/share/ipmiutil
+ _rpmdir = `rpm --eval "%{_unitdir}"`
fi
+ for systemd_d in ${datadir}/usr/share/ipmiutil ${_rpmdir} /usr/share/ipmiutil; do
+ if test -z "$systemddir"; then
+ if test -d "$systemd_d"; then
+ systemddir="$systemd_d"
+ fi
+ fi
+ done
fi
+ if test -n "$systemddir"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $systemddir" >&5
+$as_echo "$systemddir" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ fi
+else
+ if test "$withval" != no; then
+ systemddir=$withval
+ fi
+fi
fi
case "$archm" in
Index: ipmiutil-2.9.6/configure.ac
===================================================================
--- ipmiutil-2.9.6.orig/configure.ac
+++ ipmiutil-2.9.6/configure.ac
@@ -140,7 +140,6 @@ CROSS_LFLAGS=""
CROSS_CFLAGS="" CROSS_CFLAGS=""
LIBSENSORS="" LIBSENSORS=""
SAM2OBJ="isensor2.o ievents2.o" SAM2OBJ="isensor2.o ievents2.o"
@@ -122,7 +18,7 @@ Index: ipmiutil-2.9.6/configure.ac
AC_ARG_ENABLE([useflags], AC_ARG_ENABLE([useflags],
[ --enable-useflags include environment CFLAGS and LDFLAGS.], [ --enable-useflags include environment CFLAGS and LDFLAGS.],
@@ -191,25 +190,42 @@ AC_ARG_ENABLE([gpl], @@ -200,29 +199,42 @@ AC_ARG_ENABLE([gpl],
dnl Does this Linux have systemd enabled? Otherwise use sysv init. dnl Does this Linux have systemd enabled? Otherwise use sysv init.
AC_ARG_ENABLE([systemd], AC_ARG_ENABLE([systemd],
@@ -130,7 +26,12 @@ Index: ipmiutil-2.9.6/configure.ac
-if test "x$enable_systemd" = "xyes"; then -if test "x$enable_systemd" = "xyes"; then
- GPL_CFLAGS="$GPL_CFLAGS -DENABLE_SYSTEMD" - GPL_CFLAGS="$GPL_CFLAGS -DENABLE_SYSTEMD"
- # if systemd enabled, install service scripts in unitdir - # if systemd enabled, install service scripts in unitdir
- SYSTEMD_DIR=`rpm --eval "%{_unitdir}"` - which rpm >/dev/null 2>&1
- if test $? -eq 0 ; then
- SYSTEMD_DIR=`rpm --eval "%{_unitdir}"`
- else
- SYSTEMD_DIR=/usr/share/ipmiutil
- fi
+ [ --enable-systemd[=systemddir] install systemd unit file. If 'yes' + [ --enable-systemd[=systemddir] install systemd unit file. If 'yes'
+ probe the system for unit directory. + probe the system for unit directory.
+ If a path is specified, assume that + If a path is specified, assume that
@@ -164,16 +65,15 @@ Index: ipmiutil-2.9.6/configure.ac
+ fi + fi
else else
- # otherwise install the systemd service scripts in the data dir - # otherwise install the systemd service scripts in the data dir
- if test "x$sysname" = "xDarwin" ; then - SYSTEMD_DIR=/usr/share/ipmiutil
- # MacOS 'which' command returns 0 always - if test "x$sysname" != "xDarwin" ; then
- SYSTEMD_DIR=/usr/share/ipmiutil - if test "x$os" != "xhpux" ; then
- else - # MacOS and HP-UX: 'which' command returns 0 always
- which rpm >/dev/null 2>&1 - which rpm >/dev/null 2>&1
- if test $? -eq 0 ; then - if test $? -eq 0 ; then
- datad=`rpm --eval "%{_datadir}"` - datad=`rpm --eval "%{_datadir}"`
- SYSTEMD_DIR=${datad}/ipmiutil - SYSTEMD_DIR=${datad}/ipmiutil
- else - fi
- SYSTEMD_DIR=/usr/share/ipmiutil
- fi - fi
- fi - fi
+ if test "$withval" != no; then + if test "$withval" != no; then
@@ -183,7 +83,7 @@ Index: ipmiutil-2.9.6/configure.ac
fi fi
dnl start main logic dnl start main logic
@@ -481,7 +497,7 @@ AC_SUBST(INS_LIB) @@ -528,7 +540,7 @@ AC_SUBST(INS_LIB)
AC_SUBST(SUBDIR_S) AC_SUBST(SUBDIR_S)
AC_SUBST(CROSS_CFLAGS) AC_SUBST(CROSS_CFLAGS)
AC_SUBST(CROSS_LFLAGS) AC_SUBST(CROSS_LFLAGS)
@@ -192,74 +92,10 @@ Index: ipmiutil-2.9.6/configure.ac
AC_SUBST(SHR_LINK) AC_SUBST(SHR_LINK)
AC_SUBST(pkgconfigdir) AC_SUBST(pkgconfigdir)
Index: ipmiutil-2.9.6/Makefile.in Index: ipmiutil-3.0.5/scripts/Makefile.am
=================================================================== ===================================================================
--- ipmiutil-2.9.6.orig/Makefile.in --- ipmiutil-3.0.5.orig/scripts/Makefile.am
+++ ipmiutil-2.9.6/Makefile.in +++ ipmiutil-3.0.5/scripts/Makefile.am
@@ -182,7 +182,7 @@ SHELL = @SHELL@
SHR_LINK = @SHR_LINK@
STRIP = @STRIP@
SUBDIR_S = @SUBDIR_S@
-SYSTEMD_DIR = @SYSTEMD_DIR@
+SYSTEMD_DIR = @systemddir@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -233,6 +233,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
+systemddir = @systemddir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
Index: ipmiutil-2.9.6/scripts/Makefile.in
===================================================================
--- ipmiutil-2.9.6.orig/scripts/Makefile.in
+++ ipmiutil-2.9.6/scripts/Makefile.in
@@ -126,7 +126,7 @@ SHELL = @SHELL@
SHR_LINK = @SHR_LINK@
STRIP = @STRIP@
SUBDIR_S = @SUBDIR_S@
-SYSTEMD_DIR = @SYSTEMD_DIR@
+SYSTEMD_DIR = @systemddir@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -195,7 +195,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily
sbinto = ${DESTDIR}${sbindir}
varto = ${DESTDIR}/var/lib/ipmiutil
initto = ${DESTDIR}@INIT_DIR@
-sysdto = ${DESTDIR}@SYSTEMD_DIR@
+sysdto = ${DESTDIR}@systemddir@
+systemddir = @systemddir@
sysvinit = ${datato}
sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm
all: all-am
@@ -398,11 +399,14 @@ install:
${INSTALL_SCRIPT_SH} evt.sh ${datato}
if [ -f /etc/debian_version ]; then \
sysvinit=${initto}; fi
- ${INSTALL_SCRIPT_SH} ipmiutil_wdt ${sysvinit}/ipmiutil_wdt
- ${INSTALL_SCRIPT_SH} ipmiutil_asy ${sysvinit}/ipmiutil_asy
- ${INSTALL_SCRIPT_SH} ipmiutil_evt ${sysvinit}/ipmiutil_evt
- ${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port
- ${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info
+ if [ ! -z "${systemddir}" ]; then \
+ $(MKDIR) ${sysdto}; \
+ ${INSTALL_SCRIPT_SH} ipmiutil_wdt ${sysvinit}/ipmiutil_wdt; \
+ ${INSTALL_SCRIPT_SH} ipmiutil_asy ${sysvinit}/ipmiutil_asy; \
+ ${INSTALL_SCRIPT_SH} ipmiutil_evt ${sysvinit}/ipmiutil_evt; \
+ ${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port; \
+ ${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info; \
+ fi
${INSTALL_SCRIPT_SH} checksel ${datato}
${INSTALL_DATA_SH} ipmiutil_wdt.service ${sysdto}
${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto}
Index: ipmiutil-2.9.6/scripts/Makefile.am
===================================================================
--- ipmiutil-2.9.6.orig/scripts/Makefile.am
+++ ipmiutil-2.9.6/scripts/Makefile.am
@@ -17,7 +17,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily @@ -17,7 +17,8 @@ cronto = ${DESTDIR}${etcdir}/cron.daily
sbinto = ${DESTDIR}${sbindir} sbinto = ${DESTDIR}${sbindir}
varto = ${DESTDIR}/var/lib/ipmiutil varto = ${DESTDIR}/var/lib/ipmiutil
@@ -268,7 +104,7 @@ Index: ipmiutil-2.9.6/scripts/Makefile.am
+sysdto = ${DESTDIR}@systemddir@ +sysdto = ${DESTDIR}@systemddir@
+systemddir = @systemddir@ +systemddir = @systemddir@
sysvinit = ${datato} sysvinit = ${datato}
sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm sbinfls = ialarms ihealth ifru igetevent ireset icmd isol ilan isensor isel iserial iwdt iconfig ipicmg ifirewall ifwum ihpm iuser
@@ -47,10 +48,14 @@ install: @@ -47,10 +48,14 @@ install:
${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port ${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port
@@ -289,30 +125,3 @@ Index: ipmiutil-2.9.6/scripts/Makefile.am
${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato}
${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.pre ${datato}
${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato} ${INSTALL_SCRIPT_SH} ipmiutil.setup ${datato}
Index: ipmiutil-2.9.6/lib/Makefile.in
===================================================================
--- ipmiutil-2.9.6.orig/lib/Makefile.in
+++ ipmiutil-2.9.6/lib/Makefile.in
@@ -128,7 +128,7 @@ SHELL = @SHELL@
SHR_LINK = @SHR_LINK@
STRIP = @STRIP@
SUBDIR_S = @SUBDIR_S@
-SYSTEMD_DIR = @SYSTEMD_DIR@
+SYSTEMD_DIR = @systemddir@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
Index: ipmiutil-2.9.6/lib/lanplus/Makefile.in
===================================================================
--- ipmiutil-2.9.6.orig/lib/lanplus/Makefile.in
+++ ipmiutil-2.9.6/lib/lanplus/Makefile.in
@@ -177,7 +177,8 @@ SHELL = @SHELL@
SHR_LINK = @SHR_LINK@
STRIP = @STRIP@
SUBDIR_S = @SUBDIR_S@
-SYSTEMD_DIR = @SYSTEMD_DIR@
+SYSTEMD_DIR = @systemddir@
+systemddir = @systemddir@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb → meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb
+5 -21
View File
@@ -13,17 +13,17 @@ is detected."
HOMEPAGE = "http://ipmiutil.sourceforge.net" HOMEPAGE = "http://ipmiutil.sourceforge.net"
LICENSE = "BSD-2-Clause" LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f9372493401f309e6149dd2ce0a044b" LIC_FILES_CHKSUM = "file://COPYING;md5=626a5970304daa1fcb87f757fb42b795"
DEPENDS += "openssl" DEPENDS += "openssl"
PARALLEL_MAKE = "" PARALLEL_MAKE = ""
SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \ SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \
file://fix_systemd_path.patch " file://fix_systemd_path.patch \
"
SRC_URI[md5sum] = "462087995f05fa9e692ed7f55c840f71" SRC_URI[md5sum] = "5feaf6a827205792e057bb4ff5c4e842"
SRC_URI[sha256sum] = "884c1f3d8bfb0b33c303973d286c3166f5a537976451a0312e3524af54771519" SRC_URI[sha256sum] = "b2d7f72535131c7832ba4be13dc33c81513fc3ee43fe797b4b52014600ecee5e"
inherit autotools-brokensep pkgconfig systemd inherit autotools-brokensep pkgconfig systemd
@@ -43,20 +43,4 @@ PACKAGECONFIG[standalone] = "--enable-standalone, --enable-standalone=no"
CFLAGS += "-I${STAGING_INCDIR}" CFLAGS += "-I${STAGING_INCDIR}"
LDFLAGS += "-L${STAGING_LIBDIR}" LDFLAGS += "-L${STAGING_LIBDIR}"
do_configure () {
aclocal
libtoolize --automake --copy --force
autoheader
automake --foreign --add-missing --copy
aclocal
autoconf
automake --foreign
./configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
}
do_install () {
oe_runmake install DESTDIR=${D}
}
COMPATIBLE_HOST = '(x86_64|i.86).*-linux' COMPATIBLE_HOST = '(x86_64|i.86).*-linux'