initial commit for Enea Linux 5.0 arm

Signed-off-by: Tudor Florea <tudor.florea@enea.com>

6 files changed, 461 insertions, 0 deletions

diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
new file mode 100644
index 000000000..1e2b7c159
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch
@@ -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
+
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-oe/recipes-extended/collectd/collectd/collectd.init
new file mode 100644
index 000000000..95f5f73c6
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd.init
@@ -0,0 +1,212 @@
+#!/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"
+}
+
+# return:
+#   0 if the daemon is running
+#   3 if the daemon is stopped
+d_status(){
+        if test "$USE_COLLECTDMON" == 1; then
+                status $COLLECTDMON_DAEMON
+        else
+                status $DAEMON
+        fi
+}
+
+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)
+                d_status
+                ;;
+        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 :
+
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.service b/meta-oe/recipes-extended/collectd/collectd/collectd.service
new file mode 100644
index 000000000..d835b735f
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/collectd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Collectd
+After=local-fs.target network.target
+Requires=local-fs.target network.target
+
+[Service]
+ExecStart=@SBINDIR@/collectd -C /etc/collectd.conf -f
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch b/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch
new file mode 100644
index 000000000..2596bedf9
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch
@@ -0,0 +1,102 @@
+This makes it forward compatible with glibc 2.20+ where _BSD_SOURCE
+macro has been deprecated.
+
+Fixes warnings like
+
+usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
+|  # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Index: collectd-5.4.1/configure.ac
+===================================================================
+--- collectd-5.4.1.orig/configure.ac    2014-09-03 01:21:10.666084244 -0700
++++ collectd-5.4.1/configure.ac 2014-09-03 01:31:27.794084244 -0700
+@@ -1288,6 +1288,7 @@
+ 
+ AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
+ [#define _BSD_SOURCE
++#define _DEFAULT_SOURCE 1
+ #if HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+@@ -1309,6 +1310,7 @@
+ ])
+ AC_CHECK_MEMBERS([struct udphdr.dest, struct udphdr.source], [], [],
+ [#define _BSD_SOURCE
++#define _DEFAULT_SOURCE 1
+ #if HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+Index: collectd-5.4.1/src/dns.c
+===================================================================
+--- collectd-5.4.1.orig/src/dns.c       2014-01-26 00:09:14.856391886 -0800
++++ collectd-5.4.1/src/dns.c    2014-09-03 01:32:37.666084244 -0700
+@@ -22,6 +22,7 @@
+  **/
+ 
+ #define _BSD_SOURCE
++#define _DEFAULT_SOURCE 1
+ 
+ #include "collectd.h"
+ #include "common.h"
+Index: collectd-5.4.1/src/exec.c
+===================================================================
+--- collectd-5.4.1.orig/src/exec.c      2014-01-26 00:09:14.860391963 -0800
++++ collectd-5.4.1/src/exec.c   2014-09-03 01:32:28.874084244 -0700
+@@ -24,6 +24,7 @@
+  **/
+ 
+ #define _BSD_SOURCE /* For setgroups */
++#define _DEFAULT_SOURCE 1
+ 
+ #include "collectd.h"
+ #include "common.h"
+Index: collectd-5.4.1/src/load.c
+===================================================================
+--- collectd-5.4.1.orig/src/load.c      2014-01-26 00:09:23.532559941 -0800
++++ collectd-5.4.1/src/load.c   2014-09-03 01:32:51.462084244 -0700
+@@ -22,6 +22,7 @@
+  **/
+ 
+ #define _BSD_SOURCE
++#define _DEFAULT_SOURCE 1
+ 
+ #include "collectd.h"
+ #include "common.h"
+Index: collectd-5.4.1/src/network.c
+===================================================================
+--- collectd-5.4.1.orig/src/network.c   2014-01-26 00:09:23.532559941 -0800
++++ collectd-5.4.1/src/network.c        2014-09-03 01:32:44.522084244 -0700
+@@ -23,6 +23,7 @@
+  **/
+ 
+ #define _BSD_SOURCE /* For struct ip_mreq */
++#define _DEFAULT_SOURCE 1
+ 
+ #include "collectd.h"
+ #include "plugin.h"
+Index: collectd-5.4.1/src/ntpd.c
+===================================================================
+--- collectd-5.4.1.orig/src/ntpd.c      2014-01-26 00:09:14.880392351 -0800
++++ collectd-5.4.1/src/ntpd.c   2014-09-03 01:32:20.350084244 -0700
+@@ -20,6 +20,7 @@
+  **/
+ 
+ #define _BSD_SOURCE /* For NI_MAXHOST */
++#define _DEFAULT_SOURCE 1
+ 
+ #include "collectd.h"
+ #include "common.h"
+Index: collectd-5.4.1/src/utils_dns.c
+===================================================================
+--- collectd-5.4.1.orig/src/utils_dns.c 2014-01-26 00:09:14.908392893 -0800
++++ collectd-5.4.1/src/utils_dns.c      2014-09-03 01:31:47.062084244 -0700
+@@ -34,6 +34,7 @@
+  */
+ 
+ #define _BSD_SOURCE
++#define _DEFAULT_SOURCE 1
+ 
+ #include "collectd.h"
+ #include "plugin.h"
diff --git a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
new file mode 100644
index 000000000..0e876ae85
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
@@ -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>
+
+Index: collectd-5.4.1/configure.ac
+===================================================================
+--- collectd-5.4.1.orig/configure.ac    2014-09-03 01:20:22.062084244 -0700
++++ collectd-5.4.1/configure.ac 2014-09-03 01:20:22.058084244 -0700
+@@ -1867,11 +1867,11 @@
+                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
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb b/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb
new file mode 100644
index 000000000..46752c895
--- /dev/null
+++ b/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb
@@ -0,0 +1,74 @@
+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 lvm2 libmnl"
+
+SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \
+           file://no-gcrypt-badpath.patch \
+           file://collectd-version.patch \
+           file://glibc-2.20-compatiblity.patch \
+           file://collectd.init \
+           file://collectd.service"
+SRC_URI[md5sum] = "6f56c71c96573a7f4f7fb3bfab185974"
+SRC_URI[sha256sum] = "75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0"
+
+inherit autotools pythonnative update-rc.d pkgconfig systemd
+
+SYSTEMD_SERVICE_${PN} = "collectd.service"
+
+# 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"
+PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
+PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"
+PACKAGECONFIG[postgresql] = "--enable-postgresql --with-libpq=yes, \
+        --disable-postgresql --with-libpq=no,postgresql"
+PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi"
+PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
+PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"
+PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
+        --disable-sensors --with-libsensors=no,lmsensors"
+PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
+        --disable-amqp --with-librabbitmq=no,rabbitmq-c"
+# protobuf-c that is currently only available in meta-virtualization layer
+PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf-c-native protobuf-c"
+
+EXTRA_OECONF = " \
+                ${FPLAYOUT} \
+                --disable-perl --with-libperl=no --with-perl-bindings=no \
+                --with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \
+                --disable-notify_desktop \
+"
+
+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
+
+    rmdir "${D}${localstatedir}/run"
+    rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+
+    # Install systemd unit files
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/collectd.service ${D}${systemd_unitdir}/system
+    sed -i -e 's,@SBINDIR@,${sbindir},g' \
+        ${D}${systemd_unitdir}/system/collectd.service
+}
+
+INITSCRIPT_NAME = "collectd"
+INITSCRIPT_PARAMS = "defaults"
+
+# threshold.so load.so are also provided by gegl
+# disk.so is also provided by libgphoto2-camlibs
+PRIVATE_LIBS = "threshold.so load.so disk.so"