diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-07 12:13:29 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-07-07 12:24:49 +0100 |
| commit | d538d8e17197f5dda39abbff3b4bd171f8248af9 (patch) | |
| tree | 05c4b20b04446b51902f2eb79a06420614ef2a63 /meta/classes/package_rpm.bbclass | |
| parent | d42f0b915306baebdf505702b693e953e3b54e5e (diff) | |
| download | poky-d538d8e17197f5dda39abbff3b4bd171f8248af9.tar.gz | |
Revert "classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging"
This reverts commit 3abe7a0624e1215124799f97c872682a98659760 which was incorrect
in some assumptions about OVERRIDE handling order.
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index b08d478479..0e7bfa0f44 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -192,7 +192,7 @@ python do_package_rpm () { | |||
| 192 | if not overrides: | 192 | if not overrides: |
| 193 | raise bb.build.FuncFailed('OVERRIDES not defined') | 193 | raise bb.build.FuncFailed('OVERRIDES not defined') |
| 194 | overrides = bb.data.expand(overrides, localdata) | 194 | overrides = bb.data.expand(overrides, localdata) |
| 195 | bb.data.setVar('OVERRIDES', pkg + ':' + overrides, localdata) | 195 | bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) |
| 196 | 196 | ||
| 197 | bb.data.update_data(localdata) | 197 | bb.data.update_data(localdata) |
| 198 | basedir = os.path.join(os.path.dirname(root)) | 198 | basedir = os.path.join(os.path.dirname(root)) |