mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-13 13:17:39 +03:00
Merge branch 'master' of git.opennebula.org:one
This commit is contained in:
commit
2525827f53
@ -43,7 +43,8 @@ DISTRIBUTIONS={
|
|||||||
'curb' => ['gcc', 'libcurl4-openssl-dev'],
|
'curb' => ['gcc', 'libcurl4-openssl-dev'],
|
||||||
'nokogiri' => %w{gcc rake libxml2-dev libxslt1-dev},
|
'nokogiri' => %w{gcc rake libxml2-dev libxslt1-dev},
|
||||||
'xmlparser' => ['gcc', 'libexpat1-dev'],
|
'xmlparser' => ['gcc', 'libexpat1-dev'],
|
||||||
'thin' => ['g++']
|
'thin' => ['g++'],
|
||||||
|
'json' => ['make', 'gcc']
|
||||||
},
|
},
|
||||||
:install_command => 'apt-get install',
|
:install_command => 'apt-get install',
|
||||||
:gem_env => {
|
:gem_env => {
|
||||||
@ -58,7 +59,8 @@ DISTRIBUTIONS={
|
|||||||
'curb' => ['gcc', 'curl-devel'],
|
'curb' => ['gcc', 'curl-devel'],
|
||||||
'nokogiri' => %w{gcc rubygem-rake libxml2-devel libxslt-devel},
|
'nokogiri' => %w{gcc rubygem-rake libxml2-devel libxslt-devel},
|
||||||
'xmlparser' => ['gcc', 'expat-devel'],
|
'xmlparser' => ['gcc', 'expat-devel'],
|
||||||
'thin' => ['gcc-c++']
|
'thin' => ['gcc-c++'],
|
||||||
|
'json' => ['make', 'gcc']
|
||||||
},
|
},
|
||||||
:install_command => 'yum install'
|
:install_command => 'yum install'
|
||||||
},
|
},
|
||||||
@ -70,7 +72,8 @@ DISTRIBUTIONS={
|
|||||||
'curb' => ['gcc', 'libcurl-devel'],
|
'curb' => ['gcc', 'libcurl-devel'],
|
||||||
'nokogiri' => %w{rubygem-rake gcc rubygem-rake libxml2-devel libxslt-devel},
|
'nokogiri' => %w{rubygem-rake gcc rubygem-rake libxml2-devel libxslt-devel},
|
||||||
'xmlparser' => ['gcc', 'libexpat-devel'],
|
'xmlparser' => ['gcc', 'libexpat-devel'],
|
||||||
'thin' => ['rubygem-rake', 'gcc-c++']
|
'thin' => ['rubygem-rake', 'gcc-c++'],
|
||||||
|
'json' => ['make', 'gcc']
|
||||||
},
|
},
|
||||||
:install_command => 'zypper install'
|
:install_command => 'zypper install'
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user