summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2014-12-08 17:53:59 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 18:08:00 +0000
commit244cb9b5c39aba48773f14b708ffe6922071093f (patch)
treeff9047014fcddf3293264135919d83282af2c5f6 /meta
parent48b35406c90c3ffb1a2955902b691f15db068904 (diff)
downloadpoky-244cb9b5c39aba48773f14b708ffe6922071093f.tar.gz
package.bbclass: do variable fixups even when FILES was set
A number of settings (DESCRIPTION, SUMMARY, postinst, postrm, and appends to RDEPENDS) were made only if FILES_foo was not set for a given package. If you had a modified glibc packaging setup that was defining FILES_glibc-gconv-somelocale, this would prevent the automatic append of glibc-gconv as a dependency, because extra_depends was ignored. I think the assumption may have been that if FILES_foo was set, DESCRIPTION_foo and SUMMARY_foo would also be set, but it seems to me that the right answer is probably to set them if they aren't already set, and leave them alone if they are. (From OE-Core rev: 7e59b0c7e03fc08a6eaf9c8ccb6bfa72b4604cc5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 89cce40d45..dc4025d327 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -208,16 +208,18 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
208 else: 208 else:
209 the_files.append(aux_files_pattern_verbatim % m.group(1)) 209 the_files.append(aux_files_pattern_verbatim % m.group(1))
210 d.setVar('FILES_' + pkg, " ".join(the_files)) 210 d.setVar('FILES_' + pkg, " ".join(the_files))
211 if extra_depends != '':
212 d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends)
213 d.setVar('DESCRIPTION_' + pkg, description % on)
214 d.setVar('SUMMARY_' + pkg, summary % on)
215 if postinst:
216 d.setVar('pkg_postinst_' + pkg, postinst)
217 if postrm:
218 d.setVar('pkg_postrm_' + pkg, postrm)
219 else: 211 else:
220 d.setVar('FILES_' + pkg, oldfiles + " " + newfile) 212 d.setVar('FILES_' + pkg, oldfiles + " " + newfile)
213 if extra_depends != '':
214 d.appendVar('RDEPENDS_' + pkg, ' ' + extra_depends)
215 if not d.getVar('DESCRIPTION_' + pkg, True):
216 d.setVar('DESCRIPTION_' + pkg, description % on)
217 if not d.getVar('SUMMARY_' + pkg, True):
218 d.setVar('SUMMARY_' + pkg, summary % on)
219 if postinst:
220 d.setVar('pkg_postinst_' + pkg, postinst)
221 if postrm:
222 d.setVar('pkg_postrm_' + pkg, postrm)
221 if callable(hook): 223 if callable(hook):
222 hook(f, pkg, file_regex, output_pattern, m.group(1)) 224 hook(f, pkg, file_regex, output_pattern, m.group(1))
223 225