Patchwork [1/2] classes/populate_sdk_base: don't break existing do_populate_sdk depends

login
mail settings
Submitter Paul Eggleton
Date July 30, 2012, 11:10 p.m.
Message ID <f4612ddce497c497c57af03ed5b35ab89ffa7e9e.1343689827.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/33321/
State Accepted
Commit a87b5d6cab34579cf3abe03f4663d9a72e218397
Headers show

Comments

Paul Eggleton - July 30, 2012, 11:10 p.m.
We set do_populate_sdk[depends] in populate_sdk_*.bbclass, but since
these are inherited at the top of populate_sdk_base.bbclass, those
values are wiped out by using = at the end of the latter class. Use +=
to avoid this.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/populate_sdk_base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 9483e93..55ec684 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -122,7 +122,7 @@  populate_sdk_log_check() {
 
 do_populate_sdk[dirs] = "${TOPDIR}"
 do_populate_sdk[nostamp] = "1"
-do_populate_sdk[depends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])}"
+do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])}"
 do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
 do_populate_sdk[recrdeptask] = "do_package_write"
 addtask populate_sdk