diff options
| author | Mark Hatle <mhatle@windriver.com> | 2010-08-23 08:12:43 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-23 21:04:20 +0100 |
| commit | 9a8b6447c60908b9e603aa51da7328b52460f53a (patch) | |
| tree | ba07b2679f3f7c76237e53bf29e9fbd4e3d7e19c | |
| parent | 59a3e98b044d3157e7472d35b1439a4a292c6693 (diff) | |
| download | poky-9a8b6447c60908b9e603aa51da7328b52460f53a.tar.gz | |
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 <mhatle@windriver.com>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 18 |
1 files changed, 18 insertions, 0 deletions
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 () { | |||
| 187 | splitsection = (bb.data.getVar('SECTION', localdata, True) or "") | 187 | splitsection = (bb.data.getVar('SECTION', localdata, True) or "") |
| 188 | splitdescription = (bb.data.getVar('DESCRIPTION', localdata, True) or "") | 188 | splitdescription = (bb.data.getVar('DESCRIPTION', localdata, True) or "") |
| 189 | 189 | ||
| 190 | # Roll up the per file dependencies into package level dependencies | ||
| 191 | def roll_filerdeps(varname, d): | ||
| 192 | depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "") | ||
| 193 | dependsflist_key = 'FILE' + varname + 'FLIST' | ||
| 194 | dependsflist = (bb.data.getVar(dependsflist_key, d, True) or "") | ||
| 195 | for dfile in dependsflist.split(): | ||
| 196 | key = "FILE" + varname + "_" + dfile | ||
| 197 | filedepends = bb.utils.explode_dep_versions(bb.data.getVar(key, d, True) or "") | ||
| 198 | bb.utils.extend_deps(depends, filedepends) | ||
| 199 | bb.data.setVar(varname, bb.utils.join_deps(depends), d) | ||
| 200 | |||
| 201 | roll_filerdeps('RDEPENDS', localdata) | ||
| 202 | roll_filerdeps('RRECOMMENDS', localdata) | ||
| 203 | roll_filerdeps('RSUGGESTS', localdata) | ||
| 204 | roll_filerdeps('RPROVIDES', localdata) | ||
| 205 | roll_filerdeps('RREPLACES', localdata) | ||
| 206 | roll_filerdeps('RCONFLICTS', localdata) | ||
| 207 | |||
| 190 | translate_vers('RDEPENDS', localdata) | 208 | translate_vers('RDEPENDS', localdata) |
| 191 | translate_vers('RRECOMMENDS', localdata) | 209 | translate_vers('RRECOMMENDS', localdata) |
| 192 | translate_vers('RSUGGESTS', localdata) | 210 | translate_vers('RSUGGESTS', localdata) |
