summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/conf/local.conf.sample8
-rw-r--r--meta/conf/bitbake.conf1
2 files changed, 5 insertions, 4 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 9cdbe59d92..5e55f92772 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -35,7 +35,7 @@ DISTRO ?= "poky"
35# For bleeding edge / experimental / unstable package versions 35# For bleeding edge / experimental / unstable package versions
36# DISTRO ?= "poky-bleeding" 36# DISTRO ?= "poky-bleeding"
37 37
38# IMAGE_FEATURES configuration of the generated images 38# EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images
39# (Some of these are automatically added to certain image types) 39# (Some of these are automatically added to certain image types)
40# "dbg-pkgs" - add -dbg packages for all installed packages 40# "dbg-pkgs" - add -dbg packages for all installed packages
41# (adds symbol information for debugging/profiling) 41# (adds symbol information for debugging/profiling)
@@ -50,13 +50,13 @@ DISTRO ?= "poky"
50# There are other application targets too, see meta/classes/poky-image.bbclass 50# There are other application targets too, see meta/classes/poky-image.bbclass
51# and meta/packages/tasks/task-poky.bb for more details. 51# and meta/packages/tasks/task-poky.bb for more details.
52 52
53IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" 53EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
54 54
55# The default IMAGE_FEATURES above are too large for the mx31phy and 55# The default IMAGE_FEATURES above are too large for the mx31phy and
56# c700/c750 machines which have limited space. The code below limits 56# c700/c750 machines which have limited space. The code below limits
57# the default features for those machines. 57# the default features for those machines.
58IMAGE_FEATURES_c7x0 = "tools-testapps debug-tweaks" 58EXTRA_IMAGE_FEATURES_c7x0 = "tools-testapps debug-tweaks"
59IMAGE_FEATURES_mx31phy = "tools-testapps debug-tweaks" 59EXTRA_IMAGE_FEATURES_mx31phy = "tools-testapps debug-tweaks"
60 60
61# A list of packaging systems used in generated images 61# A list of packaging systems used in generated images
62# The first package type listed will be used for rootfs generation 62# The first package type listed will be used for rootfs generation
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 49df8869a4..75a69f6dac 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -588,6 +588,7 @@ MACHINE_EXTRA_RDEPENDS ?= ""
588MACHINE_EXTRA_RRECOMMENDS ?= "" 588MACHINE_EXTRA_RRECOMMENDS ?= ""
589MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" 589MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
590MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" 590MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
591IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
591 592
592COMBINED_FEATURES = "\ 593COMBINED_FEATURES = "\
593 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ 594 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \