fluentd: update to v1.17.1 + dependencies

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

6 files changed, 29 insertions, 15 deletions

diff --git a/meta-openstack/recipes-devtools/ruby/concurrent-ruby/0001-Removed-check-for-concurrent_ruby.jar.patch b/meta-openstack/recipes-devtools/ruby/concurrent-ruby/0001-Removed-check-for-concurrent_ruby.jar.patch
index 777dc31..77b7257 100644
--- a/meta-openstack/recipes-devtools/ruby/concurrent-ruby/0001-Removed-check-for-concurrent_ruby.jar.patch
+++ b/meta-openstack/recipes-devtools/ruby/concurrent-ruby/0001-Removed-check-for-concurrent_ruby.jar.patch
@@ -3,6 +3,8 @@ From: Nathan Hartman <nathan.hartman@windriver.com>
 Date: Thu, 20 Feb 2020 13:10:02 -0500
 Subject: [PATCH] Removed jar file check
 
+Upstream-Status: Inappropriate [embedded specific]
+
 ---
  concurrent-ruby.gemspec | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb b/meta-openstack/recipes-devtools/ruby/cool.io_1.9.0.bb
index 10e9a49..2e827a8 100644
--- a/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb
+++ b/meta-openstack/recipes-devtools/ruby/cool.io_1.9.0.bb
@@ -4,12 +4,15 @@ HOMEPAGE = 'http://coolio.github.com'
 LICENSE = 'MIT'
 LIC_FILES_CHKSUM = 'file://LICENSE;md5=a5e7701a63eb0a961f98cd10475129b9'
 
-SRCREV = 'd7ab8518c11d8fe1b9a679a1686f01a295690fa9'
+SRCREV = "6f85a2a104488e5c7cb128b9a83058d28ba16d37"
 
-SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;branch=master'
+SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;branch=main'
 
 S = '${WORKDIR}/git'
 
-inherit ruby
+inherit rubyv2
+
+GEM_NAME = "cool.io"
+GEM_SPEC_FILE = "cool.io.gemspec"
 
 FILES:${PN} += "${libdir}/*"
diff --git a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb b/meta-openstack/recipes-devtools/ruby/fluentd_1.17.1.bb
index dc984d3..cfc6828 100644
--- a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb
+++ b/meta-openstack/recipes-devtools/ruby/fluentd_1.17.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.fluentd.org/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ffc336af228834e68e0a4d38da165f7"
 
-SRCREV = "9d113029d4550ce576d8825bfa9612aa3e55bff0"
+SRCREV = "b4814cb672f8d0fef2bf441214aae368a4091662"
 
 SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;branch=master"
 
diff --git a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.8.0.bb
index 5452c12..4823003 100644
--- a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb
+++ b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.8.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://rubygems.org/gems/http_parser.rb"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=157efc3766c6d07d3d857ebbab43351a"
 
-SRCREV = "c8dae7c6c2c78a5016d082a7fbda7e362292c14a"
+SRCREV = "71ecce2a498f87ba83ea3d77322a001132610a6e"
 
 SRC_URI = "gitsm://github.com/tmm1/http_parser.rb.git;protocol=https;branch=master"
 
@@ -13,14 +13,17 @@ S = "${WORKDIR}/git"
 # Bitbake doesn't allow the underscore in file name, hence the dash
 SRCNAME = "http_parser.rb"
 
-DEPENDS = "git"
+# DEPENDS = "git"
 
-inherit ruby
+inherit rubyv2
 
-# Download the submodules
-do_configure:prepend() {
-        cd ${WORKDIR}/git
-        git submodule update --init --recursive
-}
+GEM_NAME = "http-parser.rb"
+GEM_SPEC_FILE = "http_parser.rb.gemspec"
+
+# # Download the submodules
+# do_configure:prepend() {
+#       cd ${WORKDIR}/git
+#       git submodule update --init --recursive
+# }
 
 FILES:${PN} += "${libdir}/*"
diff --git a/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb b/meta-openstack/recipes-devtools/ruby/msgpack_1.7.3.bb
index 5382676..f883556 100644
--- a/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb
+++ b/meta-openstack/recipes-devtools/ruby/msgpack_1.7.3.bb
@@ -4,12 +4,15 @@ HOMEPAGE = "http://msgpack.org/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 
-SRCREV = "64db1bac56359c9257d22f3ffb7506b578d76741"
+SRCREV = "6bbaa97600430c438675540e1f970d61ce5ccd9e"
 
 SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
-inherit ruby
+inherit rubyv2
+
+GEM_NAME = "msgpack"
+GEM_SPEC_FILE = "msgpack"
 
 FILES:${PN} += "${libdir}/*"
diff --git a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb
index f91d414..e25be73 100644
--- a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb
@@ -10,6 +10,9 @@ SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;branch=maste
 
 S = "${WORKDIR}/git"
 
-inherit ruby
+inherit rubyv2
+
+GEM_NAME = "yajl-ruby"
+GEM_SPEC_FILE = "yajl-ruby.gemspec"
 
 FILES:${PN} += "${libdir}/*"