do_populate_sdk fixes

The following changes since commit ab0187c13b2b0a041bf3d98c3a53bd3f45a624de:

libxcb: Update for python-native changes (2012-07-30 16:53:49 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/sdk-rpmresolve
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sdk-rpmresolve

Paul Eggleton (2):
classes/populate_sdk_base: don't break existing do_populate_sdk
depends
classes/populate_sdk_rpm: add depends on rpmresolve-native

 meta/classes/populate_sdk_base.bbclass |    2 +-
 meta/classes/populate_sdk_rpm.bbclass  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

1.7.9.5

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.

---
 meta/classes/populate_sdk_base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 9483e93..55ec684 100644
@@ -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

1.7.9.5

As of OE-Core revision 72d1048a8381fa4a8c4c0d082047536727b4be47, rpmresolve is now required for complementary package installation during do_populate_sdk.

---
 meta/classes/populate_sdk_rpm.bbclass |    1 +
 1 file changed, 1 insertion(+)

index fac653b..b4b27ba 100644
@@ -1,4 +1,5 @@
 do_populate_sdk[depends] += "rpm-native:do_populate_sysroot"
+do_populate_sdk[depends] += "rpmresolve-native:do_populate_sysroot"
 do_populate_sdk[recrdeptask] += "do_package_write_rpm"
 
 rpmlibdir = "/var/lib/rpm"

1.7.9.5

Merged to master, thanks.

Richard