Bug#650816: FTBFS on kfreebsd-amd64
Package: openhpi
Version: 2.14.1-1.1
Severity: important
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd
openhpi fails to build on kfreebsd-amd64 because it attemps to build (and
install) a Linux-specific plugin unconditionally:
https://buildd.debian.org/status/package.php?p=openhpi
Please consider attached patch to fix this.
-- System Information:
Debian Release: 6.0.3
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 8.1-1-amd64
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/control'
--- debian/control 2011-12-03 12:41:28 +0000
+++ debian/control 2011-12-03 13:02:12 +0000
@@ -146,7 +146,7 @@ Description: OpenHPI plugin module for I
Package: openhpi-plugin-sysfs
Section: libs
Priority: extra
-Architecture: any
+Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi2 (= ${binary:Version})
Conflicts: libopenhpi
Replaces: libopenhpi
@@ -159,6 +159,21 @@ Description: OpenHPI plugin module for t
This package contains a plugin module that accesses hardware information
presented through the sysfs filesystem.
+Package: openhpi-plugin-watchdog
+Section: libs
+Priority: optional
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi2 (= ${binary:Version})
+Conflicts: libopenhpi
+Replaces: libopenhpi
+Description: OpenHPI plugin module for the Linux watchdog interface
+ OpenHPI is an implementation of the Service Availability Forum's Hardware
+ Platform Interface specification. (See http://www.saforum.org) As
+ such, OpenHPI facilitates the development of computer manageability
+ applications which are not tied to a single hardware vendor's products.
+ .
+ This package contains a plugin module that uses the Linux watchdog API.
+
Package: openhpi
Section: admin
Priority: extra
=== modified file 'debian/libopenhpi2.install'
--- debian/libopenhpi2.install 2011-12-03 12:41:28 +0000
+++ debian/libopenhpi2.install 2011-12-03 12:58:29 +0000
@@ -8,6 +8,5 @@ usr/lib/libopenhpimarshal.so.*
usr/lib/libopenhpiutils.so.*
usr/lib/libopenhpi_ssl.so.*
usr/lib/openhpi/libosahpi.so.*
-usr/lib/openhpi/libwatchdog.so.*
usr/lib/openhpi/libsimulator.so.*
usr/lib/openhpi/*.so
=== added file 'debian/openhpi-plugin-watchdog.install'
--- debian/openhpi-plugin-watchdog.install 1970-01-01 00:00:00 +0000
+++ debian/openhpi-plugin-watchdog.install 2011-12-03 12:58:36 +0000
@@ -0,0 +1 @@
+usr/lib/openhpi/libwatchdog.so.*
=== modified file 'debian/rules'
--- debian/rules 2011-12-03 12:41:28 +0000
+++ debian/rules 2011-12-03 13:33:55 +0000
@@ -14,6 +14,7 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
# The following fails on ia64, because of alignment stuff
@@ -26,6 +27,10 @@ else
CFLAGS += -O2
endif
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+CONFFLAGS += --enable-watchdog
+endif
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -36,7 +41,7 @@ configure-stamp:
# wrong:
# LDFLAGS="-Wl,-z,defs"
chmod +x ltmain.sh configure
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --with-varpath=/var/lib/openhpi --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-daemon --enable-clients --enable-cpp_wrappers --enable-snmp_client --enable-watchdog --enable-ipmi --enable-sysfs --enable-snmp_bc --enable-ipmidirect --enable-remote_client --enable-simulator CFLAGS="$(CFLAGS)"
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --with-varpath=/var/lib/openhpi --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-daemon --enable-clients --enable-cpp_wrappers --enable-snmp_client --enable-ipmi --enable-sysfs --enable-snmp_bc --enable-ipmidirect --enable-remote_client --enable-simulator $(CONFFLAGS) CFLAGS="$(CFLAGS)"
touch configure-stamp
Reply to: