collectd: add recipe for 5.2.2
PATCH 1/1 collectd: add recipe for 5.2.2
Based on initial version by Koen Kooi <[email protected]>. 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 <[email protected]>
--- .../collectd/collectd/collectd-version.patch | 31 +++ .../collectd/collectd/collectd.init | 201 ++++++++++++++++++++ .../collectd/collectd/no-gcrypt-badpath.patch | 30 +++ .../recipes-extended/collectd/collectd_5.2.2.bb | 45 +++++ 4 files changed, 307 insertions(+) create mode 100644 meta-oe/recipes-extended/collectd/collectd/collectd-version.patch create mode 100644 meta-oe/recipes-extended/collectd/collectd/collectd.init create mode 100644 meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch create mode 100644 meta-oe/recipes-extended/collectd/collectd_5.2.2.bb
meta-oe/recipes-extended/collectd/collectd/collectd-version.patch new file +31 -0
@@ -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 <[email protected]> + +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 +
meta-oe/recipes-extended/collectd/collectd/collectd.init new file +201 -0
201 lines not on this page · raw message
meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch new file +30 -0
@@ -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 <[email protected]> + +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
meta-oe/recipes-extended/collectd/collectd_5.2.2.bb new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
1.7.10.4