Skip to contentSkip to conversation

arm-bsp/layer.conf: add meta-python for musca

PATCH In review Ross Burton 3 participants 5 messages Oct 20, 2020 – Oct 25, 2020

lore
Share & tools
lore
#0 lore raw

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

Change-Id I46568f3144519bc25a65bce3d29d0ae659335f55
---
 meta-arm-bsp/conf/layer.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-arm-bsp/conf/layer.conf +5 -1
index 816ff9d..eedb7e0 100644
@@ -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"
Signature · 1 line
2.25.1
#1 lore raw

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

Change-Id I7e39c39f14a9ccf32ccfbc732f57c0df79034885
---
 meta-arm-bsp/documentation/musca-b1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm-bsp/documentation/musca-b1.md +1 -1
index 9fde10a..a9af03f 100644
@@ -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
Signature · 1 line
2.25.1
#2 lore raw
In reply to Ross Burton
Quoted 11 lines · Ross Burton
Change-Id I46568f3144519bc25a65bce3d29d0ae659335f55
---
 meta-arm-bsp/conf/layer.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-arm-bsp/conf/layer.conf +0 -0
index 816ff9d..eedb7e0 100644

meta-arm-bsp/conf/layer.conf BBFILE_COLLECTIONS += "meta-arm-bsp" · line 17

Quoted 10 lines
meta-arm-bsp/conf/layer.conf +5 -1
@@ -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?

Quoted 7 lines
Signature · 1 line
2.25.1
#3 lore raw
Quoted 2 lines · Denys Dmytriyenko

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

#4 lore raw
In reply to Ross Burton
Quoted 2 lines · Ross Burton
Change-Id I46568f3144519bc25a65bce3d29d0ae659335f55

Series applied to master.

Thanks,
Jon

Quoted 26 lines
---
 meta-arm-bsp/conf/layer.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-arm-bsp/conf/layer.conf +5 -1
index 816ff9d..eedb7e0 100644
@@ -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"
Signature · 1 line
2.25.1