From af377d6e0c3a0008af2ed1388f931d62206fb077 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Jun 2015 14:06:13 +0000 Subject: package_ipk/deb/rpm: Improve OVERRIDES handling (From OE-Core rev: 59ca90114fb0b770d9d79e548b7e52aa0c089e48) Signed-off-by: Richard Purdie --- 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 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) -- cgit v1.2.3-54-g00ecf