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 | |
| parent | 1497af07fa4f2fb44568bd60e7979d35ecde7e36 (diff) | |
| download | openembedded-core-4d4b7922b164c875ee5c4ce8f4a54e8a40fb6bb3.tar.gz openembedded-core-4d4b7922b164c875ee5c4ce8f4a54e8a40fb6bb3.tar.bz2 openembedded-core-4d4b7922b164c875ee5c4ce8f4a54e8a40fb6bb3.zip | |
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>
| -rw-r--r-- | meta/classes/package_deb.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index d371daaf9b..90ef272c24 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -112,11 +112,7 @@ python do_package_deb () { pkgname = pkg bb.data.setVar('PKG', pkgname, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata) - if not overrides: - raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = bb.data.expand(overrides, localdata) - bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) + bb.data.setVar('OVERRIDES', pkg, localdata) bb.data.update_data(localdata) basedir = os.path.join(os.path.dirname(root)) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index da195a99e1..11b60b1563 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -179,10 +179,7 @@ python do_package_ipk () { pkgname = pkg bb.data.setVar('PKG', pkgname, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata, True) - if not overrides: - raise bb.build.FuncFailed('OVERRIDES not defined') - bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) + bb.data.setVar('OVERRIDES', pkg, localdata) bb.data.update_data(localdata) basedir = os.path.join(os.path.dirname(root)) 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 () { pkgname = pkg bb.data.setVar('PKG', pkgname, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata) - if not overrides: - raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = bb.data.expand(overrides, localdata) - bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) + bb.data.setVar('OVERRIDES', pkg, localdata) bb.data.update_data(localdata) basedir = os.path.join(os.path.dirname(root)) |