[PATCH] ruby: upgrade from 3.4.7 to 4.0.1

[PATCH] ruby: upgrade from 3.4.7 to 4.0.1

[Changqing Li]

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 <changqing.li@windriver.com>
---
 ...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 <zeha@debian.org>
 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 <terceiro@debian.org>
 Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
+
+rebase to version 4.0.1
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
- 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 <kanashiro@debian.org>
 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 <changqing.li@windriver.com>
 ---
- .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         = ["mrkn@mrkn.jp"]
  
    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         = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
  
+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 = "nobu@ruby-lang.org"
    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         = ["knu@idaemons.org", "ume@mahoroba.org"]
  
-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

Re: [OE-core] [PATCH] ruby: upgrade from 3.4.7 to 4.0.1

[Mathieu Dubois-Briand]

On Tue Feb 24, 2026 at 2:51 AM CET, Changqing Li via lists.openembedded.org wrote:
> 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 <changqing.li@windriver.com>
> ---

Hi Changqing,

Thanks for the upgrade.

It looks like we have some reproducibility issue after the upgrade:

AssertionError: The following deb packages are different and not in exclusion list:
/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/ruby-doc_4.0.1-r0_amd64.deb
The following ipk packages are different and not in exclusion list:
/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./x86-64-v3/ruby-doc_4.0.1-r0_x86-64-v3.ipk
The following rpm packages are different and not in exclusion list:
/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./x86_64_v3/ruby-doc-4.0.1-r0.x86_64_v3.rpm

https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3457

The diffoscope output can be found here:

https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260226-ok6427ba/packages/diff-html/

Based on that, it seems the file output is not stable, as it sometimes
add "last·modified: xxx" to the file type.

Can you have a look at the possibilities to make the build reproducible
again?

Thanks,
Mathieu

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH] ruby: upgrade from 3.4.7 to 4.0.1

[Changqing Li]

On 2/26/26 21:45, Mathieu Dubois-Briand wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Tue Feb 24, 2026 at 2:51 AM CET, Changqing Li via lists.openembedded.org wrote:
>> 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 <changqing.li@windriver.com>
>> ---
> Hi Changqing,
>
> Thanks for the upgrade.
>
> It looks like we have some reproducibility issue after the upgrade:
>
> AssertionError: The following deb packages are different and not in exclusion list:
> /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/ruby-doc_4.0.1-r0_amd64.deb
> The following ipk packages are different and not in exclusion list:
> /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./x86-64-v3/ruby-doc_4.0.1-r0_x86-64-v3.ipk
> The following rpm packages are different and not in exclusion list:
> /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./x86_64_v3/ruby-doc-4.0.1-r0.x86_64_v3.rpm
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3457
>
> The diffoscope output can be found here:
>
> https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260226-ok6427ba/packages/diff-html/
>
> Based on that, it seems the file output is not stable, as it sometimes
> add "last·modified: xxx" to the file type.
>
> Can you have a look at the possibilities to make the build reproducible
> again?

Hi, Mathieu

I  cannot reproduce this,  what I compiled locally all don't have "last 
modified".  And I check the logic how the erb.1.gz is generated,

and find a workaround for this.  I will send a V2 here.

Thanks

Changqing

>
> Thanks,
> Mathieu
>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>

[PATCH V2] ruby: upgrade from 3.4.7 to 4.0.1

[Changqing Li]

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

* Patch 0001-Don-t-save-the-original-name-and-timestamp.patch is added
for fixing possible reproducible issue. Package ruby-doc is not
reproducible, sometimes, "last modified: xxx" is added to the file type.
autobuilder reproduces this, but I can not reproduce this locally. Just
pass '-n' option to workaround it.

Refer:
[1] https://github.com/ruby/ruby/commit/e652af18816ffe0b85109b8de0827349bf03f16d
[2] https://github.com/ruby/ruby/commit/d5fbff50c7ff880ae71b8a8ae9aad976c69bea73

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 ...save-the-original-name-and-timestamp.patch | 33 ++++++++++++
 ...doc-build-reproducible-documentation.patch | 30 ++++++-----
 .../0006-Make-gemspecs-reproducible.patch     | 52 +++++++++++--------
 .../ruby/{ruby_3.4.7.bb => ruby_4.0.1.bb}     | 12 ++---
 4 files changed, 85 insertions(+), 42 deletions(-)
 create mode 100644 meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch
 rename meta/recipes-devtools/ruby/{ruby_3.4.7.bb => ruby_4.0.1.bb} (93%)

