mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

ruby: upgrade 3.1.0 -> 3.1.1

Browse Source 
refresh the following patches for 3.1.1:
0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
0006-Make-gemspecs-reproducible.patch

(From OE-Core rev: 6ae009ae73fc81de441d57699fee61b6fcc48600)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy
2022-02-23 21:41:53 +08:00
committed by Richard Purdie
parent a93937bb40
commit 535f6538b6
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
+22 -19
View File
@@ -1,28 +1,31 @@
From: Christian Hofstaedtler <zeha@debian.org> From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001
Date: Tue, 10 Oct 2017 15:07:11 -0300 From: Lucas Kanashiro <kanashiro@debian.org>
Subject: Mark Gemspec-reproducible change fixing #784225, too Date: Fri, 1 Nov 2019 15:25:17 -0300
Subject: [PATCH] Make gemspecs reproducible
I think the UTC date change will fix the Multi-Arch not-same file issue, Without an explicit date, they will get the current date and make the
too. build unreproducible
Upstream-Status: Backport [debian] Upstream-Status: Backport [debian]
Signed-off-by: Antonio Terceiro <terceiro@debian.org>
Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
--- ---
lib/rubygems/specification.rb | 4 +++- lib/rubygems/specification.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 0d72cee..eb7bc25 100644
--- a/lib/rubygems/specification.rb --- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb
@@ -1695,7 +1695,9 @@ @@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification
raise(Gem::InvalidSpecificationException, raise(Gem::InvalidSpecificationException,
"invalid date format in specification: #{date.inspect}") "invalid date format in specification: #{date.inspect}")
end end
- when Time, DateLike then - when Time, DateLike then
+ when Time then + when Time then
+ Time.utc(date.utc.year, date.utc.month, date.utc.day) + Time.utc(date.utc.year, date.utc.month, date.utc.day)
+ when DateLike then + when DateLike then
Time.utc(date.year, date.month, date.day) Time.utc(date.year, date.month, date.day)
else else
TODAY TODAY
--
2.25.1
meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
+8 -5
View File
@@ -41,10 +41,10 @@ index a9c0ec4..89da078 100644
spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index 36beda7..e932d83 100644 index aa57f8a..ba7f8e5 100644
--- a/ext/io/console/io-console.gemspec --- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec
@@ -4,6 +4,7 @@ _VERSION = "0.5.10" @@ -4,6 +4,7 @@ _VERSION = "0.5.11"
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "io-console" s.name = "io-console"
s.version = _VERSION s.version = _VERSION
@@ -53,13 +53,13 @@ index 36beda7..e932d83 100644
s.email = "nobu@ruby-lang.org" s.email = "nobu@ruby-lang.org"
s.description = "add console capabilities to IO instances." s.description = "add console capabilities to IO instances."
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
index 36e2300..06dc888 100644 index 1f4798e..48743cf 100644
--- a/lib/ipaddr.gemspec --- a/lib/ipaddr.gemspec
+++ b/lib/ipaddr.gemspec +++ b/lib/ipaddr.gemspec
@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) @@ -18,6 +18,7 @@ end
Gem::Specification.new do |spec| Gem::Specification.new do |spec|
spec.name = "ipaddr" spec.name = "ipaddr"
spec.version = "1.2.3" spec.version = version
+ spec.date = RUBY_RELEASE_DATE + spec.date = RUBY_RELEASE_DATE
spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"] spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"]
spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] spec.email = ["knu@idaemons.org", "ume@mahoroba.org"]
@@ -76,3 +76,6 @@ index 525a15f..f6d0e22 100644
s.version = RDoc::VERSION s.version = RDoc::VERSION
s.authors = [ s.authors = [
--
2.25.1
meta/recipes-devtools/ruby/ruby_3.1.0.bb → meta/recipes-devtools/ruby/ruby_3.1.1.bb
+1 -1
View File
@@ -14,7 +14,7 @@ SRC_URI += " \
file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
" "
SRC_URI[sha256sum] = "50a0504c6edcb4d61ce6b8cfdbddaa95707195fab0ecd7b5e92654b2a9412854" SRC_URI[sha256sum] = "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d"
PACKAGECONFIG ??= "" PACKAGECONFIG ??= ""
PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"