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<[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
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#232237):
https://lists.openembedded.org/g/openembedded-core/message/232237
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]]
-=-=-=-=-=-=-=-=-=-=-=-
