diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-10-09 21:24:38 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-20 19:07:51 +0100 |
| commit | e3d0d9897e45219c3964165666f0ceebff580678 (patch) | |
| tree | adf8604636cc5e6e85cc01799e48697ef9763331 /meta/classes/package_rpm.bbclass | |
| parent | 2a05bd9be0cb3961f394035bf0f4561283248a83 (diff) | |
| download | poky-e3d0d9897e45219c3964165666f0ceebff580678.tar.gz | |
Move packagedata code into oe.packagedata (sync from OE)
(From OE-Core rev: e6858627ab087f2f25ebbd6c4422eeae35f3b0ac)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index b86356de2e..1d8c686330 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -316,6 +316,7 @@ package_install_internal_rpm () { | |||
| 316 | 316 | ||
| 317 | python write_specfile () { | 317 | python write_specfile () { |
| 318 | import textwrap | 318 | import textwrap |
| 319 | import oe.packagedata | ||
| 319 | 320 | ||
| 320 | # We need to change '-' in a version field to '+' | 321 | # We need to change '-' in a version field to '+' |
| 321 | # This needs to be done BEFORE the mapping_rename_hook | 322 | # This needs to be done BEFORE the mapping_rename_hook |
| @@ -328,7 +329,7 @@ python write_specfile () { | |||
| 328 | ver = depends_dict[dep] | 329 | ver = depends_dict[dep] |
| 329 | if dep and ver: | 330 | if dep and ver: |
| 330 | if '-' in ver: | 331 | if '-' in ver: |
| 331 | subd = read_subpkgdata_dict(dep, d) | 332 | subd = oe.packagedata.read_subpkgdata_dict(dep, d) |
| 332 | pv = subd['PV'] | 333 | pv = subd['PV'] |
| 333 | reppv = pv.replace('-', '+') | 334 | reppv = pv.replace('-', '+') |
| 334 | ver = ver.replace(pv, reppv) | 335 | ver = ver.replace(pv, reppv) |
