From e62567a386a88182029dc5132100750283b7c5d7 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Thu, 5 Aug 2021 09:30:59 -0400
Subject: [PATCH] CI: rename meta-python to meta-openembedded

Rename the meta-python.yml file to be meta-openembedded.  This allows
for more usage of the layers present there (as meta-python is housed
under meta-openembedded).

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml                                |  2 +-
 ci/gem5-arm64-xen.yml                         |  8 +-------
 ci/gem5-arm64.yml                             |  6 +-----
 ci/meta-arm-autonomy.yml                      | 10 ++--------
 ci/{meta-python.yml => meta-openembedded.yml} |  2 ++
 ci/meta-zephyr.yml                            |  2 +-
 ci/musca-s1.yml                               |  2 +-
 7 files changed, 9 insertions(+), 23 deletions(-)
 rename ci/{meta-python.yml => meta-openembedded.yml} (76%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a85d2cd7..98a79087 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ check-layers:
   extends: .setup
   coverage: '/Coverage: \d+/'
   script:
-  - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-python.yml --command \
+  - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-openembedded.yml --command \
     "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR"
 
 corstone500:
diff --git a/ci/gem5-arm64-xen.yml b/ci/gem5-arm64-xen.yml
index 4a6fb3b1..f71ffca3 100644
--- a/ci/gem5-arm64-xen.yml
+++ b/ci/gem5-arm64-xen.yml
@@ -3,18 +3,12 @@ header:
   version: 9
   includes:
     - base.yml
-    - meta-python.yml
+    - meta-openembedded.yml
 
 repos:
   meta-arm:
     layers:
       meta-gem5:
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    layers:
-      meta-oe:
-      meta-filesystems:
-      meta-networking:
   meta-virtualization:
     url: git://git.yoctoproject.org/meta-virtualization
     #FIXME - remove after master branch has overrides syntax conversion patch
diff --git a/ci/gem5-arm64.yml b/ci/gem5-arm64.yml
index fc1b5c91..6d348fc7 100644
--- a/ci/gem5-arm64.yml
+++ b/ci/gem5-arm64.yml
@@ -2,17 +2,13 @@ header:
   version: 9
   includes:
     - base.yml
+    - meta-openembedded.yml
 
 repos:
   meta-arm:
     layers:
       meta-gem5:
 
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    layers:
-      meta-oe:
-
 machine: gem5-arm64
 
 target:
diff --git a/ci/meta-arm-autonomy.yml b/ci/meta-arm-autonomy.yml
index f95642c7..4402b968 100644
--- a/ci/meta-arm-autonomy.yml
+++ b/ci/meta-arm-autonomy.yml
@@ -1,15 +1,9 @@
 header:
   version: 9
+  includes:
+    - meta-openembedded.yml
 
 repos:
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    layers:
-      meta-oe:
-      meta-networking:
-      meta-python:
-      meta-filesystem:
-
   meta-virtualization:
     url: https://git.yoctoproject.org/git/meta-virtualization
 
diff --git a/ci/meta-python.yml b/ci/meta-openembedded.yml
similarity index 76%
rename from ci/meta-python.yml
rename to ci/meta-openembedded.yml
index 0b4b958e..4b95217b 100644
--- a/ci/meta-python.yml
+++ b/ci/meta-openembedded.yml
@@ -5,5 +5,7 @@ repos:
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
     layers:
+      meta-filesystems:
+      meta-networking:
       meta-oe:
       meta-python:
diff --git a/ci/meta-zephyr.yml b/ci/meta-zephyr.yml
index aa3f97c1..2b9d19e5 100644
--- a/ci/meta-zephyr.yml
+++ b/ci/meta-zephyr.yml
@@ -1,7 +1,7 @@
 header:
   version: 9
   includes:
-    - meta-python.yml
+    - meta-openembedded.yml
 
 repos:
   meta-zephyr:
diff --git a/ci/musca-s1.yml b/ci/musca-s1.yml
index 30a12d53..4d31a682 100644
--- a/ci/musca-s1.yml
+++ b/ci/musca-s1.yml
@@ -2,7 +2,7 @@ header:
   version: 9
   includes:
     - base.yml
-    - meta-python.yml
+    - meta-openembedded.yml
 
 machine: musca-s1