sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

package_rpm.bbclass: Fix package version fixing for PKG renamed packages 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5393 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2008-10-02 20:56:59 +00:00
parent 8a49dd28cc
commit 785f33dfaa
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta/classes/package_rpm.bbclass
View File

@ -78,10 +78,9 @@ python write_specfile() {
fd.write("AutoReqProv: no\n")
bb.build.exec_func("mapping_rename_hook", d)
def write_dep_field(varname, outstring):
def fix_dep_versions(varname):
depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
newdeps = []
for dep in depends:
ver = depends[dep]
if dep and ver:
@ -90,11 +89,25 @@ python write_specfile() {
pv = subd['PV']
reppv = pv.replace('-', '+')
ver = ver.replace(pv, reppv)
newdeps.append("%s (%s)" % (dep, ver))
elif dep:
newdeps.append(dep)
bb.data.setVar(varname, ", ".join(newdeps), d)
fix_dep_versions('RDEPENDS')
fix_dep_versions('RRECOMMENDS')
bb.build.exec_func("mapping_rename_hook", d)
def write_dep_field(varname, outstring):
depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
for dep in depends:
ver = depends[dep]
if dep and ver:
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')