Patchwork poky-tiny: ensure that both poky and poky-tiny distro overrides are used

login
register
mail settings
Submitter Saul Wold
Date May 23, 2014, 6:16 p.m.
Message ID <1400868965-6748-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/72671/
State New
Headers show

Comments

Saul Wold - May 23, 2014, 6:16 p.m.
[YOCTO #6353]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta-yocto/conf/distro/poky-tiny.conf | 2 ++
 1 file changed, 2 insertions(+)
Darren Hart - May 23, 2014, 6:29 p.m.
Thanks for digging into this one Saul,

On 5/23/14, 11:16, Saul Wold wrote:
> [YOCTO #6353]
>

We do need to include a brief blurb in the commit message about what the 
problem was and why this fixes it - it can't be contained entirely in 
the BZ.

> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   meta-yocto/conf/distro/poky-tiny.conf | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
> index 2548d79..5b67e32 100644
> --- a/meta-yocto/conf/distro/poky-tiny.conf
> +++ b/meta-yocto/conf/distro/poky-tiny.conf
> @@ -30,6 +30,8 @@
>
>   require conf/distro/poky.conf
>   DISTRO = "poky-tiny"
> +DISTROOVERRIDES = "poky:poky-tiny"

    ^ Whitespace issue here?

> +
>
>   # FIXME: consider adding a new "tiny" feature
>   #DISTRO_FEATURES_append = " tiny"
>

Thanks Saul,

Patch

diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
index 2548d79..5b67e32 100644
--- a/meta-yocto/conf/distro/poky-tiny.conf
+++ b/meta-yocto/conf/distro/poky-tiny.conf
@@ -30,6 +30,8 @@ 
 
 require conf/distro/poky.conf
 DISTRO = "poky-tiny"
+DISTROOVERRIDES = "poky:poky-tiny"
+
 
 # FIXME: consider adding a new "tiny" feature
 #DISTRO_FEATURES_append = " tiny"