configs/arago-master-*-config: Remove meta-arago-demos
PATCH v2 1/1 configs/arago-master-*-config: Remove meta-arago-demos
From: Randolph Sapp <[email protected]>
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.
---
v2: More verbose commit message following previous feedback
.../templates/arago-master-chromium-config/bblayers.conf.sample | 1 - conf/templates/arago-master-config/bblayers.conf.sample | 1 - conf/templates/arago-master-next-config/bblayers.conf.sample | 1 - conf/templates/arago-master-selinux-config/bblayers.conf.sample | 1 - conf/templates/arago-master-wip-config/bblayers.conf.sample | 1 - configs/arago-master-chromium-config.txt | 2 +- configs/arago-master-config.txt | 2 +- configs/arago-master-next-config.txt | 2 +- configs/arago-master-selinux-config.txt | 2 +- configs/arago-master-wip-config.txt | 2 +- kas/arago-master-chromium-config.yml | 1 - kas/arago-master-config.yml | 1 - kas/arago-master-next-config.yml | 1 - kas/arago-master-selinux-config.yml | 1 - kas/arago-master-wip-config.yml | 1 - src/configs/arago-master-chromium-config.xml | 1 - src/configs/arago-master-config.xml | 1 - src/configs/arago-master-next-config.xml | 1 - src/configs/arago-master-selinux-config.xml | 1 - src/configs/arago-master-wip-config.xml | 1 - 20 files changed, 5 insertions(+), 20 deletions(-)
conf/templates/arago-master-chromium-config/bblayers.conf.sample +0 -1
@@ -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-browser/meta-chromium ##OEROOT##/../meta-qt5
conf/templates/arago-master-config/bblayers.conf.sample +0 -1
@@ -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
conf/templates/arago-master-next-config/bblayers.conf.sample +0 -1
@@ -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
conf/templates/arago-master-selinux-config/bblayers.conf.sample +0 -1
@@ -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-selinux ##OEROOT##/../meta-qt5
conf/templates/arago-master-wip-config/bblayers.conf.sample +0 -1
@@ -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
configs/arago-master-chromium-config.txt +1 -1
@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
configs/arago-master-config.txt +1 -1
@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
configs/arago-master-next-config.txt +1 -1
@@ -10,7 +10,7 @@ MOTD: NOTE: to point the recipe to the appropriate cicd/next branch for that rec MOTD: NOTE: bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
configs/arago-master-selinux-config.txt +1 -1
@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
configs/arago-master-wip-config.txt +1 -1
@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
kas/arago-master-chromium-config.yml +0 -1
@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-browser:
kas/arago-master-config.yml +0 -1
@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-qt5:
kas/arago-master-next-config.yml +0 -1
@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-qt5:
kas/arago-master-selinux-config.yml +0 -1
@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-selinux:
kas/arago-master-wip-config.yml +0 -1
@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-qt5:
src/configs/arago-master-chromium-config.xml +0 -1
@@ -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>
src/configs/arago-master-config.xml +0 -1
@@ -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>
src/configs/arago-master-next-config.xml +0 -1
@@ -14,7 +14,6 @@ <layers> <layer>meta-arago-distro</layer> <layer>meta-arago-extras</layer> - <layer>meta-arago-demos</layer> <layer>meta-arago-test</layer> </layers> </repo>
src/configs/arago-master-selinux-config.xml +0 -1
@@ -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>
src/configs/arago-master-wip-config.xml +0 -1
@@ -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>
Signature · 1 line
2.47.1
I appreciate this patch, but this causes a chicken-and-egg problem. I can't test the removal of meta-arago-demos on master-wip without having a patch that removes that layer on just wip.
So really, this patch should be broken up into three seperate patche series. The first one removes it from wip so I can test it all. The second then removes it from master-next so that the CICD builds can work, and the final removes it from master once CICD promotes the removal.
It's annoying I know. And I'll handle doing the patches in the staged approach, just something to bear in mind for the future if we do this kind of thing again.
Quoted 288 lines · On 1/24/2025 1:36 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
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.
Signed-off-by Randolph Sapp <[email protected]>---
v2: More verbose commit message following previous feedback
.../templates/arago-master-chromium-config/bblayers.conf.sample | 1 - conf/templates/arago-master-config/bblayers.conf.sample | 1 - conf/templates/arago-master-next-config/bblayers.conf.sample | 1 - conf/templates/arago-master-selinux-config/bblayers.conf.sample | 1 - conf/templates/arago-master-wip-config/bblayers.conf.sample | 1 - configs/arago-master-chromium-config.txt | 2 +- configs/arago-master-config.txt | 2 +- configs/arago-master-next-config.txt | 2 +- configs/arago-master-selinux-config.txt | 2 +- configs/arago-master-wip-config.txt | 2 +- kas/arago-master-chromium-config.yml | 1 - kas/arago-master-config.yml | 1 - kas/arago-master-next-config.yml | 1 - kas/arago-master-selinux-config.yml | 1 - kas/arago-master-wip-config.yml | 1 - src/configs/arago-master-chromium-config.xml | 1 - src/configs/arago-master-config.xml | 1 - src/configs/arago-master-next-config.xml | 1 - src/configs/arago-master-selinux-config.xml | 1 - src/configs/arago-master-wip-config.xml | 1 - 20 files changed, 5 insertions(+), 20 deletions(-)conf/templates/arago-master-chromium-config/bblayers.conf.sample +0
-1@@ -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-browser/meta-chromium ##OEROOT##/../meta-qt5conf/templates/arago-master-config/bblayers.conf.sample +0
-1@@ -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-virtualizationconf/templates/arago-master-next-config/bblayers.conf.sample +0
-1@@ -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-virtualizationconf/templates/arago-master-selinux-config/bblayers.conf.sample +0
-1@@ -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-selinux ##OEROOT##/../meta-qt5conf/templates/arago-master-wip-config/bblayers.conf.sample +0
-1@@ -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-virtualizationconfigs/arago-master-chromium-config.txt +1
-1@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=configs/arago-master-config.txt +1
-1@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=configs/arago-master-next-config.txt +1
-1@@ -10,7 +10,7 @@ MOTD: NOTE: to point the recipe to the appropriate cicd/next branch for that rec MOTD: NOTE: bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=configs/arago-master-selinux-config.txt +1
-1@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=configs/arago-master-wip-config.txt +1
-1@@ -2,7 +2,7 @@ # repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern] bitbake,https://git.openembedded.org/bitbake,master,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,master-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,master-wip,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-test #meta-browser,https://github.com/OSSystems/meta-browser.git,master,HEAD,layers=meta-chromium #meta-selinux,https://git.yoctoproject.org/meta-selinux,master,HEAD,layers= meta-qt5,https://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=kas/arago-master-chromium-config.yml +0
-1@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-browser:kas/arago-master-config.yml +0
-1@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-qt5:kas/arago-master-next-config.yml +0
-1@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-qt5:kas/arago-master-selinux-config.yml +0
-1@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-selinux:kas/arago-master-wip-config.yml +0
-1@@ -13,7 +13,6 @@ repos: layers: meta-arago-distro: meta-arago-extras: - meta-arago-demos: meta-arago-test: meta-qt5:src/configs/arago-master-chromium-config.xml +0
-1@@ -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>src/configs/arago-master-config.xml +0
-1@@ -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>src/configs/arago-master-next-config.xml +0
-1@@ -14,7 +14,6 @@ <layers> <layer>meta-arago-distro</layer> <layer>meta-arago-extras</layer> - <layer>meta-arago-demos</layer> <layer>meta-arago-test</layer> </layers> </repo>src/configs/arago-master-selinux-config.xml +0
-1@@ -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>src/configs/arago-master-wip-config.xml +0
-1@@ -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>
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS