License-Update: Add license BSL-1.0 and Apache-2.0 COPYING - Add Cross-links between Japanese and English pages LEGAL - Update LEGAL for JSON vendored sources
Refer: [1] https://github.com/ruby/ruby/commit/e652af18816ffe0b85109b8de0827349bf03f16d [2] https://github.com/ruby/ruby/commit/d5fbff50c7ff880ae71b8a8ae9aad976c69bea73 Signed-off-by: Changqing Li <[email protected]> --- ...doc-build-reproducible-documentation.patch | 30 ++++++----- .../0006-Make-gemspecs-reproducible.patch | 52 +++++++++++-------- .../ruby/{ruby_3.4.7.bb => ruby_4.0.1.bb} | 11 ++-- 3 files changed, 51 insertions(+), 42 deletions(-) rename meta/recipes-devtools/ruby/{ruby_3.4.7.bb => ruby_4.0.1.bb} (93%) diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch index 90b2aee7ea..f0be3e4af6 100644 --- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch +++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch @@ -1,4 +1,4 @@ -From 2e140fea6c275f3258893d2da2480027b16efb92 Mon Sep 17 00:00:00 2001 +From 278d02b08f513b288f31648bc5ec5c47ecb61686 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler <[email protected]> Date: Tue, 10 Oct 2017 15:04:34 -0300 Subject: [PATCH] rdoc: build reproducible documentation @@ -9,29 +9,33 @@ Upstream-Status: Backport [debian] Signed-off-by: Antonio Terceiro <[email protected]> Signed-off-by: Christian Hofstaedtler <[email protected]> + +rebase to version 4.0.1 +Signed-off-by: Changqing Li <[email protected]> --- - lib/rdoc/generator/json_index.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb | 2 ++ + 1 file changed, 2 insertions(+) -diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb -index 065caa4..cfa1f33 100644 ---- a/lib/rdoc/generator/json_index.rb -+++ b/lib/rdoc/generator/json_index.rb -@@ -176,7 +176,7 @@ class RDoc::Generator::JsonIndex - debug_msg "Writing gzipped search index to %s" % outfile +diff --git a/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb b/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb +index 065caa4..a76c202 100644 +--- a/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb ++++ b/.bundle/gems/rdoc-7.0.3/lib/rdoc/generator/json_index.rb +@@ -177,6 +177,7 @@ class RDoc::Generator::JsonIndex Zlib::GzipWriter.open(outfile) do |gz| -- gz.mtime = File.mtime(search_index_file) + gz.mtime = File.mtime(search_index_file) + gz.mtime = -1 gz.orig_name = search_index_file.basename.to_s gz.write search_index gz.close -@@ -194,7 +194,7 @@ class RDoc::Generator::JsonIndex - debug_msg "Writing gzipped file to %s" % outfile +@@ -195,6 +196,7 @@ class RDoc::Generator::JsonIndex Zlib::GzipWriter.open(outfile) do |gz| -- gz.mtime = File.mtime(dest) + gz.mtime = File.mtime(dest) + gz.mtime = -1 gz.orig_name = dest.basename.to_s gz.write data gz.close +-- +2.34.1 + diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index e2c80e2f6f..aac2bc1502 100644 --- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch @@ -1,4 +1,4 @@ -From 2f3d8359ffd1ab07d578c1e991180bc31dc7d143 Mon Sep 17 00:00:00 2001 +From 4d25e9ce0b2795009dd066d7959cf51c4292a343 Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro <[email protected]> Date: Fri, 1 Nov 2019 15:25:17 -0300 Subject: [PATCH] Make gemspecs reproducible @@ -7,18 +7,21 @@ Without an explicit date, they will get the current date and make the build unreproducible Upstream-Status: Backport [debian] + +Rebase to version 4.0.1 +Signed-off-by: Changqing Li <[email protected]> --- - .bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec | 1 + - ext/fiddle/fiddle.gemspec | 1 + + .bundle/gems/bigdecimal-4.0.1/bigdecimal.gemspec | 1 + + .bundle/gems/fiddle-1.1.8/fiddle.gemspec | 1 + + .bundle/gems/rdoc-7.0.3/rdoc.gemspec | 1 + ext/io/console/io-console.gemspec | 1 + lib/ipaddr.gemspec | 1 + - lib/rdoc/rdoc.gemspec | 1 + 5 files changed, 5 insertions(+) -diff --git a/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec b/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec +diff --git a/.bundle/gems/bigdecimal-4.0.1/bigdecimal.gemspec b/.bundle/gems/bigdecimal-4.0.1/bigdecimal.gemspec index b6ef8fd..596b8bb 100644 ---- a/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec -+++ b/.bundle/gems/bigdecimal-3.1.8/bigdecimal.gemspec +--- a/.bundle/gems/bigdecimal-4.0.1/bigdecimal.gemspec ++++ b/.bundle/gems/bigdecimal-4.0.1/bigdecimal.gemspec @@ -14,6 +14,7 @@ Gem::Specification.new do |s| s.name = name s.version = source_version @@ -27,10 +30,10 @@ index b6ef8fd..596b8bb 100644 s.email = ["[email protected]"] s.summary = "Arbitrary-precision decimal floating-point number library." -diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec +diff --git a/.bundle/gems/fiddle-1.1.8/fiddle.gemspec b/.bundle/gems/fiddle-1.1.8/fiddle.gemspec index 0092f52..f77c224 100644 ---- a/ext/fiddle/fiddle.gemspec -+++ b/ext/fiddle/fiddle.gemspec +--- a/.bundle/gems/fiddle-1.1.8/fiddle.gemspec ++++ b/.bundle/gems/fiddle-1.1.8/fiddle.gemspec @@ -8,6 +8,7 @@ end Gem::Specification.new do |spec| spec.name = "fiddle" @@ -39,6 +42,18 @@ index 0092f52..f77c224 100644 spec.authors = ["Aaron Patterson", "SHIBATA Hiroshi"] spec.email = ["[email protected]", "[email protected]"] +diff --git a/.bundle/gems/rdoc-7.0.3/rdoc.gemspec b/.bundle/gems/rdoc-7.0.3/rdoc.gemspec +index ada9341..5871ec2 100644 +--- a/.bundle/gems/rdoc-7.0.3/rdoc.gemspec ++++ b/.bundle/gems/rdoc-7.0.3/rdoc.gemspec +@@ -7,6 +7,7 @@ end + + Gem::Specification.new do |s| + s.name = "rdoc" ++ s.date = RUBY_RELEASE_DATE + s.version = RDoc::VERSION + + s.authors = [ diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index 0a19992..4a80529 100644 --- a/ext/io/console/io-console.gemspec @@ -52,7 +67,7 @@ index 0a19992..4a80529 100644 s.email = "[email protected]" s.description = "add console capabilities to IO instances." diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec -index 5719f83..fe76260 100644 +index cabc916..f9581b8 100644 --- a/lib/ipaddr.gemspec +++ b/lib/ipaddr.gemspec @@ -18,6 +18,7 @@ end @@ -63,15 +78,6 @@ index 5719f83..fe76260 100644 spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"] spec.email = ["[email protected]", "[email protected]"] -diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec -index 47f4802..cf0b5f7 100644 ---- a/lib/rdoc/rdoc.gemspec -+++ b/lib/rdoc/rdoc.gemspec -@@ -7,6 +7,7 @@ end - - Gem::Specification.new do |s| - s.name = "rdoc" -+ s.date = RUBY_RELEASE_DATE - s.version = RDoc::VERSION - - s.authors = [ +-- +2.34.1 + diff --git a/meta/recipes-devtools/ruby/ruby_3.4.7.bb b/meta/recipes-devtools/ruby/ruby_4.0.1.bb similarity index 93% rename from meta/recipes-devtools/ruby/ruby_3.4.7.bb rename to meta/recipes-devtools/ruby/ruby_4.0.1.bb index 2fbcfd1f1b..13d4a1b4ef 100644 --- a/meta/recipes-devtools/ruby/ruby_3.4.7.bb +++ b/meta/recipes-devtools/ruby/ruby_4.0.1.bb @@ -6,11 +6,11 @@ It is simple, straight-forward, and extensible. \ " HOMEPAGE = "http://www.ruby-lang.org/"; SECTION = "devel/ruby" -LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ +LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT | BSL-1.0 | Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=7674b1080a488809841b13eb57ffb719 \ file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LEGAL;md5=cb14358b7821c054ae14128885170204 \ + file://LEGAL;md5=8c128bc6252da28f51e60e72b5512478 \ " DEPENDS = "zlib openssl libyaml libffi" @@ -49,7 +49,7 @@ do_configure:prepend() { DEPENDS:append:libc-musl = " libucontext" -SRC_URI[sha256sum] = "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36" +SRC_URI[sha256sum] = "3924be2d05db30f4e35f859bf028be85f4b7dd01714142fd823e4af5de2faf9d" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" @@ -104,8 +104,7 @@ do_install_ptest () { install -D ${S}/tool/test/runner.rb ${D}${PTEST_PATH}/tool/test/runner.rb cp -r ${S}/tool/lib ${D}${PTEST_PATH}/tool/ mkdir -p ${D}${PTEST_PATH}/lib - cp -r ${S}/lib/did_you_mean ${S}/lib/rdoc ${D}${PTEST_PATH}/lib - cp ${D}${libdir}/ruby/${SHRT_VER}.0/rdoc.rb ${D}${PTEST_PATH}/lib + cp -r ${S}/lib/did_you_mean ${D}${PTEST_PATH}/lib cp ${D}${libdir}/ruby/${SHRT_VER}.0/did_you_mean.rb ${D}${PTEST_PATH}/lib # install test-binaries -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231728): https://lists.openembedded.org/g/openembedded-core/message/231728 Mute This Topic: https://lists.openembedded.org/mt/117969706/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
