diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-23 14:52:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:55:49 +0100 |
commit | abd5b24ff7f94875d69fca664e9d9ff8ac35c0ad (patch) | |
tree | e45f0be2ce5c8d027bbcb11face72a74afd445e4 /meta/conf/bitbake.conf | |
parent | f81065f5b2313fc4d967c0144b90838f33e6ff60 (diff) | |
download | poky-abd5b24ff7f94875d69fca664e9d9ff8ac35c0ad.tar.gz |
bitbake.conf: rename 'gobject-introspection-data' machine feature to 'qemu-usermode'
The new value is more general and better reflects what having the feature really means.
Introspection data, then, is built only if 'gobject-introspection-data' is in
DISTRO_FEATURES and 'qemu-usermode' is in MACHINE_FEATURES.
(From OE-Core rev: 9927a3d72e2272d8e3dc4785ba02e27802ee1c6c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e3db5041f3..d4fb5f3571 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -762,7 +762,7 @@ EXTRA_IMAGE_FEATURES ??= "" | |||
762 | IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" | 762 | IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" |
763 | 763 | ||
764 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data" | 764 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data" |
765 | MACHINE_FEATURES_BACKFILL = "rtc gobject-introspection-data" | 765 | MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" |
766 | 766 | ||
767 | COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" | 767 | COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" |
768 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" | 768 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" |