Bug 96333 - [patch] make sysutils/ipmitool compatible with sysutils/ipmi-kmod
Summary: [patch] make sysutils/ipmitool compatible with sysutils/ipmi-kmod
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Sam Lawrance
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-04-25 21:30 UTC by Nick Barkas
Modified: 2006-05-14 14:32 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Nick Barkas 2006-04-25 21:30:17 UTC
	I've submitted a pr (http://www.freebsd.org/cgi/query-pr.cgi?pr=96324) to
    create a new port, sysutils/ipmi-kmod. This port will install an ipmi driver
    for FreeBSD 6.x. Currently, sysutils/ipmitool will work only with the base
    system ipmi driver in FreeBSD 7.x. This is a small patch to
    sysutils/ipmitool's makefile which will install an ipmitool that will also
    work with the ipmi-kmod port if installed, while still remaining compatible
    with the built-in ipmi in 7.x.

Fix: 

Here is a patch to ports/sysutils/ipmitool/Makefile,v 1.8:
    http://dpw.threerings.net/projects/ipmi-kmod/ipmitool.patch and its gpg
    signature: http://dpw.threerings.net/projects/ipmi-kmod/ipmitool.patch.sig
How-To-Repeat: 	Install sysutils/ipmi-kmod on FreeBSD 6.x, then install sysutils/ipmitool.
    ipmitool will only work over the network even when the driver from ipmi-kmod
    is installed, just as if there were no ipmi driver installed at all.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-04-25 21:32:33 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 2 Dmitry Frolov 2006-05-12 05:09:12 UTC
Hello!

Below is a slightly different patch from maintainer.
Description:

 - Install sysutils/ipmi-kmod port as dependancy on systems
   without ipmi(4) driver.

diff -ruN /usr/ports/sysutils/ipmitool/Makefile ./Makefile
--- /usr/ports/sysutils/ipmitool/Makefile	Thu Mar 23 01:29:18 2006
+++ ./Makefile	Fri May 12 11:04:06 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipmitool
 PORTVERSION=	1.8.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,10 +38,12 @@
 
 .include <bsd.port.pre.mk>
 
-# FreeBSD has OpenIPMI-compatible driver, ipmi(4),
-# in 7-current after 2006-02-12. On older systems
-# only lan and lanplus interfaces are supported.
 .if exists(/usr/include/sys/ipmi.h)
+OPENIPMI_OPT=	--enable-intf-open
+.elif !defined(WITHOUT_IPMI_KMOD_PORT) || \
+	exists(${LOCALBASE}/include/sys/ipmi.h)
+BUILD_DEPENDS+=	${LOCALBASE}/include/sys/ipmi.h:${PORTSDIR}/sysutils/ipmi-kmod
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 OPENIPMI_OPT=	--enable-intf-open
 .else
 OPENIPMI_OPT=	--disable-intf-open

    wbr&w, dmitry.
-- 
Dmitry Frolov <frolov@riss-telecom.ru>
RISS-Telecom Network, Novosibirsk, Russia
66415911@ICQ, +7 3832 NO WA1T, DVF-RIPE
Comment 3 Dmitry Frolov 2006-05-12 06:13:22 UTC
Sorry for the noise, but here is another patch. It will not require
sysutils/ipmi-kmod port by default since that requires kernel sources to
build and also doesn't build on some archs.

diff -ruN /usr/ports/sysutils/ipmitool/Makefile ./Makefile
--- /usr/ports/sysutils/ipmitool/Makefile	Thu Mar 23 01:29:18 2006
+++ ./Makefile	Fri May 12 12:11:18 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipmitool
 PORTVERSION=	1.8.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,10 +38,12 @@
 
 .include <bsd.port.pre.mk>
 
-# FreeBSD has OpenIPMI-compatible driver, ipmi(4),
-# in 7-current after 2006-02-12. On older systems
-# only lan and lanplus interfaces are supported.
 .if exists(/usr/include/sys/ipmi.h)
+OPENIPMI_OPT=	--enable-intf-open
+.elif defined(WITH_IPMITOOL_IPMI_KMOD_PORT) || \
+	exists(${LOCALBASE}/include/sys/ipmi.h)
+BUILD_DEPENDS+=	${LOCALBASE}/include/sys/ipmi.h:${PORTSDIR}/sysutils/ipmi-kmod
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 OPENIPMI_OPT=	--enable-intf-open
 .else
 OPENIPMI_OPT=	--disable-intf-open

    wbr&w, dmitry.
-- 
Dmitry Frolov <frolov@riss-telecom.ru>
RISS-Telecom Network, Novosibirsk, Russia
66415911@ICQ, +7 3832 NO WA1T, DVF-RIPE
Comment 4 Sam Lawrance freebsd_committer freebsd_triage 2006-05-13 13:27:40 UTC
State Changed
From-To: feedback->open

Maintainer approved. 


Comment 5 Sam Lawrance freebsd_committer freebsd_triage 2006-05-13 13:27:40 UTC
Responsible Changed
From-To: freebsd-ports-bugs->lawrance

Take.
Comment 6 Sam Lawrance freebsd_committer freebsd_triage 2006-05-14 14:32:25 UTC
State Changed
From-To: open->closed

Committed, thanks!