diff --git a/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch b/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch
new file mode 100644
index 0000000000..3db5328565
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/0001-Don-t-save-the-original-name-and-timestamp.patch
@@ -0,0 +1,33 @@
+From 6250ed93d1d7407eb84241296d604e6f98ff0a82 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 27 Feb 2026 16:59:24 +0800
+Subject: [PATCH] Don't save the original name and timestamp
+
+Explictly pass -n option to not save the original name and timestamp for
+improving reproducibility. In our test, always set mantype to man, but
+the output like erb.1.gz is not stable, sometimes, "last modified: xxx"
+is added to the file type, which make the build not reproducible.
+
+Upstream-Status: Submitted [https://github.com/ruby/ruby/pull/16265]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ tool/rbinstall.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
+index 874c3ef..0bba588 100755
+--- a/tool/rbinstall.rb
++++ b/tool/rbinstall.rb
+@@ -173,7 +173,7 @@ def parse_args(argv = ARGV)
+   end
+ end
+ 
+-Compressors = {".gz"=>"gzip", ".bz2"=>"bzip2"}
++Compressors = {".gz"=>"gzip -n", ".bz2"=>"bzip2"}
+ def Compressors.for(type)
+   ext = File.extname(type)
+   if compress = fetch(ext, nil)
+-- 
+2.34.1
+
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 <zeha@debian.org>
 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 <terceiro@debian.org>
 Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
+
+rebase to version 4.0.1
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
 ---
- 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 <kanashiro@debian.org>
 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 <changqing.li@windriver.com>
 ---
- .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         = ["mrkn@mrkn.jp"]
  
    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         = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
  
+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 = "nobu@ruby-lang.org"
    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         = ["knu@idaemons.org", "ume@mahoroba.org"]
  
-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..e51d0d3e9c 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"
@@ -28,6 +28,7 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://0006-Make-gemspecs-reproducible.patch \
            file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
            file://0007-Skip-test_rm_r_no_permissions-test-under-root.patch \
+           file://0001-Don-t-save-the-original-name-and-timestamp.patch \
            "
 UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
 
@@ -49,7 +50,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 +105,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

Re: [OE-core] [PATCH V2] ruby: upgrade from 3.4.7 to 4.0.1

[Mathieu Dubois-Briand]

On Fri Feb 27, 2026 at 11:07 AM CET, Changqing Li via lists.openembedded.org wrote:
> 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
>
> * Patch 0001-Don-t-save-the-original-name-and-timestamp.patch is added
> for fixing possible reproducible issue. Package ruby-doc is not
> reproducible, sometimes, "last modified: xxx" is added to the file type.
> autobuilder reproduces this, but I can not reproduce this locally. Just
> pass '-n' option to workaround it.
>
> Refer:
> [1] https://github.com/ruby/ruby/commit/e652af18816ffe0b85109b8de0827349bf03f16d
> [2] https://github.com/ruby/ruby/commit/d5fbff50c7ff880ae71b8a8ae9aad976c69bea73
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---

Hi Changqing,

Sorry, the v1 was merged in the mean time. Your v2 still looks good, and
I will take it into my branch for testing, but do you mind rebasing on
top of master and changing the commit subject accordingly?

Thanks,
Mathieu


-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH V2] ruby: upgrade from 3.4.7 to 4.0.1

[Changqing Li]

On 2/27/26 21:39, Mathieu Dubois-Briand wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Fri Feb 27, 2026 at 11:07 AM CET, Changqing Li via lists.openembedded.org wrote:
>> 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
>>
>> * Patch 0001-Don-t-save-the-original-name-and-timestamp.patch is added
>> for fixing possible reproducible issue. Package ruby-doc is not
>> reproducible, sometimes, "last modified: xxx" is added to the file type.
>> autobuilder reproduces this, but I can not reproduce this locally. Just
>> pass '-n' option to workaround it.
>>
>> Refer:
>> [1] https://github.com/ruby/ruby/commit/e652af18816ffe0b85109b8de0827349bf03f16d
>> [2] https://github.com/ruby/ruby/commit/d5fbff50c7ff880ae71b8a8ae9aad976c69bea73
>>
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> ---
> Hi Changqing,
>
> Sorry, the v1 was merged in the mean time. Your v2 still looks good, and
> I will take it into my branch for testing, but do you mind rebasing on
> top of master and changing the commit subject accordingly?

OK.  I will rebase  on the top of master and send another patch later.

//Changqing

> Thanks,
> Mathieu
>
>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>

Re: [OE-core] [PATCH] ruby: upgrade from 3.4.7 to 4.0.1

[Richard Purdie]

On Tue, 2026-02-24 at 09:51 +0800, Changqing Li via lists.openembedded.org wrote:
> 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 <changqing.li@windriver.com>
> ---
>  ...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 <zeha@debian.org>
>  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 <terceiro@debian.org>
>  Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
> +
> +rebase to version 4.0.1
> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
>  ---
> - 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


This does not look like it is updating the patch correctly.

gz.mtime = File.mtime(search_index_file)

should be replaced with:

gz.mtime = -1

but both lines are left after this change.

That will probably 'work' but isn't a correct update. Please can you
send a fix for this.

The reproducibility issue also recurred in master:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3490
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260302-t9zp1mo6/packages/diff-html/

so this makes it more urgent we get the other changes in v2 (I note
that v1 was merged by mistake). Thanks!

Cheers,

Richard

Re: [OE-core] [PATCH] ruby: upgrade from 3.4.7 to 4.0.1

[Changqing Li]

[-- Attachment #1: Type: text/plain, Size: 4570 bytes --]


On 3/2/26 23:07, Richard Purdie wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Tue, 2026-02-24 at 09:51 +0800, Changqing Li via lists.openembedded.org wrote:
>> 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<changqing.li@windriver.com>
>> ---
>>   ...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<zeha@debian.org>
>>   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<terceiro@debian.org>
>>   Signed-off-by: Christian Hofstaedtler<zeha@debian.org>
>> +
>> +rebase to version 4.0.1
>> +Signed-off-by: Changqing Li<changqing.li@windriver.com>
>>   ---
>> - 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
>
> This does not look like it is updating the patch correctly.
>
> gz.mtime = File.mtime(search_index_file)
>
> should be replaced with:
>
> gz.mtime = -1
>
> but both lines are left after this change.
>
> That will probably 'work' but isn't a correct update. Please can you
> send a fix for this.
>
> The reproducibility issue also recurred in master:
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3490
> https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260302-t9zp1mo6/packages/diff-html/
>
> so this makes it more urgent we get the other changes in v2 (I note
> that v1 was merged by mistake). Thanks!

I have send a patch to fresh above patch,  and also 
0001-Don-t-save-the-original-name-and-timestamp.patch rebased on 
master-next.

Thanks

Changqing

>
> Cheers,
>
> Richard
>

[-- Attachment #2: Type: text/html, Size: 6645 bytes --]