From b8029304653f0c3fe9525d678e46691b522ccd6c Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Mon, 12 Oct 2020 17:17:09 +0200
Subject: [PATCH] Switch arm toolchain components to overlay convention
---
.orchestra/config/components.yml | 2 --
.../components/toolchain/arch/{arm.lib.yml => arm.yml} | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename .orchestra/config/components/toolchain/arch/{arm.lib.yml => arm.yml} (77%)
diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index dd2e48c..4c2ef6b 100644
--- a/.orchestra/config/components.yml
+++ b/.orchestra/config/components.yml
@@ -1,7 +1,6 @@
#@ load("@ytt:template", "template")
#@ load("@ytt:data", "data")
-#@ load("/components/toolchain/arch/arm.lib.yml", "arm_toolchain_components")
#@ load("/components/toolchain/arch/aarch64.lib.yml", "aarch64_toolchain_components")
#@ load("/components/toolchain/arch/s390x.lib.yml", "s390x_toolchain_components")
#@ load("/components/toolchain/arch/mips.lib.yml", "mips_toolchain_components")
@@ -13,7 +12,6 @@
#@ load("/global_options.lib.yml", "options")
components:
- _: #@ template.replace(arm_toolchain_components)
_: #@ template.replace(aarch64_toolchain_components)
_: #@ template.replace(s390x_toolchain_components)
_: #@ template.replace(mips_toolchain_components)
diff --git a/.orchestra/config/components/toolchain/arch/arm.lib.yml b/.orchestra/config/components/toolchain/arch/arm.yml
similarity index 77%
rename from .orchestra/config/components/toolchain/arch/arm.lib.yml
rename to .orchestra/config/components/toolchain/arch/arm.yml
index 49ab9ad..93434c5 100644
--- a/.orchestra/config/components/toolchain/arch/arm.lib.yml
+++ b/.orchestra/config/components/toolchain/arch/arm.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
#@ load("/components/toolchain/lib/toolchain.lib.yml", "create_toolchain_components")
#@ def _params():
@@ -26,6 +27,7 @@ spec: true
#@ end
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
---
-
-#@ arm_toolchain_components = create_toolchain_components(**_params())
+components: #@ create_toolchain_components(**_params())
--
GitLab