From 1497af07fa4f2fb44568bd60e7979d35ecde7e36 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 7 Jul 2010 12:13:29 +0100 Subject: Revert "classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging" This reverts commit 3abe7a0624e1215124799f97c872682a98659760 which was incorrect in some assumptions about OVERRIDE handling order. --- 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/classes') diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index edec2a47f..d371daaf9 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', pkg + ':' + overrides, localdata) + bb.data.setVar('OVERRIDES', 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 1b40cfebc..da195a99e 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', pkg + ':' + overrides, localdata) + bb.data.setVar('OVERRIDES', 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 b08d47847..0e7bfa0f4 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', pkg + ':' + overrides, localdata) + bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) bb.data.update_data(localdata) basedir = os.path.join(os.path.dirname(root)) -- cgit v1.2.3