mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

package_rpm.bbclass: Improve handling of '-' characters in Requires and Recommends fields

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5390 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-10-02 19:57:34 +00:00
parent 6e62524f37
commit 3c5eae8fec
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/classes/package_rpm.bbclass
View File

@@ -79,23 +79,24 @@ python write_specfile() {
fd.write("AutoReqProv: no\n") fd.write("AutoReqProv: no\n")
bb.build.exec_func("mapping_rename_hook", d) bb.build.exec_func("mapping_rename_hook", d)
rdepends = bb.utils.explode_dep_versions(bb.data.getVar('RDEPENDS', d, True) or "")
for dep in rdepends:
ver = rdepends[dep]
if dep and ver:
ver = ver.replace('-', '+')
fd.write("Requires: %s %s\n" % (dep, ver))
elif dep:
fd.write("Requires: %s\n" % (dep))
rdepends = bb.utils.explode_dep_versions(bb.data.getVar('RRECOMMENDS', d, True) or "") def write_dep_field(varname, outstring):
for dep in rdepends: depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
ver = rdepends[dep] for dep in depends:
if dep and ver: ver = depends[dep]
ver = ver.replace('-', '+') if dep and ver:
fd.write("Recommends: %s %s\n" % (dep, ver)) if '-' in ver:
elif dep: subd = read_subpkgdata_dict(dep, d)
fd.write("Recommends: %s\n" % (dep)) pv = subd['PV']
reppv = pv.replace('-', '+')
ver = ver.replace(pv, reppv)
fd.write("%s: %s %s\n" % (outstring, dep, ver))
elif dep:
fd.write("%s: %s\n" % (outstring, dep))
write_dep_field('RDEPENDS', 'Requires')
write_dep_field('RRECOMMENDS', 'Recommends')
fd.write("Summary\t: .\n") fd.write("Summary\t: .\n")