diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2015-08-20 16:28:57 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-31 19:43:44 +0200 |
commit | 74930393081a1369633d22928d48c7426eca730f (patch) | |
tree | 94d2310e36b6a8b502518a2a3bb5338f5460b6db /meta-ruby | |
parent | c02b9e8c8c1f278b8c8e210ab197d9d9aae4ec59 (diff) | |
download | meta-openembedded-74930393081a1369633d22928d48c7426eca730f.tar.gz |
ruby.bbclass: handle new installation directories
It appears that newer versions of ruby produce additional directories
which were not previously handled by the ruby bbclass, specifically
'build_info' and 'extensions'. This is currently resulting in QA
errors/warnings such as:
ERROR: QA Issue: puppet: Files/directories were installed but not shipped in any package:
/usr/lib64/ruby/gems/2.2.0/build_info
/usr/lib64/ruby/gems/2.2.0/extensions
Please set FILES such that these items are packaged. Alternatively if they are unneeded,
avoid installing them or delete them within do_install. [installed-vs-shipped]
Add these to our FILES in the bbclass such that they will packaged.
NOTE: several files may exist in the extensions directory such as
gem.build_complete and mkmf.log that we can most likely remove during
do_install. Since ruby installs these by default they have been left
in case their existence is used as some type of stampfile or similar.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-ruby')
-rw-r--r-- | meta-ruby/classes/ruby.bbclass | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-ruby/classes/ruby.bbclass b/meta-ruby/classes/ruby.bbclass index 9c4fcf9c3..ef844f2d9 100644 --- a/meta-ruby/classes/ruby.bbclass +++ b/meta-ruby/classes/ruby.bbclass | |||
@@ -111,6 +111,10 @@ FILES_${PN}-dbg += " \ | |||
111 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/.debug \ | 111 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/.debug \ |
112 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/.debug \ | 112 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/.debug \ |
113 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/*/.debug \ | 113 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/gems/*/*/*/*/*/.debug \ |
114 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/.debug \ | ||
115 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/*/.debug \ | ||
116 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/*/*/.debug \ | ||
117 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions/*/*/*/*/*/.debug \ | ||
114 | " | 118 | " |
115 | 119 | ||
116 | FILES_${PN} += " \ | 120 | FILES_${PN} += " \ |
@@ -118,6 +122,8 @@ FILES_${PN} += " \ | |||
118 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/cache \ | 122 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/cache \ |
119 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin \ | 123 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin \ |
120 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/specifications \ | 124 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/specifications \ |
125 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/build_info \ | ||
126 | ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/extensions \ | ||
121 | " | 127 | " |
122 | 128 | ||
123 | FILES_${PN}-doc += " \ | 129 | FILES_${PN}-doc += " \ |