Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 0/2] do_populate_sdk fixes
@ 2012-07-30 23:10 Paul Eggleton
  2012-07-30 23:10 ` [PATCH 1/2] classes/populate_sdk_base: don't break existing do_populate_sdk depends Paul Eggleton
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Paul Eggleton @ 2012-07-30 23:10 UTC (permalink / raw)
  To: openembedded-core

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




^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] classes/populate_sdk_base: don't break existing do_populate_sdk depends
  2012-07-30 23:10 [PATCH 0/2] do_populate_sdk fixes Paul Eggleton
@ 2012-07-30 23:10 ` Paul Eggleton
  2012-07-30 23:10 ` [PATCH 2/2] classes/populate_sdk_rpm: add depends on rpmresolve-native Paul Eggleton
  2012-07-31 10:48 ` [PATCH 0/2] do_populate_sdk fixes Richard Purdie
  2 siblings, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2012-07-30 23:10 UTC (permalink / raw)
  To: openembedded-core

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(-)

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
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] classes/populate_sdk_rpm: add depends on rpmresolve-native
  2012-07-30 23:10 [PATCH 0/2] do_populate_sdk fixes Paul Eggleton
  2012-07-30 23:10 ` [PATCH 1/2] classes/populate_sdk_base: don't break existing do_populate_sdk depends Paul Eggleton
@ 2012-07-30 23:10 ` Paul Eggleton
  2012-07-31 10:48 ` [PATCH 0/2] do_populate_sdk fixes Richard Purdie
  2 siblings, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2012-07-30 23:10 UTC (permalink / raw)
  To: openembedded-core

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

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

diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index fac653b..b4b27ba 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -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




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 0/2] do_populate_sdk fixes
  2012-07-30 23:10 [PATCH 0/2] do_populate_sdk fixes Paul Eggleton
  2012-07-30 23:10 ` [PATCH 1/2] classes/populate_sdk_base: don't break existing do_populate_sdk depends Paul Eggleton
  2012-07-30 23:10 ` [PATCH 2/2] classes/populate_sdk_rpm: add depends on rpmresolve-native Paul Eggleton
@ 2012-07-31 10:48 ` Richard Purdie
  2 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2012-07-31 10:48 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Tue, 2012-07-31 at 00:10 +0100, Paul Eggleton wrote:
> 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

Merged to master, thanks.

Richard




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-31 11:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-30 23:10 [PATCH 0/2] do_populate_sdk fixes Paul Eggleton
2012-07-30 23:10 ` [PATCH 1/2] classes/populate_sdk_base: don't break existing do_populate_sdk depends Paul Eggleton
2012-07-30 23:10 ` [PATCH 2/2] classes/populate_sdk_rpm: add depends on rpmresolve-native Paul Eggleton
2012-07-31 10:48 ` [PATCH 0/2] do_populate_sdk fixes Richard Purdie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox