summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-07-10 16:47:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:24 +0100
commit0f1bbaf6f8cea2df1b3917dbe3402fbfce5bfe11 (patch)
tree5fbb77f3fc719d8edf7eebc5ac91bee4106aa141 /meta/conf/bitbake.conf
parent6bfb0c2d08c1b420dc7c65d31ac7034fc71829db (diff)
downloadpoky-0f1bbaf6f8cea2df1b3917dbe3402fbfce5bfe11.tar.gz
bitbake.conf: Use the new form of features_backfill function
This function was modified in order to be used with other variables then DISTRO_FEATURES. Use this new function name and add the parameter needed. (From OE-Core rev: a1ff96ae006accb08c58ad77d37c9e249ab94d57) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Saul Wold <sgw@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.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 80746843d7..296ebc179b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -722,7 +722,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
722IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 722IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
723 723
724DISTRO_FEATURES_BACKFILL = "pulseaudio" 724DISTRO_FEATURES_BACKFILL = "pulseaudio"
725DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}" 725DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
726 726
727COMBINED_FEATURES = "\ 727COMBINED_FEATURES = "\
728 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ 728 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \