Skip to contentSkip to conversation

CI: Add packages for opencsd and gator-daemon to base build

PATCH Applied Jon Mason 3 participants 3 messages Oct 31, 2022 – Nov 1, 2022

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 CI: Add packages for opencsd and gator-daemon to base build

opencsd and gator-daemon aren't currently being build. Add them to the base build so that they can be verified to at least compile.

---
 ci/base.yml                | 5 +++--
 ci/corstone1000-common.yml | 2 +-
 ci/corstone500.yml         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
ci/base.yml +3 -2
index c4e68886..75a30925 100644
@@ -35,8 +35,9 @@ local_conf_header:
     PACKAGECONFIG:append:pn-perf = " coresight"
     INHERIT += "rm_work"
     DISTRO_FEATURES:remove = "ptest"
-  perf: |
-    CORE_IMAGE_EXTRA_INSTALL += "perf"
+  extrapackages: |
+    CORE_IMAGE_EXTRA_INSTALL += "perf opencsd"
+    CORE_IMAGE_EXTRA_INSTALL:aarch64 += "gator-daemon"
 
 machine: unset
 
ci/corstone1000-common.yml +1 -1
index 970a87c9..65ff9d38 100644
@@ -5,7 +5,7 @@ header:
     - ci/meta-openembedded.yml
 
 local_conf_header:
-    perf: |
+    extrapackages: |
     # Intentionally blank to prevent perf from being added to the image in base.yml
 
 distro: poky-tiny
ci/corstone500.yml +1 -1
index d51d45fb..54633e1c 100644
@@ -7,7 +7,7 @@ local_conf_header:
   testimagefvp: |
     INHERIT += "fvpboot"
     IMAGE_FEATURES:remove = " ssh-server-dropbear"
-  perf: |
+  extrapackages: |
     # Intentionally blank to prevent perf from being added to the image in base.yml
 
 machine: corstone500
Signature · 1 line
2.17.1
#1 lore raw
Quoted 15 lines · Jon Mason

opencsd and gator-daemon aren't currently being build. Add them to the base build so that they can be verified to at least compile.

---
 ci/base.yml                | 5 +++--
 ci/corstone1000-common.yml | 2 +-
 ci/corstone500.yml         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
ci/base.yml +0 -0
index c4e68886..75a30925 100644

ci/base.yml local_conf_header: · line 40

Quoted 8 lines
ci/base.yml +3 -2
@@ -35,8 +35,9 @@ local_conf_header:
     PACKAGECONFIG:append:pn-perf = " coresight"
     INHERIT += "rm_work"
     DISTRO_FEATURES:remove = "ptest"
-  perf: |
-    CORE_IMAGE_EXTRA_INSTALL += "perf"
+  extrapackages: |
+    CORE_IMAGE_EXTRA_INSTALL += "perf opencsd"
+    CORE_IMAGE_EXTRA_INSTALL:aarch64 += "gator-daemon"

Should this be CORE_IMAGE_EXTRA_INSTALL:append:aarch64 = "gator-daemon" instead?

Quoted 32 lines
ci/base.yml +0 -0
 machine: unset
 
ci/corstone1000-common.yml +1 -1
index 970a87c9..65ff9d38 100644
@@ -5,7 +5,7 @@ header:
     - ci/meta-openembedded.yml
 
 local_conf_header:
-    perf: |
+    extrapackages: |
     # Intentionally blank to prevent perf from being added to the image in base.yml
 
 distro: poky-tiny
ci/corstone500.yml +1 -1
index d51d45fb..54633e1c 100644
@@ -7,7 +7,7 @@ local_conf_header:
   testimagefvp: |
     INHERIT += "fvpboot"
     IMAGE_FEATURES:remove = " ssh-server-dropbear"
-  perf: |
+  extrapackages: |
     # Intentionally blank to prevent perf from being added to the image in base.yml
 
 machine: corstone500
Signature · 1 line
2.17.1
Applied
#2 lore raw
In reply to Jon Mason
Quoted 2 lines · Jon Mason

opencsd and gator-daemon aren't currently being build. Add them to the base build so that they can be verified to at least compile.

Applied, thanks!

[1/1] CI: Add packages for opencsd and gator-daemon to base build

      commit: 49b23ff619eb10521fdb58faae2c4d8a1942909c

Best regards,

Signature · 1 line
Jon Mason <[email protected]>