summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-06-30 09:48:59 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-30 09:48:59 +0100
commit99d883f81a2e7a4c5c69541cb229c0f699fcb22a (patch)
tree91980c6b815c71adae0e556529f9cd8f87f31aa2
parent9a543b75cab2daf6536afce100cb5d6031fca9e0 (diff)
downloadopenembedded-core-99d883f81a2e7a4c5c69541cb229c0f699fcb22a.tar.gz
openembedded-core-99d883f81a2e7a4c5c69541cb229c0f699fcb22a.tar.bz2
openembedded-core-99d883f81a2e7a4c5c69541cb229c0f699fcb22a.tar.xz
openembedded-core-99d883f81a2e7a4c5c69541cb229c0f699fcb22a.zip
classes/package_ipk|_deb.bbclass: Make sure versions correctly make it into output packages
The version information part of package dependency strings was not ending up in the output packages correctly. This patch fixes this and ensures the version information isn't lost. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/package_deb.bbclass20
-rw-r--r--meta/classes/package_ipk.bbclass25
2 files changed, 23 insertions, 22 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 94a07b348..560b7bc9c 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -196,22 +196,22 @@ python do_package_deb () {
rdepends = [dep for dep in rdepends if not '*' in dep]
rrecommends = bb.utils.explode_deps(unicode(bb.data.getVar("RRECOMMENDS", localdata, 1) or ""))
rrecommends = [rec for rec in rrecommends if not '*' in rec]
- rsuggests = (unicode(bb.data.getVar("RSUGGESTS", localdata, 1) or "")).split()
- rprovides = (unicode(bb.data.getVar("RPROVIDES", localdata, 1) or "")).split()
- rreplaces = (unicode(bb.data.getVar("RREPLACES", localdata, 1) or "")).split()
- rconflicts = (unicode(bb.data.getVar("RCONFLICTS", localdata, 1) or "")).split()
+ rsuggests = bb.utils.explode_deps(unicode(bb.data.getVar("RSUGGESTS", localdata, 1) or ""))
+ rprovides = bb.utils.explode_deps(unicode(bb.data.getVar("RPROVIDES", localdata, 1) or ""))
+ rreplaces = bb.utils.explode_deps(unicode(bb.data.getVar("RREPLACES", localdata, 1) or ""))
+ rconflicts = bb.utils.explode_deps(unicode(bb.data.getVar("RCONFLICTS", localdata, 1) or ""))
if rdepends:
- ctrlfile.write(u"Depends: %s\n" % ", ".join(rdepends))
+ ctrlfile.write(u"Depends: %s\n" % bb.utils.join_deps(rdepends))
if rsuggests:
- ctrlfile.write(u"Suggests: %s\n" % ", ".join(rsuggests))
+ ctrlfile.write(u"Suggests: %s\n" % bb.utils.join_deps(rsuggests))
if rrecommends:
- ctrlfile.write(u"Recommends: %s\n" % ", ".join(rrecommends))
+ ctrlfile.write(u"Recommends: %s\n" % bb.utils.join_deps(rrecommends))
if rprovides:
- ctrlfile.write(u"Provides: %s\n" % ", ".join(rprovides))
+ ctrlfile.write(u"Provides: %s\n" % bb.utils.join_deps(rprovides))
if rreplaces:
- ctrlfile.write(u"Replaces: %s\n" % ", ".join(rreplaces))
+ ctrlfile.write(u"Replaces: %s\n" % bb.utils.join_deps(rreplaces))
if rconflicts:
- ctrlfile.write(u"Conflicts: %s\n" % ", ".join(rconflicts))
+ ctrlfile.write(u"Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
ctrlfile.close()
for script in ["preinst", "postinst", "prerm", "postrm"]:
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 04b117b75..da195a99e 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -248,24 +248,25 @@ python do_package_ipk () {
bb.build.exec_func("mapping_rename_hook", localdata)
- rdepends = bb.utils.explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "")
- rrecommends = bb.utils.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()
+ rdepends = bb.utils.explode_dep_versions(bb.data.getVar("RDEPENDS", localdata, 1) or "")
+ rrecommends = bb.utils.explode_dep_versions(bb.data.getVar("RRECOMMENDS", localdata, 1) or "")
+ rsuggests = bb.utils.explode_dep_versions(bb.data.getVar("RSUGGESTS", localdata, 1) or "")
+ rprovides = bb.utils.explode_dep_versions(bb.data.getVar("RPROVIDES", localdata, 1) or "")
+ rreplaces = bb.utils.explode_dep_versions(bb.data.getVar("RREPLACES", localdata, 1) or "")
+ rconflicts = bb.utils.explode_dep_versions(bb.data.getVar("RCONFLICTS", localdata, 1) or "")
+
if rdepends:
- ctrlfile.write("Depends: %s\n" % ", ".join(rdepends))
+ ctrlfile.write("Depends: %s\n" % bb.utils.join_deps(rdepends))
if rsuggests:
- ctrlfile.write("Suggests: %s\n" % ", ".join(rsuggests))
+ ctrlfile.write("Suggests: %s\n" % bb.utils.join_deps(rsuggests))
if rrecommends:
- ctrlfile.write("Recommends: %s\n" % ", ".join(rrecommends))
+ ctrlfile.write("Recommends: %s\n" % bb.utils.join_deps(rrecommends))
if rprovides:
- ctrlfile.write("Provides: %s\n" % ", ".join(rprovides))
+ ctrlfile.write("Provides: %s\n" % bb.utils.join_deps(rprovides))
if rreplaces:
- ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces))
+ ctrlfile.write("Replaces: %s\n" % bb.utils.join_deps(rreplaces))
if rconflicts:
- ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts))
+ ctrlfile.write("Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
src_uri = bb.data.getVar("SRC_URI", localdata, 1)
if src_uri:
src_uri = re.sub("\s+", " ", src_uri)