mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 17:19:23 +00:00
collectd: add recipe for 5.2.2
Based on initial version by Koen Kooi <koen@beagleboard.org>. Initscript borrowed from Debian with some tweaks. Note that since collectd uses libltdl, building this successfully required OE-Core commit db84eaf851b22b262d9dc48eb55bd5224a00fdd2 or else you get an error about "config/compile" being missing. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Paul Eggleton
committed by
Martin Jansa
Martin Jansa
parent
9e7327e446
commit
2fc71a181e
@@ -0,0 +1,31 @@
|
|||||||
|
Don't pick up version string from parent git repository
|
||||||
|
|
||||||
|
If the collectd source is extracted from a tarball underneath a
|
||||||
|
directory structure that includes another git repository, that
|
||||||
|
repository will be picked up by "git describe" which is not
|
||||||
|
desirable. Check whether collectd itself is a git repository and just
|
||||||
|
use the default version if not.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||||
|
|
||||||
|
diff --git a/version-gen.sh b/version-gen.sh
|
||||||
|
index e344541..d1c0929 100755
|
||||||
|
--- a/version-gen.sh
|
||||||
|
+++ b/version-gen.sh
|
||||||
|
@@ -2,7 +2,10 @@
|
||||||
|
|
||||||
|
DEFAULT_VERSION="5.2.2.git"
|
||||||
|
|
||||||
|
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
|
||||||
|
+VERSION=""
|
||||||
|
+if test -d .git ; then
|
||||||
|
+ VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
|
||||||
|
+fi
|
||||||
|
|
||||||
|
if test -z "$VERSION"; then
|
||||||
|
VERSION="$DEFAULT_VERSION"
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
||||||
@@ -0,0 +1,201 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# collectd - start and stop the statistics collection daemon
|
||||||
|
# http://collectd.org/
|
||||||
|
#
|
||||||
|
# Copyright (C) 2005-2006 Florian Forster <octo@verplant.org>
|
||||||
|
# Copyright (C) 2006-2009 Sebastian Harl <tokkee@debian.org>
|
||||||
|
#
|
||||||
|
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: collectd
|
||||||
|
# Required-Start: $local_fs $remote_fs
|
||||||
|
# Required-Stop: $local_fs $remote_fs
|
||||||
|
# Should-Start: $network $named $syslog $time cpufrequtils
|
||||||
|
# Should-Stop: $network $named $syslog
|
||||||
|
# Default-Start: 2 3 4 5
|
||||||
|
# Default-Stop: 0 1 6
|
||||||
|
# Short-Description: manage the statistics collection daemon
|
||||||
|
# Description: collectd is the statistics collection daemon.
|
||||||
|
# It is a small daemon which collects system information
|
||||||
|
# periodically and provides mechanisms to monitor and store
|
||||||
|
# the values in a variety of ways.
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
|
. /etc/init.d/functions
|
||||||
|
|
||||||
|
export PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
|
||||||
|
DISABLE=0
|
||||||
|
|
||||||
|
NAME=collectd
|
||||||
|
DAEMON=/usr/sbin/collectd
|
||||||
|
|
||||||
|
CONFIGFILE=/etc/collectd.conf
|
||||||
|
PIDFILE=/var/run/collectd.pid
|
||||||
|
|
||||||
|
USE_COLLECTDMON=1
|
||||||
|
COLLECTDMON_DAEMON=/usr/sbin/collectdmon
|
||||||
|
COLLECTDMON_PIDFILE=/var/run/collectdmon.pid
|
||||||
|
|
||||||
|
MAXWAIT=30
|
||||||
|
|
||||||
|
# Gracefully exit if the package has been removed.
|
||||||
|
test -x $DAEMON || exit 0
|
||||||
|
|
||||||
|
if [ -r /etc/default/$NAME ]; then
|
||||||
|
. /etc/default/$NAME
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$ENABLE_COREFILES" == 1; then
|
||||||
|
ulimit -c unlimited
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$USE_COLLECTDMON" == 1; then
|
||||||
|
_PIDFILE="$COLLECTDMON_PIDFILE"
|
||||||
|
else
|
||||||
|
_PIDFILE="$PIDFILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# return:
|
||||||
|
# 0 if config is fine
|
||||||
|
# 1 if there is a syntax error
|
||||||
|
# 2 if there is no configuration
|
||||||
|
check_config() {
|
||||||
|
if test ! -e "$CONFIGFILE"; then
|
||||||
|
return 2
|
||||||
|
fi
|
||||||
|
if ! $DAEMON -t -C "$CONFIGFILE"; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# return:
|
||||||
|
# 0 if the daemon has been started
|
||||||
|
# 1 if the daemon was already running
|
||||||
|
# 2 if the daemon could not be started
|
||||||
|
# 3 if the daemon was not supposed to be started
|
||||||
|
d_start() {
|
||||||
|
if test "$DISABLE" != 0; then
|
||||||
|
# we get here during restart
|
||||||
|
echo "disabled by /etc/default/$NAME"
|
||||||
|
return 3
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test ! -e "$CONFIGFILE"; then
|
||||||
|
# we get here during restart
|
||||||
|
echo "disabled, no configuration ($CONFIGFILE) found"
|
||||||
|
return 3
|
||||||
|
fi
|
||||||
|
|
||||||
|
check_config
|
||||||
|
rc="$?"
|
||||||
|
if test "$rc" -ne 0; then
|
||||||
|
echo "not starting, configuration error"
|
||||||
|
return 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$USE_COLLECTDMON" == 1; then
|
||||||
|
start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
|
||||||
|
--exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \
|
||||||
|
|| return 2
|
||||||
|
else
|
||||||
|
start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
|
||||||
|
--exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE" \
|
||||||
|
|| return 2
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
still_running_warning="
|
||||||
|
WARNING: $NAME might still be running.
|
||||||
|
In large setups it might take some time to write all pending data to
|
||||||
|
the disk. You can adjust the waiting time in /etc/default/collectd."
|
||||||
|
|
||||||
|
# return:
|
||||||
|
# 0 if the daemon has been stopped
|
||||||
|
# 1 if the daemon was already stopped
|
||||||
|
# 2 if daemon could not be stopped
|
||||||
|
d_stop() {
|
||||||
|
PID=$( cat "$_PIDFILE" 2> /dev/null ) || true
|
||||||
|
|
||||||
|
start-stop-daemon --stop --quiet --oknodo --pidfile "$_PIDFILE"
|
||||||
|
rc="$?"
|
||||||
|
|
||||||
|
if test "$rc" -eq 2; then
|
||||||
|
return 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
if test -n "$PID" && kill -0 $PID 2> /dev/null; then
|
||||||
|
i=0
|
||||||
|
while kill -0 $PID 2> /dev/null; do
|
||||||
|
i=$(( $i + 2 ))
|
||||||
|
echo -n " ."
|
||||||
|
|
||||||
|
if test $i -gt $MAXWAIT; then
|
||||||
|
echo "$still_running_warning"
|
||||||
|
return 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
return "$rc"
|
||||||
|
fi
|
||||||
|
return "$rc"
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
echo -n "Starting $NAME"
|
||||||
|
d_start
|
||||||
|
case "$?" in
|
||||||
|
0|1) echo "." ;;
|
||||||
|
*) exit 1 ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
echo -n "Stopping $NAME"
|
||||||
|
d_stop
|
||||||
|
case "$?" in
|
||||||
|
0|1) echo "." ;;
|
||||||
|
*) exit 1 ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
status_of_proc -p "$_PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||||
|
;;
|
||||||
|
restart|force-reload)
|
||||||
|
echo -n "Restarting $NAME"
|
||||||
|
check_config
|
||||||
|
rc="$?"
|
||||||
|
if test "$rc" -eq 1; then
|
||||||
|
echo "not restarting, configuration error"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
d_stop
|
||||||
|
rc="$?"
|
||||||
|
case "$rc" in
|
||||||
|
0|1)
|
||||||
|
sleep 1
|
||||||
|
d_start
|
||||||
|
rc2="$?"
|
||||||
|
case "$rc2" in
|
||||||
|
0|1) echo "." ;;
|
||||||
|
*) exit 1 ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
|
||||||
|
exit 3
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# vim: syntax=sh noexpandtab sw=4 ts=4 :
|
||||||
|
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
Disable defaulting of GCRYPT_LDFLAGS to -L/usr/lib
|
||||||
|
|
||||||
|
Prevents "unsafe for cross compilation" warnings that cause
|
||||||
|
do_qa_configure to fail.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
|
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||||
|
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 98395ed..81c3a2c 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -1777,11 +1777,11 @@ then
|
||||||
|
GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null`
|
||||||
|
fi
|
||||||
|
|
||||||
|
- if test "x$GCRYPT_LDFLAGS" = "x"
|
||||||
|
- then
|
||||||
|
- gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null`
|
||||||
|
- GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib"
|
||||||
|
- fi
|
||||||
|
+# if test "x$GCRYPT_LDFLAGS" = "x"
|
||||||
|
+# then
|
||||||
|
+# gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null`
|
||||||
|
+# GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib"
|
||||||
|
+# fi
|
||||||
|
|
||||||
|
if test "x$GCRYPT_LIBS" = "x"
|
||||||
|
then
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
SUMMARY = "Collects and summarises system performance statistics"
|
||||||
|
DESCRIPTION = "collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files."
|
||||||
|
LICENSE = "GPLv2"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
|
DEPENDS = "rrdtool curl mysql5 libpcap libxml2 yajl libgcrypt libtool"
|
||||||
|
|
||||||
|
SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
|
||||||
|
file://no-gcrypt-badpath.patch \
|
||||||
|
file://collectd-version.patch \
|
||||||
|
file://collectd.init"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "29e61411e51845d5ae71ab676078867e"
|
||||||
|
SRC_URI[sha256sum] = "7b8906d1c8866155b31820ef108be92abcee7fcd278d386bf0d449e704ba4696"
|
||||||
|
|
||||||
|
inherit autotools pythonnative update-rc.d
|
||||||
|
|
||||||
|
# Floatingpoint layout, architecture dependent
|
||||||
|
# 'nothing', 'endianflip' or 'intswap'
|
||||||
|
FPLAYOUT ?= "--with-fp-layout=nothing"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= ""
|
||||||
|
PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
|
||||||
|
|
||||||
|
EXTRA_OECONF = " \
|
||||||
|
${FPLAYOUT} \
|
||||||
|
--disable-perl --with-libperl=no --with-perl-bindings=no \
|
||||||
|
--with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \
|
||||||
|
"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
install -d ${D}${sysconfdir}/init.d
|
||||||
|
install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd
|
||||||
|
sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd
|
||||||
|
sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd
|
||||||
|
sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd
|
||||||
|
sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/collectd
|
||||||
|
|
||||||
|
# Fix configuration file to allow collectd to start up
|
||||||
|
sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
INITSCRIPT_NAME = "collectd"
|
||||||
|
INITSCRIPT_PARAMS = "defaults"
|
||||||
|
|
||||||
Reference in New Issue
Block a user