Skip to content

Commit c8649b1

Browse files
kulikjakvlmarek
authored andcommitted
PSARC/2025/002 EOF Ruby 3.1
37496981 EOF Ruby 3.1: Move to legacy state
1 parent 1a3d390 commit c8649b1

File tree

6 files changed

+26
-11
lines changed

6 files changed

+26
-11
lines changed

Diff for: components/ruby/ruby-31/generate/ruby-31.static

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
23+
# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
2424
#
2525

2626
link path=usr/ruby/$(RUBY_VER)/lib/64 target=$(MACH64)
@@ -52,3 +52,9 @@ link path=usr/share/man/man1/rake.1 \
5252
mediator-version=$(RUBY_VER)
5353

5454
file path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/libruby-static.a
55+
56+
file release-notes/runtime-ruby-31.txt \
57+
path=usr/share/doc/release-notes/runtime-ruby-31.txt mode=0444 \
58+
must-display=true \
59+
release-note=feature/pkg/self@$(IPS_COMPONENT_VERSION)-AUTO_FMRI \
60+
release-note=feature/pkg/self@0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Ruby 3.1 will be removed from a future release of Oracle Solaris. Customers
2+
using Ruby 3.1 should migrate to newer Ruby runtime.

Diff for: components/ruby/ruby-31/ruby-31.p5m

+9-3
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2015, 2024, Oracle and/or its affiliates.
23+
# Copyright (c) 2015, 2025, Oracle and/or its affiliates.
2424
#
2525

26-
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
26+
<transform file path=usr.*/man/.+ -> default mangler.man.stability "obsolete uncommitted">
2727
set name=pkg.fmri \
2828
value=pkg:/runtime/ruby-$(RUBY_VER_NO_DOT)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
2929
set name=pkg.summary value="Ruby, RubyGems, and Rake"
30+
set name=pkg.legacy value=true
3031
set name=com.oracle.info.description value="Ruby, including RubyGems and Rake"
3132
set name=info.classification \
3233
value=org.opensolaris.category.2008:Development/Ruby
3334
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
3435
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
35-
set name=org.opensolaris.arc-caseid value=PSARC/2022/046
36+
set name=org.opensolaris.arc-caseid value=PSARC/2022/046 value=PSARC/2025/002
3637
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
3738
#
3839
link path=usr/bin/bundle target=./bundle$(RUBY_VER_NO_DOT) mediator=ruby \
@@ -14203,6 +14204,11 @@ file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-modul
1420314204
file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-pattern_matching_rdoc.ri
1420414205
file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-precedence_rdoc.ri
1420514206
file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/syntax/page-refinements_rdoc.ri
14207+
file release-notes/runtime-ruby-31.txt \
14208+
path=usr/share/doc/release-notes/runtime-ruby-31.txt mode=0444 \
14209+
must-display=true \
14210+
release-note=feature/pkg/self@$(IPS_COMPONENT_VERSION)-AUTO_FMRI \
14211+
release-note=feature/pkg/self@0
1420614212

1420714213

1420814214
link path=usr/share/man/man1/erb$(RUBY_VER_NO_DOT).1 \

Diff for: components/ruby/ruby-common/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
23+
# Copyright (c) 2014, 2025, Oracle and/or its affiliates.
2424
#
2525
include ../../../make-rules/shared-macros.mk
2626

2727
COMPONENT_NAME= ruby-meta
2828
# the latest version of Ruby
29-
COMPONENT_VERSION= 3.1
29+
COMPONENT_VERSION= 3.3
3030
COMPONENT_SRC=
3131
COMPONENT_ARCHIVE_SRC= none
3232
COMPONENT_PROJECT_URL= http://www.ruby-lang.org/

Diff for: components/ruby/ruby-common/ruby.p5m

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#
1919
# CDDL HEADER END
2020
#
21-
# Copyright (c) 2015, 2023, Oracle and/or its affiliates.
21+
# Copyright (c) 2015, 2025, Oracle and/or its affiliates.
2222
#
2323

2424
set name=pkg.fmri value=pkg:/runtime/ruby@$(COMPONENT_VERSION),$(BUILD_VERSION)
@@ -29,9 +29,10 @@ set name=info.classification \
2929
value=org.opensolaris.category.2008:Development/Ruby
3030
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
3131
set name=org.opensolaris.arc-caseid value=PSARC/2013/269 value=PSARC/2015/113 \
32-
value=PSARC/2018/119 value=PSARC/2019/018 value=PSARC/PSARC/2022/046
32+
value=PSARC/2018/119 value=PSARC/2019/018 value=PSARC/2022/046 \
33+
value=PSARC/2024/142
3334
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
3435
license ruby.license license=Oracle
3536

3637
# Any version of Ruby currently available
37-
depend type=require-any fmri=runtime/ruby-31
38+
depend type=require-any fmri=runtime/ruby-31 fmri=runtime/ruby-33

Diff for: transforms/defaults

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121

2222
#
23-
# Copyright (c) 2010, 2024, Oracle and/or its affiliates.
23+
# Copyright (c) 2010, 2025, Oracle and/or its affiliates.
2424
#
2525

2626
#
@@ -77,7 +77,7 @@ set name=com.oracle.info.consolidation.repository-url \
7777
#
7878
# Set the default Ruby for mediated links
7979
#
80-
<transform link mediator=ruby mediator-version=3.1 -> default mediator-priority vendor>
80+
<transform link mediator=ruby mediator-version=3.3 -> default mediator-priority vendor>
8181

8282
#
8383
# Set the default Perl for mediated links

0 commit comments

Comments
 (0)