[PATCH 1/2] arm-bsp/layer.conf: add meta-python for musca

[PATCH 1/2] arm-bsp/layer.conf: add meta-python for musca

[Ross Burton]

Change-Id: I46568f3144519bc25a65bce3d29d0ae659335f55
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/conf/layer.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
index 816ff9d..eedb7e0 100644
--- a/meta-arm-bsp/conf/layer.conf
+++ b/meta-arm-bsp/conf/layer.conf
@@ -9,5 +9,9 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
 BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arm-bsp = "6"
 
-LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel"
 LAYERSERIES_COMPAT_meta-arm-bsp = "dunfell gatesgarth"
+
+LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel"
+# This won't be used by layerindex-fetch, but works everywhere else
+LAYERDEPENDS_meta-arm-bsp_append_musca-b1 = " meta-python"
+LAYERDEPENDS_meta-arm-bsp_append_musca-s1 = " meta-python"
-- 
2.25.1

[PATCH 2/2] arm-bsp: fix typo in musca-b1 documentation

[Ross Burton]

Change-Id: I7e39c39f14a9ccf32ccfbc732f57c0df79034885
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/documentation/musca-b1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm-bsp/documentation/musca-b1.md b/meta-arm-bsp/documentation/musca-b1.md
index 9fde10a..a9af03f 100644
--- a/meta-arm-bsp/documentation/musca-b1.md
+++ b/meta-arm-bsp/documentation/musca-b1.md
@@ -19,7 +19,7 @@ To build for Zephyr:
 ```bash$ bitbake zephyr-philosophers```
 
 To build the trusted firmware-m (and not Zephyr):
-```bash$ bitbake trusted-frimware-m```
+```bash$ bitbake trusted-firmware-m```
 
 ## Running
 To run Zephyr on the QEMU based machine, execute the following command
-- 
2.25.1

Re: [meta-arm] [PATCH 1/2] arm-bsp/layer.conf: add meta-python for musca

[Denys Dmytriyenko]

On Tue, Oct 20, 2020 at 05:01:35PM +0100, Ross Burton wrote:
> Change-Id: I46568f3144519bc25a65bce3d29d0ae659335f55
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta-arm-bsp/conf/layer.conf | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
> index 816ff9d..eedb7e0 100644
> --- a/meta-arm-bsp/conf/layer.conf
> +++ b/meta-arm-bsp/conf/layer.conf
> @@ -9,5 +9,9 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
>  BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
>  BBFILE_PRIORITY_meta-arm-bsp = "6"
>  
> -LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel"
>  LAYERSERIES_COMPAT_meta-arm-bsp = "dunfell gatesgarth"
> +
> +LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel"
> +# This won't be used by layerindex-fetch, but works everywhere else
> +LAYERDEPENDS_meta-arm-bsp_append_musca-b1 = " meta-python"
> +LAYERDEPENDS_meta-arm-bsp_append_musca-s1 = " meta-python"

LAYERDEPENDS changing based on the machine being built? Isn't it rather 
backwards?


> -- 
> 2.25.1
> 

> 
> 
> 

Re: [meta-arm] [PATCH 1/2] arm-bsp/layer.conf: add meta-python for musca

[Ross Burton]

On Tue, 20 Oct 2020 at 18:07, Denys Dmytriyenko <denis@denix.org> wrote:
> LAYERDEPENDS changing based on the machine being built? Isn't it rather
> backwards?

Only a little. :). There's some meta-python dependencies that are only
relevant for the musca boards.  The alternative are:

1) Don't add this dependency and get missing recipe errors when
building musca without meta-python. Bad.
2) Always depend on meta-python, although it's only needed for musca.  Bad.

I consider this to be the least worst solution.  It doesn't fetch
meta-python if you use layerindex-fetch, but you'll get a good error
message in that case if you build for musca.

Ross

Re: [meta-arm] [PATCH 1/2] arm-bsp/layer.conf: add meta-python for musca

[Jon Mason]

On Tue, Oct 20, 2020 at 05:01:35PM +0100, Ross Burton wrote:
> Change-Id: I46568f3144519bc25a65bce3d29d0ae659335f55
> Signed-off-by: Ross Burton <ross.burton@arm.com>

Series applied to master.

Thanks,
Jon

> ---
>  meta-arm-bsp/conf/layer.conf | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf
> index 816ff9d..eedb7e0 100644
> --- a/meta-arm-bsp/conf/layer.conf
> +++ b/meta-arm-bsp/conf/layer.conf
> @@ -9,5 +9,9 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
>  BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
>  BBFILE_PRIORITY_meta-arm-bsp = "6"
>  
> -LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel"
>  LAYERSERIES_COMPAT_meta-arm-bsp = "dunfell gatesgarth"
> +
> +LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel"
> +# This won't be used by layerindex-fetch, but works everywhere else
> +LAYERDEPENDS_meta-arm-bsp_append_musca-b1 = " meta-python"
> +LAYERDEPENDS_meta-arm-bsp_append_musca-s1 = " meta-python"
> -- 
> 2.25.1
> 

> 
> 
>