tags 555866 + patch pending
tags 565105 + patch pending
thanks
Dear Bryan,
in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565105#31 you asked
for someone else to do “a simple fix for the current version”, which I
found in Ubuntu and have uploaded (as 2.14.1-1.1) to Debian unstable,
with no delay because you explicitly asked for this. Note that openhpi
failed even on gcc-4.4 systems (m68k) due to the ld changes.
Please find the debdiff attached. Note that I removed the part of the
debdiff that details the revert from the previous *.diff.gz’s version’s
config.{guess,sub} (which were cp’d from an older autotools-dev version)
to the one in the .orig.tar.gz, which now happens on “clean” (actually
using the autotools-dev versions now occurs in pre-configure).
bye,
//mirabilos
--
FWIW, I'm quite impressed with mksh interactively. I thought it was much
*much* more bare bones. But it turns out it beats the living hell out of
ksh93 in that respect. I'd even consider it for my daily use if I hadn't
wasted half my life on my zsh setup. :-) -- Frank Terbeck in #!/bin/mkshdiff -u openhpi-2.14.1/clients/Makefile.in openhpi-2.14.1/clients/Makefile.in
--- openhpi-2.14.1/clients/Makefile.in
+++ openhpi-2.14.1/clients/Makefile.in
@@ -61,40 +61,51 @@
hpialarms_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_hpiel_OBJECTS = hpiel.$(OBJEXT) $(am__objects_1)
hpiel_OBJECTS = $(am_hpiel_OBJECTS)
-hpiel_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpiel_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpievents_OBJECTS = hpievents.$(OBJEXT) $(am__objects_1)
hpievents_OBJECTS = $(am_hpievents_OBJECTS)
-hpievents_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpievents_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpifan_OBJECTS = hpifan.$(OBJEXT) $(am__objects_1)
hpifan_OBJECTS = $(am_hpifan_OBJECTS)
-hpifan_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpifan_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpiinv_OBJECTS = hpiinv.$(OBJEXT) $(am__objects_1)
hpiinv_OBJECTS = $(am_hpiinv_OBJECTS)
-hpiinv_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpiinv_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpionIBMblade_OBJECTS = hpionIBMblade.$(OBJEXT) $(am__objects_1)
hpionIBMblade_OBJECTS = $(am_hpionIBMblade_OBJECTS)
-hpionIBMblade_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpionIBMblade_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpipower_OBJECTS = hpipower.$(OBJEXT) $(am__objects_1)
hpipower_OBJECTS = $(am_hpipower_OBJECTS)
-hpipower_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpipower_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpireset_OBJECTS = hpireset.$(OBJEXT) $(am__objects_1)
hpireset_OBJECTS = $(am_hpireset_OBJECTS)
hpireset_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_hpisensor_OBJECTS = hpisensor.$(OBJEXT) $(am__objects_1)
hpisensor_OBJECTS = $(am_hpisensor_OBJECTS)
-hpisensor_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpisensor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpisettime_OBJECTS = hpisettime.$(OBJEXT) $(am__objects_1)
hpisettime_OBJECTS = $(am_hpisettime_OBJECTS)
-hpisettime_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpisettime_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpithres_OBJECTS = hpithres.$(OBJEXT) $(am__objects_1)
hpithres_OBJECTS = $(am_hpithres_OBJECTS)
-hpithres_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpithres_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpitop_OBJECTS = hpitop.$(OBJEXT) $(am__objects_1)
hpitop_OBJECTS = $(am_hpitop_OBJECTS)
-hpitop_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpitop_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpitree_OBJECTS = hpitree.$(OBJEXT) $(am__objects_1)
hpitree_OBJECTS = $(am_hpitree_OBJECTS)
-hpitree_DEPENDENCIES = $(am__DEPENDENCIES_1)
+hpitree_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/utils/libopenhpiutils.la
am_hpiwdt_OBJECTS = hpiwdt.$(OBJEXT) $(am__objects_1)
hpiwdt_OBJECTS = $(am_hpiwdt_OBJECTS)
hpiwdt_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -323,31 +334,31 @@
hpialarms_SOURCES = hpialarms.c $(CLIENTS_SRC)
hpialarms_LDADD = $(COMMONLIBS)
hpithres_SOURCES = hpithres.c $(CLIENTS_SRC)
-hpithres_LDADD = $(COMMONLIBS)
+hpithres_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpifan_SOURCES = hpifan.c $(CLIENTS_SRC)
-hpifan_LDADD = $(COMMONLIBS)
+hpifan_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpitop_SOURCES = hpitop.c $(CLIENTS_SRC)
-hpitop_LDADD = $(COMMONLIBS)
+hpitop_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpireset_SOURCES = hpireset.c $(CLIENTS_SRC)
hpireset_LDADD = $(COMMONLIBS)
hpiel_SOURCES = hpiel.c $(CLIENTS_SRC)
-hpiel_LDADD = $(COMMONLIBS)
+hpiel_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpisensor_SOURCES = hpisensor.c $(CLIENTS_SRC)
-hpisensor_LDADD = $(COMMONLIBS)
+hpisensor_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpiwdt_SOURCES = hpiwdt.c $(CLIENTS_SRC)
hpiwdt_LDADD = $(COMMONLIBS)
hpiinv_SOURCES = hpiinv.c $(CLIENTS_SRC)
-hpiinv_LDADD = $(COMMONLIBS)
+hpiinv_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpisettime_SOURCES = hpisettime.c $(CLIENTS_SRC)
-hpisettime_LDADD = $(COMMONLIBS)
+hpisettime_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpievents_SOURCES = hpievents.c $(CLIENTS_SRC)
-hpievents_LDADD = $(COMMONLIBS)
+hpievents_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpipower_SOURCES = hpipower.c $(CLIENTS_SRC)
-hpipower_LDADD = $(COMMONLIBS)
+hpipower_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpitree_SOURCES = hpitree.c $(CLIENTS_SRC)
-hpitree_LDADD = $(COMMONLIBS)
+hpitree_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpionIBMblade_SOURCES = hpionIBMblade.c $(CLIENTS_SRC)
-hpionIBMblade_LDADD = $(COMMONLIBS)
+hpionIBMblade_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
all: all-am
.SUFFIXES:
diff -u openhpi-2.14.1/debian/changelog openhpi-2.14.1/debian/changelog
--- openhpi-2.14.1/debian/changelog
+++ openhpi-2.14.1/debian/changelog
@@ -1,3 +1,22 @@
+openhpi (2.14.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Upload openhpi (2.14.1-1ubuntu1) except debian/control changes
+ to Debian sid (Closes: #565105) (Closes: #555866)
+ * Avoid including autotools-dev copies of config.{guess,sub} in
+ the debian changes (*.diff.gz)
+
+ -- Thorsten Glaser <t...@mirbsd.de> Mon, 18 Jul 2011 22:23:29 +0200
+
+openhpi (2.14.1-1ubuntu1) natty; urgency=low
+
+ * plugins/ipmidirect/ipmi_mc_vendor.cpp: Fix FTBFS with gcc 4.5.
+ Taken from upstream. (LP: #687986)
+ * clients/Makefile.{am,in}: Add missing libraries otherwise it FTBFS.
+ Related to linker '--as-needed' change.
+
+ -- Andres Rodriguez <andres...@ubuntu.com> Fri, 07 Jan 2011 16:17:28 -0500
+
openhpi (2.14.1-1) unstable; urgency=low
* Updated to upstream 2.14.1 version; differences listed at
diff -u openhpi-2.14.1/debian/rules openhpi-2.14.1/debian/rules
--- openhpi-2.14.1/debian/rules
+++ openhpi-2.14.1/debian/rules
@@ -29,6 +29,8 @@
configure: configure-stamp
configure-stamp:
dh_testdir
+ cp -f /usr/share/misc/config.guess config.guess
+ cp -f /usr/share/misc/config.sub config.sub
# Add here commands to configure the package.
# The following Debian defaults don't work...need to figure out what's
# wrong:
@@ -56,13 +58,7 @@
# Add here commands to clean up after the build process.
chmod -x ltmain.sh configure
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
+ rm -f config.guess config.sub
dh_clean
install: build
only in patch2:
unchanged:
--- openhpi-2.14.1.orig/clients/Makefile.am
+++ openhpi-2.14.1/clients/Makefile.am
@@ -33,43 +33,43 @@
hpialarms_LDADD = $(COMMONLIBS)
hpithres_SOURCES = hpithres.c $(CLIENTS_SRC)
-hpithres_LDADD = $(COMMONLIBS)
+hpithres_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpifan_SOURCES = hpifan.c $(CLIENTS_SRC)
-hpifan_LDADD = $(COMMONLIBS)
+hpifan_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpitop_SOURCES = hpitop.c $(CLIENTS_SRC)
-hpitop_LDADD = $(COMMONLIBS)
+hpitop_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpireset_SOURCES = hpireset.c $(CLIENTS_SRC)
hpireset_LDADD = $(COMMONLIBS)
hpiel_SOURCES = hpiel.c $(CLIENTS_SRC)
-hpiel_LDADD = $(COMMONLIBS)
+hpiel_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpisensor_SOURCES = hpisensor.c $(CLIENTS_SRC)
-hpisensor_LDADD = $(COMMONLIBS)
+hpisensor_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpiwdt_SOURCES = hpiwdt.c $(CLIENTS_SRC)
hpiwdt_LDADD = $(COMMONLIBS)
hpiinv_SOURCES = hpiinv.c $(CLIENTS_SRC)
-hpiinv_LDADD = $(COMMONLIBS)
+hpiinv_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpisettime_SOURCES = hpisettime.c $(CLIENTS_SRC)
-hpisettime_LDADD = $(COMMONLIBS)
+hpisettime_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
hpievents_SOURCES = hpievents.c $(CLIENTS_SRC)
-hpievents_LDADD = $(COMMONLIBS)
+hpievents_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpipower_SOURCES = hpipower.c $(CLIENTS_SRC)
-hpipower_LDADD = $(COMMONLIBS)
+hpipower_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpitree_SOURCES = hpitree.c $(CLIENTS_SRC)
-hpitree_LDADD = $(COMMONLIBS)
+hpitree_LDADD = $(COMMONLIBS) $(top_builddir)/utils/libopenhpiutils.la
hpionIBMblade_SOURCES = hpionIBMblade.c $(CLIENTS_SRC)
-hpionIBMblade_LDADD = $(COMMONLIBS)
+hpionIBMblade_LDADD = $(COMMONLIBS)
$(top_builddir)/utils/libopenhpiutils.la
clean-local:
rm -f *~ *.o
only in patch2:
unchanged:
--- openhpi-2.14.1.orig/plugins/ipmidirect/ipmi_mc_vendor.cpp
+++ openhpi-2.14.1/plugins/ipmidirect/ipmi_mc_vendor.cpp
@@ -931,7 +931,7 @@
/* Everything is valid, create the Watchdog RDR */
stdlog << "CreateWatchdogs Resource type " <<
res->EntityPath().GetEntryType(0) << " instance " <<
res->EntityPath().GetEntryInstance(0) << "\n";
- cIpmiRdr *wd = new cIpmiWatchdog::cIpmiWatchdog( mc,
SAHPI_DEFAULT_WATCHDOG_NUM, 0 );
+ cIpmiRdr *wd = new cIpmiWatchdog( mc, SAHPI_DEFAULT_WATCHDOG_NUM, 0
);
wd->EntityPath() = res->EntityPath();
