* Re: [meta-arago][oe-layersetup][master][PATCHv2] configs/arago-master-*-config: Remove meta-arago-demos
2025-01-24 19:36 [meta-arago][oe-layersetup][master][PATCHv2] configs/arago-master-*-config: Remove meta-arago-demos rs
@ 2025-02-03 16:40 ` Ryan Eatmon
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Eatmon @ 2025-02-03 16:40 UTC (permalink / raw)
To: rs, denis, c-shilwant; +Cc: meta-arago
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.
On 1/24/2025 1:36 PM, rs@ti.com wrote:
> 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.
>
> Signed-off-by: Randolph Sapp <rs@ti.com>
> ---
>
> 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(-)
>
> diff --git a/conf/templates/arago-master-chromium-config/bblayers.conf.sample b/conf/templates/arago-master-chromium-config/bblayers.conf.sample
> index 3e5edee..29beb7d 100644
> --- a/conf/templates/arago-master-chromium-config/bblayers.conf.sample
> +++ b/conf/templates/arago-master-chromium-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-browser/meta-chromium
> ##OEROOT##/../meta-qt5
> diff --git a/conf/templates/arago-master-config/bblayers.conf.sample b/conf/templates/arago-master-config/bblayers.conf.sample
> index adbccbd..f70b6af 100644
> --- a/conf/templates/arago-master-config/bblayers.conf.sample
> +++ b/conf/templates/arago-master-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/conf/templates/arago-master-next-config/bblayers.conf.sample b/conf/templates/arago-master-next-config/bblayers.conf.sample
> index adbccbd..f70b6af 100644
> --- a/conf/templates/arago-master-next-config/bblayers.conf.sample
> +++ b/conf/templates/arago-master-next-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/conf/templates/arago-master-selinux-config/bblayers.conf.sample b/conf/templates/arago-master-selinux-config/bblayers.conf.sample
> index 51b8551..094ec81 100644
> --- a/conf/templates/arago-master-selinux-config/bblayers.conf.sample
> +++ b/conf/templates/arago-master-selinux-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-selinux
> ##OEROOT##/../meta-qt5
> diff --git a/conf/templates/arago-master-wip-config/bblayers.conf.sample b/conf/templates/arago-master-wip-config/bblayers.conf.sample
> index adbccbd..f70b6af 100644
> --- a/conf/templates/arago-master-wip-config/bblayers.conf.sample
> +++ b/conf/templates/arago-master-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-master-chromium-config.txt b/configs/arago-master-chromium-config.txt
> index f15ab67..df3f0ba 100644
> --- a/configs/arago-master-chromium-config.txt
> +++ b/configs/arago-master-chromium-config.txt
> @@ -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=
> diff --git a/configs/arago-master-config.txt b/configs/arago-master-config.txt
> index 1cde5d9..7a1a481 100644
> --- a/configs/arago-master-config.txt
> +++ b/configs/arago-master-config.txt
> @@ -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=
> diff --git a/configs/arago-master-next-config.txt b/configs/arago-master-next-config.txt
> index 210bd68..0868327 100644
> --- a/configs/arago-master-next-config.txt
> +++ b/configs/arago-master-next-config.txt
> @@ -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=
> diff --git a/configs/arago-master-selinux-config.txt b/configs/arago-master-selinux-config.txt
> index ed4ecdd..5cf0631 100644
> --- a/configs/arago-master-selinux-config.txt
> +++ b/configs/arago-master-selinux-config.txt
> @@ -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=
> diff --git a/configs/arago-master-wip-config.txt b/configs/arago-master-wip-config.txt
> index a85e1fb..eb9c49d 100644
> --- a/configs/arago-master-wip-config.txt
> +++ b/configs/arago-master-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,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=
> diff --git a/kas/arago-master-chromium-config.yml b/kas/arago-master-chromium-config.yml
> index bf8c5f3..837ef0e 100644
> --- a/kas/arago-master-chromium-config.yml
> +++ b/kas/arago-master-chromium-config.yml
> @@ -13,7 +13,6 @@ repos:
> layers:
> meta-arago-distro:
> meta-arago-extras:
> - meta-arago-demos:
> meta-arago-test:
>
> meta-browser:
> diff --git a/kas/arago-master-config.yml b/kas/arago-master-config.yml
> index 6a21d96..5434891 100644
> --- a/kas/arago-master-config.yml
> +++ b/kas/arago-master-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/kas/arago-master-next-config.yml b/kas/arago-master-next-config.yml
> index 6514b9d..03dadec 100644
> --- a/kas/arago-master-next-config.yml
> +++ b/kas/arago-master-next-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/kas/arago-master-selinux-config.yml b/kas/arago-master-selinux-config.yml
> index 922ab89..46b32c7 100644
> --- a/kas/arago-master-selinux-config.yml
> +++ b/kas/arago-master-selinux-config.yml
> @@ -13,7 +13,6 @@ repos:
> layers:
> meta-arago-distro:
> meta-arago-extras:
> - meta-arago-demos:
> meta-arago-test:
>
> meta-selinux:
> diff --git a/kas/arago-master-wip-config.yml b/kas/arago-master-wip-config.yml
> index 429bb06..f994926 100644
> --- a/kas/arago-master-wip-config.yml
> +++ b/kas/arago-master-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-master-chromium-config.xml b/src/configs/arago-master-chromium-config.xml
> index 9abaf97..ec58ea9 100644
> --- a/src/configs/arago-master-chromium-config.xml
> +++ b/src/configs/arago-master-chromium-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>
> diff --git a/src/configs/arago-master-config.xml b/src/configs/arago-master-config.xml
> index 8380a57..94f3ac1 100644
> --- a/src/configs/arago-master-config.xml
> +++ b/src/configs/arago-master-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>
> diff --git a/src/configs/arago-master-next-config.xml b/src/configs/arago-master-next-config.xml
> index 0eee296..122258f 100644
> --- a/src/configs/arago-master-next-config.xml
> +++ b/src/configs/arago-master-next-config.xml
> @@ -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>
> diff --git a/src/configs/arago-master-selinux-config.xml b/src/configs/arago-master-selinux-config.xml
> index 6ecea87..0c5019f 100644
> --- a/src/configs/arago-master-selinux-config.xml
> +++ b/src/configs/arago-master-selinux-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>
> diff --git a/src/configs/arago-master-wip-config.xml b/src/configs/arago-master-wip-config.xml
> index 74718d5..ded9e5a 100644
> --- a/src/configs/arago-master-wip-config.xml
> +++ b/src/configs/arago-master-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>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 2+ messages in thread