Now that initial testing for removing meta-arago-demos has completed and it has been accepted onto scarthgap-next, we need to remove it from oe-layersetup as well for scarthgap-next and scarthgap so that the CICD flow has a chance to build correctly.
Signed-off-by: Randolph Sapp <[email protected]> Signed-off-by: Ryan Eatmon <[email protected]> --- .../arago-scarthgap-chromium-config/bblayers.conf.sample | 1 - conf/templates/arago-scarthgap-config/bblayers.conf.sample | 1 - .../arago-scarthgap-next-config/bblayers.conf.sample | 1 - .../arago-scarthgap-selinux-config/bblayers.conf.sample | 1 - configs/arago-scarthgap-chromium-config.txt | 2 +- configs/arago-scarthgap-config.txt | 2 +- configs/arago-scarthgap-next-config.txt | 5 +++-- configs/arago-scarthgap-selinux-config.txt | 2 +- kas/arago-scarthgap-chromium-config.yml | 1 - kas/arago-scarthgap-config.yml | 1 - kas/arago-scarthgap-next-config.yml | 1 - kas/arago-scarthgap-selinux-config.yml | 1 - src/configs/arago-scarthgap-chromium-config.xml | 1 - src/configs/arago-scarthgap-config.xml | 1 - src/configs/arago-scarthgap-next-config.xml | 1 - src/configs/arago-scarthgap-selinux-config.xml | 1 - 16 files changed, 6 insertions(+), 17 deletions(-) diff --git a/conf/templates/arago-scarthgap-chromium-config/bblayers.conf.sample b/conf/templates/arago-scarthgap-chromium-config/bblayers.conf.sample index 3e5edee..29beb7d 100644 --- a/conf/templates/arago-scarthgap-chromium-config/bblayers.conf.sample +++ b/conf/templates/arago-scarthgap-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-scarthgap-config/bblayers.conf.sample b/conf/templates/arago-scarthgap-config/bblayers.conf.sample index adbccbd..f70b6af 100644 --- a/conf/templates/arago-scarthgap-config/bblayers.conf.sample +++ b/conf/templates/arago-scarthgap-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-scarthgap-next-config/bblayers.conf.sample b/conf/templates/arago-scarthgap-next-config/bblayers.conf.sample index adbccbd..f70b6af 100644 --- a/conf/templates/arago-scarthgap-next-config/bblayers.conf.sample +++ b/conf/templates/arago-scarthgap-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-scarthgap-selinux-config/bblayers.conf.sample b/conf/templates/arago-scarthgap-selinux-config/bblayers.conf.sample index 51b8551..094ec81 100644 --- a/conf/templates/arago-scarthgap-selinux-config/bblayers.conf.sample +++ b/conf/templates/arago-scarthgap-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/configs/arago-scarthgap-chromium-config.txt b/configs/arago-scarthgap-chromium-config.txt index 61d0bdb..9f500fa 100644 --- a/configs/arago-scarthgap-chromium-config.txt +++ b/configs/arago-scarthgap-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,2.8,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,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/configs/arago-scarthgap-config.txt b/configs/arago-scarthgap-config.txt index 5c7adcb..6513be5 100644 --- a/configs/arago-scarthgap-config.txt +++ b/configs/arago-scarthgap-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,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,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/configs/arago-scarthgap-next-config.txt b/configs/arago-scarthgap-next-config.txt index 69fee39..5d0915b 100644 --- a/configs/arago-scarthgap-next-config.txt +++ b/configs/arago-scarthgap-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,2.8,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-next,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap-next,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= @@ -26,12 +26,13 @@ OECORELOCALCONF=./sample-files/local-arago64-v2.conf.sample BITBAKE_INCLUSIVE_VARS=yes LOCALCONF:OVERRIDES:append = ":recipe-${@os.path.basename(d.getVar('FILE'))}" -LOCALCONF:BRANCH:recipe-ltp-ddt_20250130.bb = "cicd" +LOCALCONF:BRANCH:recipe-ltp-ddt_20240129.bb = "cicd" LOCALCONF:BRANCH:recipe-cadence-mhdp-fw_git.bb = "ti-linux-firmware-next" LOCALCONF:BRANCH:recipe-cnm-wave-fw_git.bb = "ti-linux-firmware-next" LOCALCONF:BRANCH:recipe-goodix-fw_git.bb = "ti-linux-firmware-next" LOCALCONF:BRANCH:recipe-linux-ti-staging_6.12.bb = "ti-linux-6.12.y-cicd" LOCALCONF:BRANCH:recipe-linux-ti-staging-rt_6.12.bb = "ti-linux-6.12.y-cicd" +LOCALCONF:BRANCH:recipe-linux-ti-staging-systest_6.12.bb = "ti-linux-6.12.y-cicd" LOCALCONF:BRANCH:recipe-prueth-fw_5.6.15.bb = "ti-linux-firmware-next" LOCALCONF:BRANCH:recipe-pruhsr-fw_2.17.25.bb = "ti-linux-firmware-next" LOCALCONF:BRANCH:recipe-pruprp-fw_2.17.25.bb = "ti-linux-firmware-next" diff --git a/configs/arago-scarthgap-selinux-config.txt b/configs/arago-scarthgap-selinux-config.txt index 79a1136..d27bada 100644 --- a/configs/arago-scarthgap-selinux-config.txt +++ b/configs/arago-scarthgap-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,2.8,HEAD -meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,HEAD,layers=meta-arago-distro:meta-arago-extras:meta-arago-demos:meta-arago-test +meta-arago,https://git.yoctoproject.org/meta-arago,scarthgap,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-chromium-config.yml b/kas/arago-scarthgap-chromium-config.yml index a6d5a51..9e2bbb0 100644 --- a/kas/arago-scarthgap-chromium-config.yml +++ b/kas/arago-scarthgap-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-scarthgap-config.yml b/kas/arago-scarthgap-config.yml index 5ce2d76..87864ec 100644 --- a/kas/arago-scarthgap-config.yml +++ b/kas/arago-scarthgap-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-scarthgap-next-config.yml b/kas/arago-scarthgap-next-config.yml index 75d6cf7..c6dc88c 100644 --- a/kas/arago-scarthgap-next-config.yml +++ b/kas/arago-scarthgap-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-scarthgap-selinux-config.yml b/kas/arago-scarthgap-selinux-config.yml index 16235e8..ea839f3 100644 --- a/kas/arago-scarthgap-selinux-config.yml +++ b/kas/arago-scarthgap-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/src/configs/arago-scarthgap-chromium-config.xml b/src/configs/arago-scarthgap-chromium-config.xml index 739ab88..c581453 100644 --- a/src/configs/arago-scarthgap-chromium-config.xml +++ b/src/configs/arago-scarthgap-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-scarthgap-config.xml b/src/configs/arago-scarthgap-config.xml index dc960b4..3f5d6b0 100644 --- a/src/configs/arago-scarthgap-config.xml +++ b/src/configs/arago-scarthgap-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-scarthgap-next-config.xml b/src/configs/arago-scarthgap-next-config.xml index b8c096d..f98a1a8 100644 --- a/src/configs/arago-scarthgap-next-config.xml +++ b/src/configs/arago-scarthgap-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-scarthgap-selinux-config.xml b/src/configs/arago-scarthgap-selinux-config.xml index e580d4c..1246f61 100644 --- a/src/configs/arago-scarthgap-selinux-config.xml +++ b/src/configs/arago-scarthgap-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> -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15853): https://lists.yoctoproject.org/g/meta-arago/message/15853 Mute This Topic: https://lists.yoctoproject.org/mt/111253631/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
