SOURCES: ipmiutil-am2.patch, ipmiutil-make-jN.patch - updated for 2.2.0

[qboosh]

Author: qboosh                       Date: Thu Aug 28 04:44:03 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.2.0

---- Files affected:
SOURCES:
   ipmiutil-am2.patch (1.2 -> 1.3) , ipmiutil-make-jN.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/ipmiutil-am2.patch
diff -u SOURCES/ipmiutil-am2.patch:1.2 SOURCES/ipmiutil-am2.patch:1.3
--- SOURCES/ipmiutil-am2.patch:1.2	Sun Jul 20 18:39:43 2008
+++ SOURCES/ipmiutil-am2.patch	Thu Aug 28 06:43:57 2008
@@ -1,17 +1,17 @@
---- ipmiutil-2.1.2/util/Makefile.am.orig	2008-07-20 15:37:30.106034707 +0200
-+++ ipmiutil-2.1.2/util/Makefile.am	2008-07-20 15:44:38.450034707 +0200
-@@ -47,8 +47,8 @@
- METASOURCE = ipmiutil.c alarms.c bmchealth.c events.c fruconfig.c getevent.c hwreset.c icmd.c pefconfig.c sensor.c showsel.c tmconfig.c wdt.c isolconsole.c idiscover.c $(CMDMOD) 
+--- ipmiutil-2.2.0/util/Makefile.am.orig	2008-08-28 00:43:57.162120901 +0200
++++ ipmiutil-2.2.0/util/Makefile.am	2008-08-28 00:44:44.674119225 +0200
+@@ -51,8 +51,8 @@
+ METASOURCE = ipmiutil.c alarms.c bmchealth.c events.c fruconfig.c getevent.c hwreset.c icmd.c pefconfig.c sensor.c showsel.c tmconfig.c wdt.c isolconsole.c idiscover.c bmcconfig.c $(CMDMOD) 
  LDADD += -lpthread
- 
+ 	
 -sbin_PROGRAMS = ipmiutil idiscover 
 -EXTRA_PROGRAMS = events ipmi_port
 +sbin_PROGRAMS = ipmiutil idiscover events
 +EXTRA_PROGRAMS = ipmi_port
  noinst_LTLIBRARIES = libipmiutil.la libimbapi.la
+ TESTPROGS = bmcconfig xmlconfig
  OLDPROGS = alarms bmchealth fruconfig getevent hwreset icmd isolconsole pefconfig sensor showsel tmconfig wdt
- # xmlconfig dropped
-@@ -67,8 +67,10 @@
+@@ -71,8 +71,10 @@
  ipmiutil_SOURCES  = $(METASOURCE) 
  
  events_SOURCES    = events.c
@@ -22,7 +22,7 @@
  
  ipmi_port_SOURCES = ipmi_port.c 
  
-@@ -78,9 +80,5 @@
+@@ -82,9 +84,5 @@
  
  all-am: Makefile $(sbin_PROGRAMS) $(EXTRA_PROGRAMS)
  
@@ -31,4 +31,4 @@
 -	$(INSTALLBIN) ipmi_port $(DESTDIR)/$(datadir)/ipmiutil
 -
  clean-generic:   
- 	rm -f $(EXTRA_PROGRAMS) $(OLDPROGS)
+ 	rm -f $(EXTRA_PROGRAMS) $(OLDPROGS) $(TESTPROGS)

================================================================
Index: SOURCES/ipmiutil-make-jN.patch
diff -u SOURCES/ipmiutil-make-jN.patch:1.3 SOURCES/ipmiutil-make-jN.patch:1.4
--- SOURCES/ipmiutil-make-jN.patch:1.3	Sun Jul 20 18:39:44 2008
+++ SOURCES/ipmiutil-make-jN.patch	Thu Aug 28 06:43:58 2008
@@ -1,12 +1,13 @@
---- ipmiutil-2.1.2/util/Makefile.am.orig	2008-06-24 23:11:30.000000000 +0200
-+++ ipmiutil-2.1.2/util/Makefile.am	2008-07-20 15:04:45.542041412 +0200
-@@ -48,32 +48,21 @@
+--- 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,44 +52,22 @@
  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
  OLDPROGS = alarms bmchealth fruconfig getevent hwreset icmd isolconsole pefconfig sensor showsel tmconfig wdt
  # xmlconfig dropped
  
@@ -21,8 +22,12 @@
   
  # To build a lib to support all of the IPMI drivers (libipmiutil.a)
 -libipmiutil.a:	$(CMDMOD:.c=.o) @LANPLUS_LIB@
--	$(AR) cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@
+-	if [ -f @LANPLUS_LIB@ ]; then \
+-	    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 
 +libipmiutil_la_SOURCES = $(CMDMOD)
 +libipmiutil_la_LIBADD = @LANPLUS_LIB@
 +libipmiutil_la_CFLAGS = $(AM_CFLAGS)
@@ -37,6 +42,13 @@
 -
 -ipmi_port:      ipmi_port.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c 
- 
+-
+-xmlconfig:      xmlconfig.c libipmiutil.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o xmlconfig xmlconfig.c libipmiutil.a @LANPLUS_CRYPTO@
+-
+-bmcconfig:      bmcconfig.c libipmiutil.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o bmcconfig bmcconfig.c libipmiutil.a @LANPLUS_CRYPTO@
+-
  ipmiutil_SOURCES  = $(METASOURCE) 
  
+ events_SOURCES    = events.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ipmiutil-am2.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ipmiutil-make-jN.patch?r1=1.3&r2=1.4&f=u