diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-07-01 16:14:21 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-07-01 16:14:21 +0100 |
commit | 3abe7a0624e1215124799f97c872682a98659760 (patch) | |
tree | 22fb792a09eda7202bac6a231c6532b46de3c5f9 /meta | |
parent | 934bb71c9d40bd5394e64e63c71558e87639141a (diff) | |
download | ast2050-yocto-poky-3abe7a0624e1215124799f97c872682a98659760.zip ast2050-yocto-poky-3abe7a0624e1215124799f97c872682a98659760.tar.gz |
classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging
The OVERRIDES variable was being incorrectly set with the end result of the
runtime dependencies of the package not being encoded in it's package metadata.
This broke opkg-native in meta-toolchain.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_deb.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 560b7bc..cd8d1df 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -116,7 +116,7 @@ python do_package_deb () { 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 + ':' + overrides, 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 da195a9..1b40cfe 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -182,7 +182,7 @@ python do_package_ipk () { 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 + ':' + overrides, 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 0e7bfa0..b08d478 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -192,7 +192,7 @@ python do_package_rpm () { 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 + ':' + overrides, localdata) bb.data.update_data(localdata) basedir = os.path.join(os.path.dirname(root)) |