From d02fe61c35a7c5dcec5f4e7e6b9f89eae0da8440 Mon Sep 17 00:00:00 2001 From: Hitendra Prajapati Date: Fri, 12 Jan 2024 11:20:43 +0530 Subject: Remove tag values from SRC_URI to build recipe To build the fluentd recipe, facing the Bitbake Fetcher Error: FetchError("Recipe uses a floating tag/branch 'v1.9.2' for repo 'github.com/fluent/fluentd.git' without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev() (use SRCPV in PV for OE).", None) To fix this issue, Remove tag values from SRC_URI for recipe and its dependent recipe file. Upgrade "cool.io", "http-parser.rb" and "strptime" recipe to resolve the runtime dependency issue. Signed-off-by: Hitendra Prajapati Signed-off-by: Bruce Ashfield --- .../recipes-devtools/ruby/cool.io_1.6.0.bb | 12 ---------- .../recipes-devtools/ruby/cool.io_1.7.0.bb | 15 +++++++++++++ .../recipes-devtools/ruby/fluentd_1.9.2.bb | 4 +++- .../recipes-devtools/ruby/http-parser.rb_0.6.0.bb | 22 ------------------ .../recipes-devtools/ruby/http-parser.rb_0.6.1.bb | 26 ++++++++++++++++++++++ .../recipes-devtools/ruby/msgpack_1.3.3.bb | 5 ++++- .../recipes-devtools/ruby/serverengine_2.2.1.bb | 6 ++++- .../recipes-devtools/ruby/sigdump_0.2.4.bb | 6 ++++- .../recipes-devtools/ruby/strptime_0.2.3.bb | 13 ----------- .../recipes-devtools/ruby/strptime_0.2.5.bb | 17 ++++++++++++++ .../recipes-devtools/ruby/tzinfo-data_1.2019.3.bb | 6 ++++- .../recipes-devtools/ruby/tzinfo_2.0.1.bb | 6 ++++- .../recipes-devtools/ruby/yajl-ruby_1.4.0.bb | 6 ++++- 13 files changed, 90 insertions(+), 54 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb create mode 100644 meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb delete mode 100644 meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb create mode 100644 meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb delete mode 100644 meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb create mode 100644 meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb diff --git a/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb b/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb deleted file mode 100644 index baa6340..0000000 --- a/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = 'Simple evented I/O for Ruby (but please check out Celluloid::IO instead)' -HOMEPAGE = 'http://coolio.github.com' - -LICENSE = 'MIT' -LIC_FILES_CHKSUM = 'file://LICENSE;md5=a5e7701a63eb0a961f98cd10475129b9' - -SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;tag=v1.6.0' - -S = '${WORKDIR}/git' - -inherit ruby - diff --git a/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb b/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb new file mode 100644 index 0000000..10e9a49 --- /dev/null +++ b/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb @@ -0,0 +1,15 @@ +SUMMARY = 'Simple evented I/O for Ruby (but please check out Celluloid::IO instead)' +HOMEPAGE = 'http://coolio.github.com' + +LICENSE = 'MIT' +LIC_FILES_CHKSUM = 'file://LICENSE;md5=a5e7701a63eb0a961f98cd10475129b9' + +SRCREV = 'd7ab8518c11d8fe1b9a679a1686f01a295690fa9' + +SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;branch=master' + +S = '${WORKDIR}/git' + +inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb index 94d1ec8..dc984d3 100644 --- a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb +++ b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb @@ -3,7 +3,9 @@ HOMEPAGE = "https://www.fluentd.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ffc336af228834e68e0a4d38da165f7" -SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;tag=v${PV};branch=master" +SRCREV = "9d113029d4550ce576d8825bfa9612aa3e55bff0" + +SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb deleted file mode 100644 index 296b8dd..0000000 --- a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "simple callback-based HTTP request/response parser" -HOMEPAGE = "https://rubygems.org/gems/http_parser.rb" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=157efc3766c6d07d3d857ebbab43351a" - -SRC_URI = "git://github.com/tmm1/http_parser.rb.git;protocol=https;tag=v0.6.0;branch=master" - -S = "${WORKDIR}/git" - -# Bitbake doesn't allow the underscore in file name, hence the dash -SRCNAME = "http_parser.rb" - -DEPENDS = "git" - -inherit ruby - -# Download the submodules -do_configure:prepend() { - cd ${WORKDIR}/git - git submodule update --init --recursive -} 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.6.1.bb new file mode 100644 index 0000000..5452c12 --- /dev/null +++ b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "simple callback-based HTTP request/response parser" +HOMEPAGE = "https://rubygems.org/gems/http_parser.rb" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=157efc3766c6d07d3d857ebbab43351a" + +SRCREV = "c8dae7c6c2c78a5016d082a7fbda7e362292c14a" + +SRC_URI = "gitsm://github.com/tmm1/http_parser.rb.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +# Bitbake doesn't allow the underscore in file name, hence the dash +SRCNAME = "http_parser.rb" + +DEPENDS = "git" + +inherit ruby + +# 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.3.3.bb index f40d6cf..5382676 100644 --- a/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb +++ b/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb @@ -4,9 +4,12 @@ HOMEPAGE = "http://msgpack.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;tag=v${PV};branch=master" +SRCREV = "64db1bac56359c9257d22f3ffb7506b578d76741" + +SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb b/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb index 516a72e..553c567 100644 --- a/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb +++ b/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb @@ -4,10 +4,14 @@ HOMEPAGE = 'https://rubygems.org/gems/serverengine' LICENSE = 'Apache-2.0' LIC_FILES_CHKSUM = 'file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57' -SRC_URI = 'git://github.com/treasure-data/serverengine.git;protocol=https;tag=v2.2.1' +SRCREV = '99d44a0989ab3e64e14ac0367aadf76aa13b3583' + +SRC_URI = 'git://github.com/treasure-data/serverengine.git;protocol=https;branch=master' S = '${WORKDIR}/git' RDEPENDS:${PN} = "sigdump" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb index 2f6b8d5..fc5152e 100644 --- a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb +++ b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://github.com/frsyuki/sigdump" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=07d6218b18fb6826f04fd32b4918f085" -SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;tag=v0.2.4;branch=master" +SRCREV = "57570f04456560512e4efc1c6fa695b76c17dc0d" + +SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb b/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb deleted file mode 100644 index 7167d9a..0000000 --- a/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "a fast strpitme engine" -HOMEPAGE = "https://github.com/nurse/strptime" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f19575067ffc5f1ddc02c74eeef9904f" - -SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;tag=v0.2.3;branch=master" - -S = "${WORKDIR}/git" - -RDEPENDS:${PN} = "bash" - -inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb new file mode 100644 index 0000000..d568272 --- /dev/null +++ b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb @@ -0,0 +1,17 @@ +SUMMARY = "a fast strpitme engine" +HOMEPAGE = "https://github.com/nurse/strptime" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f19575067ffc5f1ddc02c74eeef9904f" + +SRCREV = "1583aaa510cae4660907b22c8262ab31b1eb1864" + +SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +RDEPENDS:${PN} = "bash" + +inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb index 6b1d01c..4640755 100644 --- a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb +++ b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://tzinfo.github.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c326926e773a4e99e89820f5d8a0966f" -SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;tag=v1.2019.3;branch=master" +SRCREV = "74d5a2529d585e1d1ab47b6bbb2449cba29f6907" + +SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb index 07680d7..504e3a8 100644 --- a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb +++ b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb @@ -4,10 +4,14 @@ HOMEPAGE = "https://tzinfo.github.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c326926e773a4e99e89820f5d8a0966f" -SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;tag=v2.0.1;branch=master" +SRCREV = "16b0ff837923401da52325312c51baf9bec700e1" + +SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;branch=master" S = "${WORKDIR}/git" RDEPENDS:${PN} = "concurrent-ruby" inherit ruby + +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 a0635e3..f91d414 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 @@ -4,8 +4,12 @@ HOMEPAGE = "http://rdoc.info/projects/brianmario/yajl-ruby" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7dbd3a9f471247a243db5b62fe091587" -SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;tag=1.4.0;branch=master" +SRCREV = "8830754ac1ca04a0c14f71f6e7c1d240934366fe" + +SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" -- cgit v1.2.3-54-g00ecf