packages: ipmiutil/ipmiutil-am.patch, ipmiutil/ipmiutil-am2.patch, ipmiutil...
gotar
gotar at pld-linux.org
Tue Jan 5 15:53:45 CET 2010
Author: gotar Date: Tue Jan 5 14:53:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 2.3.9
---- Files affected:
packages/ipmiutil:
ipmiutil-am.patch (1.3 -> 1.4) , ipmiutil-am2.patch (1.4 -> 1.5) , ipmiutil-make-jN.patch (1.5 -> 1.6) , ipmiutil.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: packages/ipmiutil/ipmiutil-am.patch
diff -u packages/ipmiutil/ipmiutil-am.patch:1.3 packages/ipmiutil/ipmiutil-am.patch:1.4
--- packages/ipmiutil/ipmiutil-am.patch:1.3 Wed Dec 13 01:01:32 2006
+++ packages/ipmiutil/ipmiutil-am.patch Tue Jan 5 15:53:39 2010
@@ -4,6 +4,6 @@
-SUBDIRS = doc freeipmi lib util
+SUBDIRS = util
- PKGDIR = /usr/src/redhat
+ PKGDIR = @PKG_DIR@
SOURCEDIR = $(PKGDIR)/SOURCES
BUILDDIR = $(PKGDIR)/BUILD
================================================================
Index: packages/ipmiutil/ipmiutil-am2.patch
diff -u packages/ipmiutil/ipmiutil-am2.patch:1.4 packages/ipmiutil/ipmiutil-am2.patch:1.5
--- packages/ipmiutil/ipmiutil-am2.patch:1.4 Tue Jan 5 15:33:09 2010
+++ packages/ipmiutil/ipmiutil-am2.patch Tue Jan 5 15:53:39 2010
@@ -22,13 +22,14 @@
ipmi_port_SOURCES = ipmi_port.c
-@@ -82,10 +84,5 @@
+@@ -82,11 +84,5 @@
all-am: Makefile $(sbin_PROGRAMS) $(EXTRA_PROGRAMS)
-install-data-am: $(EXTRA_PROGRAMS)
-- $(INSTALLBIN) events $(DESTDIR)/$(datadir)/ipmiutil
-- $(INSTALLBIN) ipmi_port $(DESTDIR)/$(datadir)/ipmiutil
+- mkdir -p $(DESTDIR)$(extradir)
+- $(INSTALLBIN) events $(DESTDIR)$(extradir)
+- $(INSTALLBIN) ipmi_port $(DESTDIR)$(extradir)
- cd $(DESTDIR)/$(sbindir); strip $(sbin_PROGRAMS)
-
clean-generic:
================================================================
Index: packages/ipmiutil/ipmiutil-make-jN.patch
diff -u packages/ipmiutil/ipmiutil-make-jN.patch:1.5 packages/ipmiutil/ipmiutil-make-jN.patch:1.6
--- packages/ipmiutil/ipmiutil-make-jN.patch:1.5 Tue Jan 5 15:33:10 2010
+++ packages/ipmiutil/ipmiutil-make-jN.patch Tue Jan 5 15:53:39 2010
@@ -1,33 +1,34 @@
--- ipmiutil-2.2.0/util/Makefile.am.orig 2008-08-25 22:08:37.000000000 +0200
+++ ipmiutil-2.2.0/util/Makefile.am 2008-08-28 00:43:08.614118386 +0200
-@@ -52,47 +52,23 @@
+@@ -54,52 +54,23 @@
LDADD += -lpthread
sbin_PROGRAMS = ipmiutil idiscover
-EXTRA_PROGRAMS = events ipmi_port libipmiutil.a
+EXTRA_PROGRAMS = events ipmi_port
+noinst_LTLIBRARIES = libipmiutil.la libimbapi.la
- TESTPROGS = bmcconfig xmlconfig ipmimv
+ TESTPROGS = bmcconfig xmlconfig ipmimv ipmi_sample
OLDPROGS = alarms bmchealth fruconfig getevent hwreset icmd isolconsole pefconfig sensor showsel tmconfig wdt
# xmlconfig dropped
# To build an imb api library (libimbapi.a):
-libimbapi.a: imbapi.c
-- $(CC) -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c
+- $(CC) -I. -I.. @OSFLAG@ -fPIC $(CFLAGS) -c imbapi.c
- $(AR) cru libimbapi.a imbapi.o
- $(RANLIB) libimbapi.a
- rm -f imbapi.o
+libimbapi_la_SOURCES = imbapi.c
-+libimbapi_la_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC -c
++libimbapi_la_CFLAGS = -I. -I.. -DLINUX -fPIC -c
# To build a lib to support all of the IPMI drivers (libipmiutil.a)
-libipmiutil.a: $(CMDMOD:.c=.o) @LANPLUS_LIB@
- if [ -f "@LANPLUS_LIB@" ]; then \
+- $(CC) $(CFLAGS_SAM) -c ipmilanplus.c; \
- ar x @LANPLUS_LIB@ ; fi
- $(AR) cru libipmiutil.a $(CMDMOD:.c=.o) $(LANPLUS_OBJ)
- $(RANLIB) libipmiutil.a
- if [ -f "@LANPLUS_LIB@" ]; then \
-- rm -f $(LANPLUS_OBJ) ; fi
+- rm -f $(LANPLUS_OBJ) ipmilanplus.o; fi
+libipmiutil_la_SOURCES = $(CMDMOD)
+libipmiutil_la_LIBADD = @LANPLUS_LIB@
+libipmiutil_la_CFLAGS = $(AM_CFLAGS)
@@ -35,14 +36,18 @@
# To build ipmiutil, need to use METACFLAGS for each .c/.o
-idiscover: idiscover.c
-- $(CC) $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c
+- $(CC) @OS_CFLAGS@ $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c
-
-ipmimv: ipmimv.c
-- $(CC) $(CFLAGS) $(LDFLAGS) -DTEST_BIN -o ipmimv ipmimv.c
+- $(CC) @OS_CFLAGS@ $(CFLAGS) $(LDFLAGS) -DTEST_BIN -o ipmimv ipmimv.c
-
-events: events.c
- $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o events events.c
-
+-ipmi_sample: libipmiutil.a ipmi_sample.c
+- $(CC) $(CFLAGS_SAM) -c ipmi_sample.c
+- $(CC) -g -O2 -o ipmi_sample ipmi_sample.o libipmiutil.a $(LDFLAGS) $(LDADD)
+-
-ipmi_port: ipmi_port.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c
-
@@ -53,5 +58,5 @@
- $(CC) $(CFLAGS) $(LDFLAGS) -o bmcconfig bmcconfig.c libipmiutil.a @LANPLUS_CRYPTO@
-
ipmiutil_SOURCES = $(METASOURCE)
-
- events_SOURCES = events.c
+ # ipmiutil: $(METASOURCE:.c=.o)
+ # $(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o)
================================================================
Index: packages/ipmiutil/ipmiutil.spec
diff -u packages/ipmiutil/ipmiutil.spec:1.17 packages/ipmiutil/ipmiutil.spec:1.18
--- packages/ipmiutil/ipmiutil.spec:1.17 Tue Jan 5 15:33:10 2010
+++ packages/ipmiutil/ipmiutil.spec Tue Jan 5 15:53:39 2010
@@ -3,7 +3,7 @@
Summary: IPMI Management Utilities
Summary(pl.UTF-8): Narzędzia zarządzające IPMI
Name: ipmiutil
-Version: 2.2.4
+Version: 2.3.9
Release: 1
%if %{with gpl}
License: GPL
@@ -12,7 +12,7 @@
%endif
Group: Applications/System
Source0: http://dl.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
-# Source0-md5: 64be42e4d532cac0b27e478723e999f2
+# Source0-md5: 2c0aa5bad1f84ad36f3f9d6294d00739
Patch0: %{name}-am.patch
Patch1: %{name}-make-jN.patch
Patch2: %{name}-am2.patch
@@ -146,6 +146,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2010/01/05 14:53:39 gotar
+- upgraded to 2.3.9
+
Revision 1.17 2010/01/05 14:33:10 gotar
- upgraded to 2.2.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil-am.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil-am2.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil-make-jN.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipmiutil/ipmiutil.spec?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list