diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-07 12:53:46 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-07-07 12:56:25 +0100 |
commit | 2b9dbe57a4bf072f907f34da15042bc7e3386ac6 (patch) | |
tree | 50e21a3e13768ee71514cf7e6a9c8068ecef0fcd /meta/classes/package_deb.bbclass | |
parent | d538d8e17197f5dda39abbff3b4bd171f8248af9 (diff) | |
download | poky-2b9dbe57a4bf072f907f34da15042bc7e3386ac6.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_deb.bbclass')
-rw-r--r-- | meta/classes/package_deb.bbclass | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 94a07b3481..622eca8113 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -112,11 +112,7 @@ python do_package_deb () { | |||
112 | pkgname = pkg | 112 | pkgname = pkg |
113 | bb.data.setVar('PKG', pkgname, localdata) | 113 | bb.data.setVar('PKG', pkgname, localdata) |
114 | 114 | ||
115 | overrides = bb.data.getVar('OVERRIDES', localdata) | 115 | bb.data.setVar('OVERRIDES', pkg, localdata) |
116 | if not overrides: | ||
117 | raise bb.build.FuncFailed('OVERRIDES not defined') | ||
118 | overrides = bb.data.expand(overrides, localdata) | ||
119 | bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) | ||
120 | 116 | ||
121 | bb.data.update_data(localdata) | 117 | bb.data.update_data(localdata) |
122 | basedir = os.path.join(os.path.dirname(root)) | 118 | basedir = os.path.join(os.path.dirname(root)) |