diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-07 12:53:46 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-07 12:53:46 +0100 |
commit | 4d4b7922b164c875ee5c4ce8f4a54e8a40fb6bb3 (patch) | |
tree | 829e7d3ae6f1b22fb969fa5930b6deccb6e4edbf /meta/classes/package_rpm.bbclass | |
parent | 1497af07fa4f2fb44568bd60e7979d35ecde7e36 (diff) | |
download | poky-4d4b7922b164c875ee5c4ce8f4a54e8a40fb6bb3.tar.gz |
package_*.bbclass: Only set pkg in overrides. These are the only values we're interested in expanding and this makes sure we obtain the expected data
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 0e7bfa0f44..da4f64cc91 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -188,11 +188,7 @@ python do_package_rpm () { | |||
188 | pkgname = pkg | 188 | pkgname = pkg |
189 | bb.data.setVar('PKG', pkgname, localdata) | 189 | bb.data.setVar('PKG', pkgname, localdata) |
190 | 190 | ||
191 | overrides = bb.data.getVar('OVERRIDES', localdata) | 191 | bb.data.setVar('OVERRIDES', pkg, localdata) |
192 | if not overrides: | ||
193 | raise bb.build.FuncFailed('OVERRIDES not defined') | ||
194 | overrides = bb.data.expand(overrides, localdata) | ||
195 | bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) | ||
196 | 192 | ||
197 | bb.data.update_data(localdata) | 193 | bb.data.update_data(localdata) |
198 | basedir = os.path.join(os.path.dirname(root)) | 194 | basedir = os.path.join(os.path.dirname(root)) |