diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2013-08-15 15:33:16 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-20 22:58:04 +0100 |
| commit | b2ff1add530b1fec2fb7f385227a03db47015c37 (patch) | |
| tree | d4b3b71efe061ff6910d180ef0bcc589081f4608 /meta-yocto | |
| parent | f6ab9274bc453eee9b93fa377ccce6134c43899c (diff) | |
| download | ast2050-yocto-poky-b2ff1add530b1fec2fb7f385227a03db47015c37.zip ast2050-yocto-poky-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')
| -rw-r--r-- | meta-yocto/conf/distro/poky.conf | 11 |
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" 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}" |
