From 2b9dbe57a4bf072f907f34da15042bc7e3386ac6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 7 Jul 2010 12:53:46 +0100 Subject: 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 --- meta/classes/package_deb.bbclass | 6 +----- meta/classes/package_ipk.bbclass | 5 +---- 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 94a07b3481..622eca8113 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 04b117b75d..9d4e87d06e 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)) -- cgit v1.2.3-54-g00ecf