package_*.bbclass: Only set pkg in overrides. These are the only values we're interes...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index d371daaf9bed2feb95e7592194dcc1f28dbf20dc..90ef272c24b2321631d0c93d568b3ddb40e50305 100644 (file)
--- 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 da195a99e13d0c709ea84a3a4a7a80b147807c45..11b60b1563babaa80960c6d9c2171077aa46c936 100644 (file)
--- 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 0e7bfa0f440fdb37dfc7be3f18a5f0d7e61b4725..da4f64cc91f88d70e478c49f90dae739fbf629b1 100644 (file)
--- 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))