summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-02 14:06:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:58:02 +0100
commit59ca90114fb0b770d9d79e548b7e52aa0c089e48 (patch)
treec7934983c1598e47bd7b68ca7eaf17df0b190d4a /meta
parent0dbe539403fc0da3c3d0b1a6636bc7c9d0e19484 (diff)
downloadopenembedded-core-59ca90114fb0b770d9d79e548b7e52aa0c089e48.tar.gz
openembedded-core-59ca90114fb0b770d9d79e548b7e52aa0c089e48.tar.bz2
openembedded-core-59ca90114fb0b770d9d79e548b7e52aa0c089e48.zip
package_ipk/deb/rpm: Improve OVERRIDES handling
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_deb.bbclass2
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 9d7c59ba53..d79766361f 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 dba68042ac..9fb9d53e61 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 e305e8b4ab..3988b730f3 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)