[oe-commits] Richard Purdie : package_ipk/deb/rpm: Improve OVERRIDES handling

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 0c5c52c20f29a52b2adcfc2b8e4b6cfdf3680065
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0c5c52c20f29a52b2adcfc2b8e4b6cfdf3680065

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Jun  2 14:06:13 2015 +0000

package_ipk/deb/rpm: Improve OVERRIDES handling

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 9d7c59b..d797663 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -75,7 +75,7 @@ python do_package_deb () {
             pkgname = pkg
         localdata.setVar('PKG', pkgname)
 
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
 
         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 dba6804..9fb9d53 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -58,7 +58,7 @@ python do_package_ipk () {
             pkgname = pkg
         localdata.setVar('PKG', pkgname)
 
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
 
         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 e305e8b..3988b73 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -330,7 +330,7 @@ python write_specfile () {
             pkgname = pkg
         localdata.setVar('PKG', pkgname)
 
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
 
         bb.data.update_data(localdata)