summaryrefslogtreecommitdiffstats
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-16 14:21:29 +0100
commitaf377d6e0c3a0008af2ed1388f931d62206fb077 (patch)
treeb8acec845c9d7a5cae47e539422e7c46cf7ee35f /meta
parent379a030702c985c6e69831173f765a47dfeb8841 (diff)
downloadpoky-af377d6e0c3a0008af2ed1388f931d62206fb077.tar.gz
package_ipk/deb/rpm: Improve OVERRIDES handling
(From OE-Core rev: 59ca90114fb0b770d9d79e548b7e52aa0c089e48) 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 () {
75 pkgname = pkg 75 pkgname = pkg
76 localdata.setVar('PKG', pkgname) 76 localdata.setVar('PKG', pkgname)
77 77
78 localdata.setVar('OVERRIDES', pkg) 78 localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
79 79
80 bb.data.update_data(localdata) 80 bb.data.update_data(localdata)
81 basedir = os.path.join(os.path.dirname(root)) 81 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 () {
58 pkgname = pkg 58 pkgname = pkg
59 localdata.setVar('PKG', pkgname) 59 localdata.setVar('PKG', pkgname)
60 60
61 localdata.setVar('OVERRIDES', pkg) 61 localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
62 62
63 bb.data.update_data(localdata) 63 bb.data.update_data(localdata)
64 basedir = os.path.join(os.path.dirname(root)) 64 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 () {
330 pkgname = pkg 330 pkgname = pkg
331 localdata.setVar('PKG', pkgname) 331 localdata.setVar('PKG', pkgname)
332 332
333 localdata.setVar('OVERRIDES', pkg) 333 localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
334 334
335 bb.data.update_data(localdata) 335 bb.data.update_data(localdata)
336 336