Commit 1f9adc65 authored by Kirill Smelkov's avatar Kirill Smelkov

*: Pin rubygems library version when used; Do pinning by url

First of all, rubygemsrecipe tries to use latest rubygems library when
rubygems library version is not explicitly specified. So according to
slapos approach, that recipes are immutable, we should pin it.

For fluentd, Rafael already pinned rubygems library version to 2.4.8
(see b4fa5d31 "Pin fluentd version.").

However rubygemsrecipe tries to both find latest rubygems library
version, and to download rubygems when only version was specified from

    http://production.cf.rubygems.org/rubygems/

https://bitbucket.org/sirex/rubygemsrecipe/src/a37d4859a342b9250aeca8977ed565514a00fee4/rubygems.py?at=default#rubygems.py-126
https://bitbucket.org/sirex/rubygemsrecipe/src/a37d4859a342b9250aeca8977ed565514a00fee4/rubygems.py?at=default#rubygems.py-119

That site however no longer works and according to

    https://rubygems.org/pages/download

rubygems library tarballs are directly downloadable from

    https://rubygems.org/rubygems/...

So to make fluentd SR let's change pinning to work by full URL.

Also pin all other places which use rubygemsrecipe (only
software/unstable/gitrepo/software.cfg for now).

/trusted-by @rafael
parent 8dac4823
...@@ -7,10 +7,10 @@ extends = ...@@ -7,10 +7,10 @@ extends =
[fluentd] [fluentd]
recipe = rubygemsrecipe recipe = rubygemsrecipe
url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
ruby-executable = ${ruby:location}/bin/ruby ruby-executable = ${ruby:location}/bin/ruby
gems = gems =
fluentd==0.12.15 fluentd==0.12.15
version = 2.4.8
gem-options = --no-ri --no-rdoc --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/ gem-options = --no-ri --no-rdoc --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/
environment = environment =
LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib
......
...@@ -69,6 +69,7 @@ eggs = ...@@ -69,6 +69,7 @@ eggs =
[ruby-gems] [ruby-gems]
recipe = rubygemsrecipe recipe = rubygemsrecipe
url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
ruby-executable = ${ruby:location}/bin/ruby ruby-executable = ${ruby:location}/bin/ruby
gems = gems =
charlock_holmes==0.6.8 charlock_holmes==0.6.8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment