diff options
| author | Amy Fong <amy.fong@windriver.com> | 2014-05-21 09:56:20 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-24 00:27:14 -0400 |
| commit | 9643550aa09597778fbbfc30d93987a247f5a63b (patch) | |
| tree | 3bfd2791e566f9f43490024cf066164e74257105 /meta-openstack/classes | |
| parent | 52ae70c869d4057d418e3fa031e6521482768d67 (diff) | |
| download | meta-cloud-services-9643550aa09597778fbbfc30d93987a247f5a63b.tar.gz | |
Ruby/chef solo: fixes
Make ruby binaries more accessible by creating symlinks from
${libdir}/ruby/gems/${ruby version}/bin/ to /usr/bin
RDEPENDS needs to be package specific
coderay needs to depends on yard
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'meta-openstack/classes')
| -rw-r--r-- | meta-openstack/classes/ruby.bbclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta-openstack/classes/ruby.bbclass b/meta-openstack/classes/ruby.bbclass index 6161698..0f20deb 100644 --- a/meta-openstack/classes/ruby.bbclass +++ b/meta-openstack/classes/ruby.bbclass | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | DEPENDS += " \ | 4 | DEPENDS += " \ |
| 5 | ruby-native \ | 5 | ruby-native \ |
| 6 | " | 6 | " |
| 7 | RDEPENDS += " \ | 7 | RDEPENDS_${PN} += " \ |
| 8 | ruby \ | 8 | ruby \ |
| 9 | " | 9 | " |
| 10 | 10 | ||
| @@ -94,6 +94,15 @@ ruby_do_install() { | |||
| 94 | for gem in ${RUBY_INSTALL_GEMS}; do | 94 | for gem in ${RUBY_INSTALL_GEMS}; do |
| 95 | gem install --ignore-dependencies --local --env-shebang --install-dir ${D}/${libdir}/ruby/gems/${RUBY_GEM_VERSION}/ $gem | 95 | gem install --ignore-dependencies --local --env-shebang --install-dir ${D}/${libdir}/ruby/gems/${RUBY_GEM_VERSION}/ $gem |
| 96 | done | 96 | done |
| 97 | |||
| 98 | # create symlink from the gems bin directory to /usr/bin | ||
| 99 | for i in ${D}/${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin/*; do | ||
| 100 | if [ -e "$i" ]; then | ||
| 101 | if [ ! -d ${D}/${bindir} ]; then mkdir -p ${D}/${bindir}; fi | ||
| 102 | b=`basename $i` | ||
| 103 | ln -sf ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin/$b ${D}/${bindir}/$b | ||
| 104 | fi | ||
| 105 | done | ||
| 97 | } | 106 | } |
| 98 | 107 | ||
| 99 | EXPORT_FUNCTIONS do_compile do_install | 108 | EXPORT_FUNCTIONS do_compile do_install |
