chore: kas: refactor meta-arm into include file

To avoid diverging duplicates of the meta-arm layer being used in various board builds, move the layer declaration into a shared include file. Signed-off-by: Josef Holzmayr <[email protected]>
apbr · Apr 21, 2024 · 3431c8a · 3431c8a
1 parent 239b5e9
commit 3431c8a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 26 deletions.
diff --git a/kas/beaglebone-ai64.yml b/kas/beaglebone-ai64.yml
@@ -2,6 +2,7 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
+  - kas/include/arm.yml
   - kas/include/ti.yml
 
 machine: beaglebone-ai64

diff --git a/kas/beagleplay.yml b/kas/beagleplay.yml
@@ -2,6 +2,7 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
+  - kas/include/arm.yml
   - kas/include/ti.yml
 
 machine: beagleplay

diff --git a/kas/imx93-var-som.yml b/kas/imx93-var-som.yml
@@ -2,6 +2,7 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
+  - kas/include/arm.yml
 
 repos:
   meta-mender-community:
@@ -18,13 +19,6 @@ repos:
       meta-oe:
       meta-python:
 
-  meta-arm:
-    url: https://git.yoctoproject.org/meta-arm
-    refspec: 0e043288fd0b17fbf31cf00ae33045107a991144
-    layers:
-      meta-arm:
-      meta-arm-toolchain:
-
   meta-freescale:
     url: https://github.com/Freescale/meta-freescale
     refspec: 9b00d40b787c2b7105ce209f5635cc1a0cab81ca

diff --git a/kas/include/arm.yml b/kas/include/arm.yml
@@ -0,0 +1,10 @@
+header:
+  version: 11
+
+repos:
+  meta-arm:
+    url: https://git.yoctoproject.org/meta-arm
+    refspec: mickledore
+    layers:
+      meta-arm:
+      meta-arm-toolchain:
diff --git a/kas/include/ti.yml b/kas/include/ti.yml
@@ -2,12 +2,6 @@ header:
   version: 11
 
 repos:
-  meta-arm:
-    url: https://git.yoctoproject.org/meta-arm
-    refspec: mickledore
-    layers:
-      meta-arm:
-      meta-arm-toolchain:
   meta-ti:
     url: https://git.yoctoproject.org/meta-ti
     refspec: master

diff --git a/kas/qemuarm64.yml b/kas/qemuarm64.yml
@@ -2,26 +2,14 @@ header:
   version: 11
   includes:
   - kas/include/mender-full.yml
+  - kas/include/arm.yml
   - kas/include/qemu.yml
 
 repos:
   meta-mender-community:
     layers:
       meta-mender-qemu-community:
 
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    refspec: mickledore
-    layers:
-      meta-oe:
-
-  meta-arm:
-    url: https://git.yoctoproject.org/meta-arm
-    refspec: mickledore
-    layers:
-      meta-arm:
-      meta-arm-toolchain:
-
 local_conf_header:
   efi: |
     EFI_PROVIDER = "grub-efi"