Skip to content

Commit 68dc664

Browse files
authored
Merge pull request #825 from donoghuc/fixup
Fixup
2 parents a479ba6 + c8062b0 commit 68dc664

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

configs/components/rubygem-ffi.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
pkg.version '1.13.1'
1212
pkg.sha256sum '4e15f52ee45af7c5674d656041855448adbb5022618be252cd602d81b8e2978a'
1313
else
14-
pkg.version '1.16.3'
15-
pkg.sha256sum '6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb'
14+
pkg.version '1.15.5'
15+
pkg.sha256sum '6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'
1616
end
1717

1818
instance_eval File.read('configs/components/_base-rubygem.rb')
@@ -59,7 +59,7 @@
5959
case pkg.get_version
6060
when '1.9.25'
6161
pkg.sha256sum '5473ac958b78f271f53e9a88197c35cd3e990fbe625d21e525c56d62ae3750da'
62-
when '1.16.3'
62+
when '1.15.5'
6363
pkg.sha256sum '9acc4e474bef25dbcf827b1e6fce4067e9a1eff74a0296d25f0af392fafcd096'
6464
end
6565

@@ -70,8 +70,8 @@
7070
case pkg.get_version
7171
when '1.9.25'
7272
pkg.sha256sum '43d357732a6a0e3e41dc7e28a9c9c5112ac66f4a6ed9e1de40afba9ffcb836c1'
73-
when '1.16.3'
74-
pkg.sha256sum 'ee49ccfa125f84a2f2053a0e6dd8433a34233479e026513ecbf06798ba542fe6'
73+
when '1.15.5'
74+
pkg.sha256sum '6e52c39fdbbccc085ae05d489d1b835ce05dcdf2a4c88ba739e3b42afd2b5404'
7575
end
7676

7777
pkg.url "https://rubygems.org/downloads/ffi-#{pkg.get_version}-x86-mingw32.gem"
@@ -157,4 +157,4 @@
157157
%(#{platform[:sed]} -i '0,/ensure_required_ruby_version_met/b; /ensure_required_ruby_version_met/d' #{base_ruby}/rubygems/installer.rb)
158158
end
159159
end
160-
end
160+
end

configs/components/rubygem-json-schema.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component "rubygem-json-schema" do |pkg, settings, platform|
2-
pkg.version "4.3.1"
2+
pkg.version "4.3.0"
33
pkg.sha256sum "ac35bfabf99eea2b8b45fbccbb714b399fbe7824c621fc985048a9c2e45d58d2"
44

55
instance_eval File.read('configs/components/_base-rubygem.rb')

configs/components/rubygem-semantic_puppet.rb

+7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
component "rubygem-semantic_puppet" do |pkg, settings, platform|
22
# Projects may define a :rubygem_semantic_puppet_version setting, or we use 1.0.4 by default
33
version = settings[:rubygem_semantic_puppet_version] || '1.1.0'
4+
if platform.is_cross_compiled? && platform.is_solaris?
5+
# solaris 10/11 sparc are failing in agent-runtime-7.x installing semantic_puppet because the gem requires ruby >= 2.7.0
6+
# when cross compiling on sparc, we use ancient pl-ruby or equivalen. For these older platforms, use older semantic_puppet
7+
version = '1.0.4'
8+
end
49
pkg.version version
510

611
case version
712
when '0.1.2'
813
pkg.md5sum '192ae7729997cb5d5364f64b99b13121'
14+
when '1.0.4'
15+
pkg.sha256sum "5d8380bf733c1552ef77e06a7c44a6d5b48def7d390ecf3bd71cad477f5ce13d"
916
when '1.1.0'
1017
pkg.sha256sum "52d108d08e1a5d95c00343cb3a4936fb1deecff2be612ec39c9cb66be5a8b859"
1118
else

0 commit comments

Comments
 (0)