From 9a8b6447c60908b9e603aa51da7328b52460f53a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 23 Aug 2010 08:12:43 -0700 Subject: package_rpm: Temporary workaround for perfile dependencies Until the pseudo code is fully integrated, we need to roll up the per file dependencies into package dependencies for rpm. Signed-off-by: Mark Hatle --- meta/classes/package_rpm.bbclass | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index f89fd94728..311c0a8883 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -187,6 +187,24 @@ python write_specfile () { splitsection = (bb.data.getVar('SECTION', localdata, True) or "") splitdescription = (bb.data.getVar('DESCRIPTION', localdata, True) or "") + # Roll up the per file dependencies into package level dependencies + def roll_filerdeps(varname, d): + depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "") + dependsflist_key = 'FILE' + varname + 'FLIST' + dependsflist = (bb.data.getVar(dependsflist_key, d, True) or "") + for dfile in dependsflist.split(): + key = "FILE" + varname + "_" + dfile + filedepends = bb.utils.explode_dep_versions(bb.data.getVar(key, d, True) or "") + bb.utils.extend_deps(depends, filedepends) + bb.data.setVar(varname, bb.utils.join_deps(depends), d) + + roll_filerdeps('RDEPENDS', localdata) + roll_filerdeps('RRECOMMENDS', localdata) + roll_filerdeps('RSUGGESTS', localdata) + roll_filerdeps('RPROVIDES', localdata) + roll_filerdeps('RREPLACES', localdata) + roll_filerdeps('RCONFLICTS', localdata) + translate_vers('RDEPENDS', localdata) translate_vers('RRECOMMENDS', localdata) translate_vers('RSUGGESTS', localdata) -- cgit v1.2.3-54-g00ecf