From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] package_ipk/deb/rpm: Improve OVERRIDES handling
Date: Thu, 11 Jun 2015 23:32:24 +0100 [thread overview]
Message-ID: <1434061944.28975.247.camel@linuxfoundation.org> (raw)
Current code doesn't handle dynamic overrides so removing all
existing OVERRIDES works ok. In future this may not be the case
so ensure we add to existing overrides, not overwrite them.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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)
reply other threads:[~2015-06-11 22:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434061944.28975.247.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox