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>
This commit is contained in:
parent
f6ab9274bc
commit
b2ff1add53
|
@ -12,7 +12,12 @@ TARGET_VENDOR = "-poky"
|
|||
LOCALCONF_VERSION = "1"
|
||||
LAYER_CONF_VERSION ?= "6"
|
||||
|
||||
DISTRO_FEATURES_append = " largefile opengl multiarch wayland"
|
||||
# Override these in poky based distros
|
||||
POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch wayland"
|
||||
POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
|
||||
POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
|
||||
|
||||
DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
|
||||
|
||||
PREFERRED_VERSION_linux-yocto ?= "3.4%"
|
||||
PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.8%"
|
||||
|
@ -27,10 +32,6 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
|
|||
|
||||
EXTRAOPKGCONFIG = "poky-feed-config-opkg"
|
||||
|
||||
# Override these in poky based distros to modify DISTRO_EXTRA_R*
|
||||
POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
|
||||
POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
|
||||
|
||||
DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
|
||||
DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
|
||||
|
||||
|
|
Loading…
Reference in New Issue