diff --git a/debian/rules b/debian/rules
index 4e0454db899933ac63eacb513b31eec803bbc7b3..3cbe40c695269789f502bd8e677e49218b68bf62 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
endif
# The archdir map has been copied from openjdk-6's debian/rules.
-JAVA_ARCHDIR_MAP = alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc \
- i386=i386 lpia=i386 m68k=m68k mips=mips mipsel=mipsel \
- powerpc=ppc sparc=sparc s390=s390 ia64=ia64
+JAVA_ARCHDIR_MAP = armel=arm hppa=parisc lpia=i386 powerpc=ppc
JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \
$(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP))))
+ifeq (,$(JAVA_ARCHDIR))
+ JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
+endif
JAVA_HOME = /usr/lib/jvm/java-6-openjdk
JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
--localstatedir=/var --sysconfdir=/etc \
--with-perl-bindings="INSTALLDIRS=vendor" \
--without-libstatgrab \
+ --without-included-ltdl \
+ --disable-static \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
confflags += --disable-apple_sensors --disable-tape
+# libnetapp is required for the netapp plugin.
+confflags += --disable-netapp
+
# libowcapi is required for the onewire plugin.
confflags += --disable-onewire
# libclntsh is required for the oracle plugin.
confflags += --disable-oracle
+# librouteros is required for the routeros plugin.
+confflags += --disable-routeros
+
# rrdclient support in librrd is required for the rrdcached plugin.
confflags += --disable-rrdcached
+# libtokyotyrant is required for the tokyotyrant plugin.
+confflags += --disable-tokyotyrant
+
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
+# libkstat is required for the xfs_arc plugin.
+confflags += --disable-zfs-arc
+
# The static library netstat cannot be linked into shared objects on some
# architectures (see bugs #358637, #419684 and #524593 for more details).
ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel))
confflags += --disable-netlink
endif
+# These plugins are Linux-specific.
+ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
+ confflags += \
+ --disable-iptables \
+ --disable-ipvs \
+ --disable-netlink
+endif
+
+# Build-dependencies of these plugins are (not yet) available for kfreebsd.
+ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
+ confflags += \
+ --disable-gmond \
+ --disable-libvirt \
+ --disable-java
+endif
+
+# The hppa buildds currently do not keep up with Java related stuff, thus
+# prevending testing transitions.
+ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa))
+ confflags += --disable-java
+endif
+
config.status: configure $(DPATCH_STAMPFN)
dh_testdir
PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \
./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
JAVAC="$(JAVAC)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
- JAVA_LDFLAGS="$(JAVA_LDFLAGS)"
+ JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
+ || ( status=$$?; cat config.log; exit $$status )
build: build-stamp
perl ./debian/bin/gen_plugin_deps.pl
- mkdir -p debian/collectd/usr/share/lintian/overrides/
- cp debian/collectd.overrides \
- debian/collectd/usr/share/lintian/overrides/collectd
+ mkdir -p debian/collectd-core/usr/share/lintian/overrides/
+ cp debian/collectd-core.overrides \
+ debian/collectd-core/usr/share/lintian/overrides/collectd-core
binary-indep: install-indep
dh_testdir
contrib/exec-nagios.conf contrib/exec-nagios.px \
contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \
contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
- contrib/collectd-network.py contrib/collectd-unixsock.py \
- contrib/snmp-probe-host.px
+ contrib/collectd_network.py contrib/collectd_unixsock.py \
+ contrib/snmp-probe-host.px contrib/GenericJMX.conf \
+ debian/collectd.conf debian/filters.conf debian/thresholds.conf
+ # some upstream tarballs have been built inside a dirty working dir
+ ( cd debian/collectd-core/ \
+ && cd usr/share/doc/collectd-core/examples/collection3/ \
+ && rm -f bin/foo bin/test_config.px etc/collection4.conf \
+ && rm -f lib/Collectd/Graph.pm lib/Collectd/Graph/Data.pm \
+ && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \
+ && rm -f lib/Collectd/Graph/MetaData.pm )
dh_installdebconf -a
- dh_installinit -a -- defaults 95
+ dh_installinit -pcollectd-core --name=collectd -- defaults 95
dh_link -a
dh_strip -a --dbg-package=collectd-dbg
dh_compress -a -Xexamples/
dh_fixperms -a
dh_makeshlibs -a
dh_installdeb -a
+ dh_shlibdeps -a -Ncollectd-core -Ncollectd
dpkg-shlibdeps -Tdebian/collectd.substvars \
- -dDepends debian/collectd/usr/sbin/* \
- debian/collectd/usr/lib/collectd/rrdtool.so \
- -dRecommends debian/collectd/usr/lib/collectd/*.so
- dh_shlibdeps -a -Ncollectd
+ -dDepends debian/collectd-core/usr/lib/collectd/rrdtool.so
+ dpkg-shlibdeps -Tdebian/collectd-core.substvars \
+ -dDepends debian/collectd-core/usr/sbin/* \
+ -dSuggests debian/collectd-core/usr/lib/collectd/*.so
+ grep shlibs:Suggests debian/collectd-core.substvars \
+ | sed -e 's/shlibs:Suggests/shlibs:Recommends/' \
+ >> debian/collectd.substvars
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a