summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-04-28 12:03:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-03 11:43:52 +0100
commitee1c1ea39340e17ef5bbf50252dd969592c0202c (patch)
tree1affd607e3ff64ebcc7c5a07368ab0dc0ea00efc /meta/conf
parentdbdf1ed58d393f564e9333272383d813eba50059 (diff)
downloadpoky-ee1c1ea39340e17ef5bbf50252dd969592c0202c.tar.gz
bitbake.conf: backfill bluez5 feature
If bluez4 is not explicitly passed as a distro feature, bluez5 should be used as the default, so backfill it. (From OE-Core rev: ae2d2fbafab638fa6c2496a836c8d00529a40d83) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2b3c110d36..f544a71d17 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -733,7 +733,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
733EXTRA_IMAGE_FEATURES ??= "" 733EXTRA_IMAGE_FEATURES ??= ""
734IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 734IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
735 735
736DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit" 736DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5"
737MACHINE_FEATURES_BACKFILL = "rtc" 737MACHINE_FEATURES_BACKFILL = "rtc"
738 738
739COMBINED_FEATURES = "\ 739COMBINED_FEATURES = "\