Skip to contentSkip to conversation

qemu.inc: depend on qemu-native only with runqemu DISTRO_FEATURE

PATCH In review Martin Jansa 2 participants 4 messages Feb 4, 2013 – Apr 12, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qemu.inc: depend on qemu-native only with runqemu DISTRO_FEATURE

* qemu images are usefull even without qemu installed on build machine. Some people are building on one machine, but then downloading images somewhere else to test them.
* use new "runqemu" DISTRO_FEATURE and BACKFILL it so the behavior stays the same, unless disabled by DISTRO_FEATURES_BACKFILL_CONSIDERED

---
 meta/conf/bitbake.conf             | 2 +-
 meta/conf/machine/include/qemu.inc | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
meta/conf/bitbake.conf +1 -1
index 223c03f..c5ebc94 100644
@@ -732,7 +732,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
 
-DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN}"
+DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN} runqemu"
 MACHINE_FEATURES_BACKFILL = "rtc"
 
 COMBINED_FEATURES = "\
meta/conf/machine/include/qemu.inc +2 -1
index f68bf32..1470778 100644
@@ -24,4 +24,5 @@ RDEPENDS_kernel-base = ""
 # Use a common kernel recipe for all QEMU machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 
-EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
+RUNQEMU_IMAGEDEPENDS = "qemu-native qemu-helper-native"
+EXTRA_IMAGEDEPENDS += "${@base_contains("DISTRO_FEATURES", "runqemu", "${RUNQEMU_IMAGEDEPENDS}", "", d)}"
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 5 lines · Martin Jansa

* qemu images are usefull even without qemu installed on build machine. Some people are building on one machine, but then downloading images somewhere else to test them.
* use new "runqemu" DISTRO_FEATURE and BACKFILL it so the behavior stays the same, unless disabled by DISTRO_FEATURES_BACKFILL_CONSIDERED

Using DISTRO_FEATURES for this is nasty since if you change this item, the sstate cache is invalidated. Its really a build configuration level thing, not a distro feature...

So whilst I appreciate the reasoning for it, I don't think its the right approach and we'll need to find another one.

Cheers,

Richard

#2 lore raw
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Martin Jansa

* qemu images are usefull even without qemu installed on build machine. Some people are building on one machine, but then downloading images somewhere else to test them.
* use new "runqemu" DISTRO_FEATURE and BACKFILL it so the behavior stays the same, unless disabled by DISTRO_FEATURES_BACKFILL_CONSIDERED

Quoted 6 lines

Using DISTRO_FEATURES for this is nasty since if you change this item, the sstate cache is invalidated. Its really a build configuration level thing, not a distro feature...

So whilst I appreciate the reasoning for it, I don't think its the right approach and we'll need to find another one.

What about removing this completely and adding check in runqemu script to say that qemu-native wasn't built?

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
Quoted 12 lines · Martin Jansa
Quoted 11 lines · Richard Purdie
Quoted 5 lines · Martin Jansa

* qemu images are usefull even without qemu installed on build machine. Some people are building on one machine, but then downloading images somewhere else to test them.
* use new "runqemu" DISTRO_FEATURE and BACKFILL it so the behavior stays the same, unless disabled by DISTRO_FEATURES_BACKFILL_CONSIDERED

Using DISTRO_FEATURES for this is nasty since if you change this item, the sstate cache is invalidated. Its really a build configuration level thing, not a distro feature...

Quoted 5 lines
Quoted 2 lines

So whilst I appreciate the reasoning for it, I don't think its the right approach and we'll need to find another one.

What about removing this completely and adding check in runqemu script to say that qemu-native wasn't built?

Or using IMAGETEST variable?

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]