From b8c894ff72e95b56fff0b840ba110fc68cbe934a Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Mon, 12 Oct 2020 17:10:37 +0200
Subject: [PATCH] Switch ui/libglvnd to overlay convention
---
.orchestra/config/components.yml | 4 ----
.../components/ui/{libglvnd.lib.yml => libglvnd.yml} | 7 +++++--
2 files changed, 5 insertions(+), 6 deletions(-)
rename .orchestra/config/components/ui/{libglvnd.lib.yml => libglvnd.yml} (84%)
diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 46dd82e..515cb26 100644
--- a/.orchestra/config/components.yml
+++ b/.orchestra/config/components.yml
@@ -1,8 +1,6 @@
#@ load("@ytt:template", "template")
#@ load("@ytt:data", "data")
-#@ load("/components/ui/libglvnd.lib.yml", "libglvnd_component")
-
#@ load("/components/toolchain/arch/host.lib.yml", "host_toolchain_components")
#@ load("/components/toolchain/arch/x86_64.lib.yml", "x86_64_toolchain_components")
#@ load("/components/toolchain/arch/i386.lib.yml", "i386_toolchain_components")
@@ -18,8 +16,6 @@
#@ load("/global_options.lib.yml", "options")
components:
- ui/libglvnd: #@ libglvnd_component
-
_: #@ template.replace(host_toolchain_components)
_: #@ template.replace(x86_64_toolchain_components)
_: #@ template.replace(i386_toolchain_components)
diff --git a/.orchestra/config/components/ui/libglvnd.lib.yml b/.orchestra/config/components/ui/libglvnd.yml
similarity index 84%
rename from .orchestra/config/components/ui/libglvnd.lib.yml
rename to .orchestra/config/components/ui/libglvnd.yml
index fd43193..d7c88a6 100644
--- a/.orchestra/config/components/ui/libglvnd.lib.yml
+++ b/.orchestra/config/components/ui/libglvnd.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
#@ load("/lib/create_component.lib.yml", "single_build_component")
#@ load("/global_options.lib.yml", "options")
@@ -31,6 +32,8 @@ dependencies:
- toolchain/host/gcc
#@ end
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
---
-#@ libglvnd_component = single_build_component(**_libglvnd_args())
-
+components:
+ ui/libglvnd: #@ single_build_component(**_libglvnd_args())
--
GitLab