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.

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index edec2a47f6f4ae7b383467bc587fee8229b077f7..d371daaf9bed2feb95e7592194dcc1f28dbf20dc 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', 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 1b40cfebc908199f5308564606317e90748678bd..da195a99e13d0c709ea84a3a4a7a80b147807c45 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', 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 b08d4784794e82394c15f39894c081fce9b9ed08..0e7bfa0f440fdb37dfc7be3f18a5f0d7e61b4725 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', pkg + ':' + overrides, localdata)
+               bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
 
                bb.data.update_data(localdata)
                basedir = os.path.join(os.path.dirname(root))