From patchwork Wed Jun 21 05:50:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 106046 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1761707qgd; Tue, 20 Jun 2017 22:50:41 -0700 (PDT) X-Received: by 10.99.97.76 with SMTP id v73mr30221529pgb.188.1498024241583; Tue, 20 Jun 2017 22:50:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498024241; cv=none; d=google.com; s=arc-20160816; b=R2P/OOkTW+G8LRbL+PQRWUQEDqSdUbbHWq2eCBQkAahBFRJCxW9QYKvafogsqhZDDI DRN54wocA2Nas7mpfOTwfqemvMsw8bEXBmgH+pXdhf2/t1DV0afH9tvCXNtg4tVKSsid ZTb1u86nkkoMAoiOaJMnvSc+PGTcm9/hJEyKBuRP8dxdYYK+2y21yHTwleoMaNOpmMTH K5VHmuBNMhzdBe9dedUkoQ7hN4tP6Fb9zfRkDB+h1nyAWp0pk7RATuQNI9+aNt4YKqdK H/9WKb9rF69w5R6+0SGBKXcKuIi5aSk2efAun1Gb+KbwRMucyEsi2QMUgOL45Onuydmc Mpeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=MvQrtpdvHrkA/ejuEuEsrSGL+bZYCNSgfWmQBylCMd0=; b=C/cV4f5W+ZTi9C/+6MEzoOfpwMzOun6E+U0AIOCya7V3AQ8+yEuEHjZv+tqMMZF2Jb jAVjBxKoGOXTW0M3xb8UiPe8PLfvQQX/Tfhi1FPBISjgayeJTHGWxF2MOk6eoMtB4YHZ vDgbP1XuieHbZFMeq3jn/YqT0L7Pd6179GVKHMKLB1CdS3ok87n5SSjdwoCYs855xLKt YLjzcyetTc9JkDi05FGgZZjVUz/g0ssS+UO3uYPMUS+vuDANLdYQOMFWodOPcRnT6z+4 OqEPwC89KWBfft1QwTk1ZjaztjzOFQoxnP5OqSWufrcV132au+0lKbr5LaAYhGCOWT3U A1kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=NTLgpGTU; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q9si13910896plk.325.2017.06.20.22.50.41; Tue, 20 Jun 2017 22:50:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=NTLgpGTU; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4018D600BB; Wed, 21 Jun 2017 05:50:35 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id BE23F600BB for ; Wed, 21 Jun 2017 05:50:32 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id y7so27793436pfd.3 for ; Tue, 20 Jun 2017 22:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pADC/3UDhnn+W3o9xpYYdePAYzTKOalOV9GKp/yapWg=; b=NTLgpGTULgRzd/7M0IgwXrqPhsCHwk7WRSK1plxOC1arBzkZB9Bb08IDzrAQ1oH6PO 08xkx2kjsLR2XM9ZYPkWiI1bfH9RIWKp4T8FrVC3KNJ/Eh3gbN1pz+5yN64Dd4LuzvxU NerMKPMpAm3y/Ekhn5SBpWTehIPFggWZn1U4fl9F5EhPlWaqL7fT8ZdAInHoIifJeomi /BCwjH+XCfw4oUoyJy75Zh68TTvP90ub6mJ/YuHcE2VQb7c0TVPRYlx3QrOTwgQPQzBf aqcJu8WLgwOnJxSD6OtepPL5+rUX5Unf9PMrZD0P+QlMgOlmKTrGuR7AoCckLRn4JOov R4Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pADC/3UDhnn+W3o9xpYYdePAYzTKOalOV9GKp/yapWg=; b=Cf2BhmPLvhnWoUmeYDXfu4/WYkvKC5LUT7LzYzAwiSGves2F/vs70+ZXeJW2vkceik zQoltMFwY5G4+XTngHAk6X+qhX2dYnyud10egCSfKnB2H30ttMS+OvsDsxeUeo6f7Drw +7KhscoqFr9EoLBB4gJnpDYSkbdseMscVmhIfCXXg+a8jNoFtvHiE1we3k9G4d/ZOn8i kxvxniN7XkezF5NmuG7GJtnRIABl+r39pyOsWjU+qCWD5k62kiTVja9AiY/zV0yy3owJ JYV7E4veG8XNppfBa8amFDE/1kw1nWOEbIZzM83aQEDrHGYXhZEU8+Ei7usAVUgnV7lM z0Qg== X-Gm-Message-State: AKS2vOyga/PHfTfrvdzNoyw3dUfqKmUCsYT4ikgfwPF2xOVmWpvfShHU NIcIrZm5Sseglpue X-Received: by 10.84.175.65 with SMTP id s59mr39409958plb.20.1498024233312; Tue, 20 Jun 2017 22:50:33 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::36d3]) by smtp.gmail.com with ESMTPSA id l85sm30410011pfj.130.2017.06.20.22.50.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 22:50:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 20 Jun 2017 22:50:11 -0700 Message-Id: <20170621055011.41502-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [oe] [meta-oe][PATCH] ipmiutil: Upgrade to 3.0.5 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org license changed information see https://sourceforge.net/p/ipmiutil/code-git/ci/647a155e219e56d9cec8ffc61ad5f43a35a1af3a/tree/COPYING?diff=adb40a4caea4873586803ba5030b79de1bfca601 Signed-off-by: Khem Raj --- .../ipmiutil/ipmiutil/fix_systemd_path.patch | 318 --------------------- .../{ipmiutil_2.9.6.bb => ipmiutil_3.0.5.bb} | 40 ++- 2 files changed, 16 insertions(+), 342 deletions(-) delete mode 100644 meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch rename meta-oe/recipes-support/ipmiutil/{ipmiutil_2.9.6.bb => ipmiutil_3.0.5.bb} (68%) -- 2.13.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch b/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch deleted file mode 100644 index 2fa7c6883..000000000 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil/fix_systemd_path.patch +++ /dev/null @@ -1,318 +0,0 @@ -allow systemd path to be defined by configure option. - -The configure probes the host for systemd path information. - -Upstream Status: Inappropriate [Embedded] - -Signed-off-By: Armin Kuster - -Index: ipmiutil-2.9.6/configure -=================================================================== ---- ipmiutil-2.9.6.orig/configure -+++ ipmiutil-2.9.6/configure -@@ -792,7 +792,6 @@ LTLIBOBJS - 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="" - LIBSENSORS="" - SAM2OBJ="isensor2.o ievents2.o" --SYSTEMD_DIR=/usr/share/ipmiutil - - AC_ARG_ENABLE([useflags], - [ --enable-useflags include environment CFLAGS and LDFLAGS.], -@@ -191,25 +190,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]]],) --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}"` -+ [ --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]]],) -+# Check whether --enable-systemd was given. -+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 -+ _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 -- # 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 -- 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 -- fi -- fi -+ if test "$withval" != no; then -+ systemddir=$withval -+ fi -+fi - fi - - dnl start main logic -@@ -481,7 +497,7 @@ AC_SUBST(INS_LIB) - AC_SUBST(SUBDIR_S) - AC_SUBST(CROSS_CFLAGS) - AC_SUBST(CROSS_LFLAGS) --AC_SUBST(SYSTEMD_DIR) -+AC_SUBST(systemddir) - AC_SUBST(SHR_LINK) - AC_SUBST(pkgconfigdir) - -Index: ipmiutil-2.9.6/Makefile.in -=================================================================== ---- ipmiutil-2.9.6.orig/Makefile.in -+++ ipmiutil-2.9.6/Makefile.in -@@ -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 - 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 - -@@ -47,10 +48,14 @@ install: - ${INSTALL_SCRIPT_SH} ipmi_port.sh ${sysvinit}/ipmi_port - ${INSTALL_SCRIPT_SH} ipmi_info ${sysvinit}/ipmi_info - ${INSTALL_SCRIPT_SH} checksel ${datato} -- ${INSTALL_DATA_SH} ipmiutil_wdt.service ${sysdto} -- ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto} -- ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto} -- ${INSTALL_DATA_SH} ipmi_port.service ${sysdto} -+ -+ if [ ! -z "${systemddir}" ]; then \ -+ $(MKDIR) ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmiutil_wdt.service ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}; \ -+ ${INSTALL_DATA_SH} ipmi_port.service ${sysdto}; \ -+ fi - ${INSTALL_SCRIPT_SH} ipmiutil.env ${datato} - ${INSTALL_SCRIPT_SH} ipmiutil.pre ${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@ diff --git a/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb b/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb similarity index 68% rename from meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb rename to meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb index ee0766ea7..d86fc48e6 100644 --- a/meta-oe/recipes-support/ipmiutil/ipmiutil_2.9.6.bb +++ b/meta-oe/recipes-support/ipmiutil/ipmiutil_3.0.5.bb @@ -13,23 +13,20 @@ is detected." HOMEPAGE = "http://ipmiutil.sourceforge.net" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f9372493401f309e6149dd2ce0a044b" +LIC_FILES_CHKSUM = "file://COPYING;md5=626a5970304daa1fcb87f757fb42b795" DEPENDS += "openssl" -PARALLEL_MAKE = "" - SRC_URI = "${SOURCEFORGE_MIRROR}/ipmiutil/ipmiutil-${PV}.tar.gz \ - file://fix_systemd_path.patch " - -SRC_URI[md5sum] = "462087995f05fa9e692ed7f55c840f71" -SRC_URI[sha256sum] = "884c1f3d8bfb0b33c303973d286c3166f5a537976451a0312e3524af54771519" +" +SRC_URI[md5sum] = "5feaf6a827205792e057bb4ff5c4e842" +SRC_URI[sha256sum] = "b2d7f72535131c7832ba4be13dc33c81513fc3ee43fe797b4b52014600ecee5e" inherit autotools-brokensep pkgconfig systemd PACKAGECONFIG ?= "lanplus gpl" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-systemd=${datadir}/${BPN}, --enable-systemd=no" +PACKAGECONFIG[systemd] = "--enable-systemd=yes,--enable-systemd=no" PACKAGECONFIG[sha256] = "--enable-sha256, --enable-sha256=no, openssl-native, openssl" PACKAGECONFIG[lanplus] = "--enable-lanplus, --enable-lanplus=no, openssl-native, openssl" PACKAGECONFIG[landesk] = "--enable-landesk, --enable-landesk=no" @@ -40,23 +37,18 @@ PACKAGECONFIG[gpl] = "--enable-gpl, --enable-gpl=no" #no GPL or LanPlus libs PACKAGECONFIG[standalone] = "--enable-standalone, --enable-standalone=no" -CFLAGS += "-I${STAGING_INCDIR}" -LDFLAGS += "-L${STAGING_LIBDIR}" - -do_configure () { - aclocal - libtoolize --automake --copy --force - autoheader - automake --foreign --add-missing --copy +EXTRA_OECONF += "--enable-useflags" +CFLAGS += "-fPIC" - aclocal - autoconf - automake --foreign - ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} +do_configure_prepend() { + ./beforeconf.sh + sed -i -e "s#rpm#/bin/false#g" ${S}/configure.ac } - -do_install () { - oe_runmake install DESTDIR=${D} +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + mv ${D}/ipmiutil/*.service ${D}${systemd_unitdir}/system + fi + rm -rf ${D}/ipmiutil } - COMPATIBLE_HOST = '(x86_64|i.86).*-linux'