diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2011-02-11 20:51:42 +0000 |
|---|---|---|
| committer |   Tom Rini <tom_rini@mentor.com> | 2011-02-12 07:58:44 -0700 |
| commit | 0e19b356cbe1710fa51b816dc6c485f7a5a0044c (patch) | |
| tree | 920a50eb8e781e83cc23a9f3a97d65f165cc6729 /classes | |
| parent | c3027dd5be5e96d25e0c13da0fcc9039f6672f1f (diff) | |
| download | openembedded-0e19b356cbe1710fa51b816dc6c485f7a5a0044c.tar.gz | |
package_ipk.bbclass: use common function to write relationship fields
* A function write_dep_field() was added to do_package_ipk() to
ensure explode_deps is called for every field and to simplify
the code.
* The following statement was removed from do_package_ipk():
if not '-locale-' and not '-dbg' and not '-dev' in pkgname:
rdepends.append('%s-locale*' % pkgname)
It was added in November 2008, but can never evaluate to true.
See commit a045dfacf6f2541e0f410d9d109581f181303756
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package_ipk.bbclass | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index a68d208c69..28aadc24fd 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -250,28 +250,18 @@ python do_package_ipk () { bb.build.exec_func("mapping_rename_hook", localdata) - rdepends = explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") - rrecommends = explode_deps(bb.data.getVar("RRECOMMENDS", localdata, 1) or "") - rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() - rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split() - rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() - rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() - - if not '-locale-' and not '-dbg' and not '-dev' in pkgname: - rdepends.append('%s-locale*' % pkgname) - - if rdepends: - ctrlfile.write("Depends: %s\n" % ", ".join(rdepends)) - if rsuggests: - ctrlfile.write("Suggests: %s\n" % ", ".join(rsuggests)) - if rrecommends: - ctrlfile.write("Recommends: %s\n" % ", ".join(rrecommends)) - if rprovides: - ctrlfile.write("Provides: %s\n" % ", ".join(rprovides)) - if rreplaces: - ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces)) - if rconflicts: - ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts)) + def write_dep_field(varname, outstring): + var = bb.data.getVar(varname, localdata, True) + if var: + ctrlfile.write('%s: %s\n' % (outstring, ", ".join(explode_deps(var)))) + + write_dep_field('RDEPENDS', 'Depends') + write_dep_field('RSUGGESTS', 'Suggests') + write_dep_field('RRECOMMENDS', 'Recommends') + write_dep_field('RPROVIDES', 'Provides') + write_dep_field('RREPLACES', 'Replaces') + write_dep_field('RCONFLICTS', 'Conflicts') + src_uri = bb.data.getVar("SRC_URI", localdata, 1) or d.getVar("FILE", True) src_uri = re.sub("\s+", " ", src_uri) ctrlfile.write("Source: %s\n" % " ".join(src_uri.split())) |