diff mbox series

[meta-arago,oe-layersetup] configs/arago-scarthgap-wip-config: Remove meta-arago-demos

Message ID 20250214222458.420631-1-rs@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,oe-layersetup] configs/arago-scarthgap-wip-config: Remove meta-arago-demos | expand

Commit Message

Randolph Sapp Feb. 14, 2025, 10:24 p.m. UTC 
From: Randolph Sapp <rs@ti.com>

Remove the meta-arago-demos layer to help break the dependency on
meta-qt5. This comes after a patch in meta-arago-distro that removed all
of the packages from meta-arago-demos. These were the last of the
"demos" in meta-arago and they were only being built for legacy devices.
Demos should primarily be in layers above arago unless they are used for
functionality testing.

These modifications are required as part of the effort to make arago
less dependent on meta-qt5. Moving forward TI builds of arago will
enable and test Qt6 by default, but unlike before this will not be done
in a way that creates an explicit dependency. This should allow
customers and layers that consume or extend arago to toggle Qt support
more easily.

The changes to scarthgap-next and scarthgap will come as the removal
patch in meta-arago makes it way through the CICD process.

Signed-off-by: Randolph Sapp <rs@ti.com>
---
 conf/templates/arago-scarthgap-wip-config/bblayers.conf.sample | 1 -
 configs/arago-scarthgap-wip-config.txt                         | 2 +-
 kas/arago-scarthgap-wip-config.yml                             | 1 -
 src/configs/arago-scarthgap-wip-config.xml                     | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/conf/templates/arago-scarthgap-wip-config/bblayers.conf.sample b/conf/templates/arago-scarthgap-wip-config/bblayers.conf.sample
index adbccbd..f70b6af 100644
--- a/conf/templates/arago-scarthgap-wip-config/bblayers.conf.sample
+++ b/conf/templates/arago-scarthgap-wip-config/bblayers.conf.sample
@@ -11,7 +11,6 @@  BBFILES ?= ""
 BBLAYERS ?= " \
     ##OEROOT##/../meta-arago/meta-arago-distro
     ##OEROOT##/../meta-arago/meta-arago-extras
-    ##OEROOT##/../meta-arago/meta-arago-demos
     ##OEROOT##/../meta-arago/meta-arago-test
     ##OEROOT##/../meta-qt5
     ##OEROOT##/../meta-virtualization
diff --git a/configs/arago-scarthgap-wip-config.txt b/configs/arago-scarthgap-wip-config.txt
index 4cc4556..dfa65b0 100644
--- a/configs/arago-scarthgap-wip-config.txt
+++ b/configs/arago-scarthgap-wip-config.txt
@@ -2,7 +2,7 @@ 
 # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
 
 bitbake,https://git.openembedded.org/bitbake,2.8,HEAD
-meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test
+meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test
 #meta-browser,https://github.com/OSSystems/meta-browser.git,master,68e8cbf51ac46c8c1b3923ee2b20e27ba9d3faa4,layers=meta-chromium
 #meta-selinux,https://git.yoctoproject.org/meta-selinux,scarthgap,HEAD,layers=
 meta-qt5,https://github.com/meta-qt5/meta-qt5.git,scarthgap,HEAD,layers=
diff --git a/kas/arago-scarthgap-wip-config.yml b/kas/arago-scarthgap-wip-config.yml
index 4614b81..7f4fc3f 100644
--- a/kas/arago-scarthgap-wip-config.yml
+++ b/kas/arago-scarthgap-wip-config.yml
@@ -13,7 +13,6 @@  repos:
     layers:
       meta-arago-distro:
       meta-arago-extras:
-      meta-arago-demos:
       meta-arago-test:
 
   meta-qt5:
diff --git a/src/configs/arago-scarthgap-wip-config.xml b/src/configs/arago-scarthgap-wip-config.xml
index d330ef2..031ed52 100644
--- a/src/configs/arago-scarthgap-wip-config.xml
+++ b/src/configs/arago-scarthgap-wip-config.xml
@@ -13,7 +13,6 @@ 
             <layers>
                 <layer>meta-arago-distro</layer>
                 <layer>meta-arago-extras</layer>
-                <layer>meta-arago-demos</layer>
                 <layer>meta-arago-test</layer>
             </layers>
         </repo>