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>

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 560b7bc9c9ce4669c4bac7caa333246a76afb099..cd8d1dfc6913e2d8c6213042fac2d94e51b507aa 100644 (file)
--- 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 da195a99e13d0c709ea84a3a4a7a80b147807c45..1b40cfebc908199f5308564606317e90748678bd 100644 (file)
--- 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 0e7bfa0f440fdb37dfc7be3f18a5f0d7e61b4725..b08d4784794e82394c15f39894c081fce9b9ed08 100644 (file)
--- 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))