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>

3 files changed, 3 insertions, 3 deletions

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 560b7bc9c9..cd8d1dfc69 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 da195a99e1..1b40cfebc9 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))