From d42f0b915306baebdf505702b693e953e3b54e5e Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 1 Jul 2010 16:14:21 +0100 Subject: 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 --- meta/classes/package_deb.bbclass | 2 +- meta/classes/package_ipk.bbclass | 2 +- meta/classes/package_rpm.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 94a07b3481..d53224430a 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 04b117b75d..6db0ee8a32 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 0e7bfa0f44..b08d478479 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)) -- cgit v1.2.3-54-g00ecf