summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-08-15 18:33:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-20 21:58:04 (GMT)
commitb2ff1add530b1fec2fb7f385227a03db47015c37 (patch)
treed4b3b71efe061ff6910d180ef0bcc589081f4608 /meta-yocto/conf
parentf6ab9274bc453eee9b93fa377ccce6134c43899c (diff)
downloadpoky-b2ff1add530b1fec2fb7f385227a03db47015c37.tar.gz
poky.conf: Don't force the addition of extra DISTRO_FEATURES
The DISTRO_FEATURES shouldn't unconditionally append items to it. This makes it impossible to override it inside of local.conf or in a distro based on Poky. This moved the definition to poky.conf and created a new variable (POKY_DEFAULT_DISTRO_FEATURES) which easy overriding of this, for Poky based distros and used the 'DISTRO_FEATURES_DEFAULT' variable to avoid duplication OE-Core default. This makes the override of default DISTRO_FEATURES easier. User can now do: ,----[ Usage example for local.conf ] | DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} \ | largefile opengl multiarch" `---- (From meta-yocto rev: 3be81b70202909e273b5b555d8e66e9e644ef2c0) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/distro/poky.conf11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 7be7d92..89abffd 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -12,7 +12,12 @@ TARGET_VENDOR = "-poky"
12LOCALCONF_VERSION = "1" 12LOCALCONF_VERSION = "1"
13LAYER_CONF_VERSION ?= "6" 13LAYER_CONF_VERSION ?= "6"
14 14
15DISTRO_FEATURES_append = " largefile opengl multiarch wayland" 15# Override these in poky based distros
16POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch wayland"
17POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
18POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
19
20DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
16 21
17PREFERRED_VERSION_linux-yocto ?= "3.4%" 22PREFERRED_VERSION_linux-yocto ?= "3.4%"
18PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.8%" 23PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.8%"
@@ -27,10 +32,6 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
27 32
28EXTRAOPKGCONFIG = "poky-feed-config-opkg" 33EXTRAOPKGCONFIG = "poky-feed-config-opkg"
29 34
30# Override these in poky based distros to modify DISTRO_EXTRA_R*
31POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
32POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
33
34DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" 35DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
35DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" 36DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
36 37