diff mbox series

[meta-arago,oe-layersetup] configs/arago-master-*-config: qt5 -> qt6

Message ID 20250219005231.2012998-1-rs@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,oe-layersetup] configs/arago-master-*-config: qt5 -> qt6 | expand

Commit Message

Randolph Sapp Feb. 19, 2025, 12:52 a.m. UTC 
From: Randolph Sapp <rs@ti.com>

Move the the rest of the master configs to use qt6 instead of qt5 now
that master-next has been verified. Use the dev branch for master builds
since there is no master branch upstream.

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>
---
 bitbake-setup/arago-master-chromium-config.json           | 8 ++++----
 bitbake-setup/arago-master-config.json                    | 8 ++++----
 bitbake-setup/arago-master-selinux-config.json            | 8 ++++----
 .../arago-master-chromium-config/bblayers.conf.sample     | 2 +-
 conf/templates/arago-master-config/bblayers.conf.sample   | 2 +-
 .../arago-master-selinux-config/bblayers.conf.sample      | 2 +-
 configs/arago-master-chromium-config.txt                  | 2 +-
 configs/arago-master-config.txt                           | 2 +-
 configs/arago-master-selinux-config.txt                   | 2 +-
 kas/arago-master-chromium-config.yml                      | 6 +++---
 kas/arago-master-config.yml                               | 6 +++---
 kas/arago-master-selinux-config.yml                       | 6 +++---
 src/configs/arago-master-chromium-config.xml              | 2 +-
 src/configs/arago-master-config.xml                       | 2 +-
 src/configs/arago-master-selinux-config.xml               | 2 +-
 15 files changed, 30 insertions(+), 30 deletions(-)
diff mbox series

Patch

diff --git a/bitbake-setup/arago-master-chromium-config.json b/bitbake-setup/arago-master-chromium-config.json
index 29deaa9..82d7f1d 100644
--- a/bitbake-setup/arago-master-chromium-config.json
+++ b/bitbake-setup/arago-master-chromium-config.json
@@ -46,16 +46,16 @@ 
       },
       "path": "meta-browser"
     },
-    "meta-qt5": {
+    "meta-qt6": {
       "git-remote": {
         "remotes": {
           "origin": {
-            "uri": "https://github.com/meta-qt5/meta-qt5.git"
+            "uri": "https://code.qt.io/yocto/meta-qt6.git"
           }
         },
-        "rev": "master"
+        "rev": "dev"
       },
-      "path": "meta-qt5"
+      "path": "meta-qt6"
     },
     "meta-virtualization": {
       "git-remote": {
diff --git a/bitbake-setup/arago-master-config.json b/bitbake-setup/arago-master-config.json
index 4881f08..38dc3e6 100644
--- a/bitbake-setup/arago-master-config.json
+++ b/bitbake-setup/arago-master-config.json
@@ -35,16 +35,16 @@ 
       },
       "path": "meta-arago"
     },
-    "meta-qt5": {
+    "meta-qt6": {
       "git-remote": {
         "remotes": {
           "origin": {
-            "uri": "https://github.com/meta-qt5/meta-qt5.git"
+            "uri": "https://code.qt.io/yocto/meta-qt6.git"
           }
         },
-        "rev": "master"
+        "rev": "dev"
       },
-      "path": "meta-qt5"
+      "path": "meta-qt6"
     },
     "meta-virtualization": {
       "git-remote": {
diff --git a/bitbake-setup/arago-master-selinux-config.json b/bitbake-setup/arago-master-selinux-config.json
index 27f049c..8d5d8b8 100644
--- a/bitbake-setup/arago-master-selinux-config.json
+++ b/bitbake-setup/arago-master-selinux-config.json
@@ -46,16 +46,16 @@ 
       },
       "path": "meta-selinux"
     },
-    "meta-qt5": {
+    "meta-qt6": {
       "git-remote": {
         "remotes": {
           "origin": {
-            "uri": "https://github.com/meta-qt5/meta-qt5.git"
+            "uri": "https://code.qt.io/yocto/meta-qt6.git"
           }
         },
-        "rev": "master"
+        "rev": "dev"
       },
-      "path": "meta-qt5"
+      "path": "meta-qt6"
     },
     "meta-virtualization": {
       "git-remote": {
diff --git a/conf/templates/arago-master-chromium-config/bblayers.conf.sample b/conf/templates/arago-master-chromium-config/bblayers.conf.sample
index 29beb7d..80b4c62 100644
--- a/conf/templates/arago-master-chromium-config/bblayers.conf.sample
+++ b/conf/templates/arago-master-chromium-config/bblayers.conf.sample
@@ -13,7 +13,7 @@  BBLAYERS ?= " \
     ##OEROOT##/../meta-arago/meta-arago-extras
     ##OEROOT##/../meta-arago/meta-arago-test
     ##OEROOT##/../meta-browser/meta-chromium
-    ##OEROOT##/../meta-qt5
+    ##OEROOT##/../meta-qt6
     ##OEROOT##/../meta-virtualization
     ##OEROOT##/../meta-openembedded/meta-networking
     ##OEROOT##/../meta-openembedded/meta-python
diff --git a/conf/templates/arago-master-config/bblayers.conf.sample b/conf/templates/arago-master-config/bblayers.conf.sample
index f70b6af..4f26d30 100644
--- a/conf/templates/arago-master-config/bblayers.conf.sample
+++ b/conf/templates/arago-master-config/bblayers.conf.sample
@@ -12,7 +12,7 @@  BBLAYERS ?= " \
     ##OEROOT##/../meta-arago/meta-arago-distro
     ##OEROOT##/../meta-arago/meta-arago-extras
     ##OEROOT##/../meta-arago/meta-arago-test
-    ##OEROOT##/../meta-qt5
+    ##OEROOT##/../meta-qt6
     ##OEROOT##/../meta-virtualization
     ##OEROOT##/../meta-openembedded/meta-networking
     ##OEROOT##/../meta-openembedded/meta-python
diff --git a/conf/templates/arago-master-selinux-config/bblayers.conf.sample b/conf/templates/arago-master-selinux-config/bblayers.conf.sample
index 094ec81..12aeae1 100644
--- a/conf/templates/arago-master-selinux-config/bblayers.conf.sample
+++ b/conf/templates/arago-master-selinux-config/bblayers.conf.sample
@@ -13,7 +13,7 @@  BBLAYERS ?= " \
     ##OEROOT##/../meta-arago/meta-arago-extras
     ##OEROOT##/../meta-arago/meta-arago-test
     ##OEROOT##/../meta-selinux
-    ##OEROOT##/../meta-qt5
+    ##OEROOT##/../meta-qt6
     ##OEROOT##/../meta-virtualization
     ##OEROOT##/../meta-openembedded/meta-networking
     ##OEROOT##/../meta-openembedded/meta-python
diff --git a/configs/arago-master-chromium-config.txt b/configs/arago-master-chromium-config.txt
index df3f0ba..a64fbda 100644
--- a/configs/arago-master-chromium-config.txt
+++ b/configs/arago-master-chromium-config.txt
@@ -5,7 +5,7 @@  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-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=
+meta-qt6,https://code.qt.io/yocto/meta-qt6.git,dev,HEAD,layers=
 meta-virtualization,https://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
 meta-openembedded,https://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems:meta-multimedia
 meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-beagle:meta-ti-bsp
diff --git a/configs/arago-master-config.txt b/configs/arago-master-config.txt
index 7a1a481..17d92cd 100644
--- a/configs/arago-master-config.txt
+++ b/configs/arago-master-config.txt
@@ -5,7 +5,7 @@  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-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=
+meta-qt6,https://code.qt.io/yocto/meta-qt6.git,dev,HEAD,layers=
 meta-virtualization,https://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
 meta-openembedded,https://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems:meta-multimedia
 meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-beagle:meta-ti-bsp
diff --git a/configs/arago-master-selinux-config.txt b/configs/arago-master-selinux-config.txt
index 5cf0631..3ba46b2 100644
--- a/configs/arago-master-selinux-config.txt
+++ b/configs/arago-master-selinux-config.txt
@@ -5,7 +5,7 @@  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-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=
+meta-qt6,https://code.qt.io/yocto/meta-qt6.git,dev,HEAD,layers=
 meta-virtualization,https://git.yoctoproject.org/meta-virtualization,master,HEAD,layers=
 meta-openembedded,https://git.openembedded.org/meta-openembedded,master,HEAD,layers=meta-networking:meta-python:meta-oe:meta-gnome:meta-filesystems:meta-multimedia
 meta-ti,https://git.yoctoproject.org/meta-ti,master,HEAD,layers=meta-ti-extras:meta-beagle:meta-ti-bsp
diff --git a/kas/arago-master-chromium-config.yml b/kas/arago-master-chromium-config.yml
index 837ef0e..99168f6 100644
--- a/kas/arago-master-chromium-config.yml
+++ b/kas/arago-master-chromium-config.yml
@@ -21,9 +21,9 @@  repos:
     layers:
       meta-chromium:
 
-  meta-qt5:
-    url: "https://github.com/meta-qt5/meta-qt5.git"
-    branch: "master"
+  meta-qt6:
+    url: "https://code.qt.io/yocto/meta-qt6.git"
+    branch: "dev"
 
   meta-virtualization:
     url: "https://git.yoctoproject.org/meta-virtualization"
diff --git a/kas/arago-master-config.yml b/kas/arago-master-config.yml
index 5434891..b7855b8 100644
--- a/kas/arago-master-config.yml
+++ b/kas/arago-master-config.yml
@@ -15,9 +15,9 @@  repos:
       meta-arago-extras:
       meta-arago-test:
 
-  meta-qt5:
-    url: "https://github.com/meta-qt5/meta-qt5.git"
-    branch: "master"
+  meta-qt6:
+    url: "https://code.qt.io/yocto/meta-qt6.git"
+    branch: "dev"
 
   meta-virtualization:
     url: "https://git.yoctoproject.org/meta-virtualization"
diff --git a/kas/arago-master-selinux-config.yml b/kas/arago-master-selinux-config.yml
index 46b32c7..41070ec 100644
--- a/kas/arago-master-selinux-config.yml
+++ b/kas/arago-master-selinux-config.yml
@@ -19,9 +19,9 @@  repos:
     url: "https://git.yoctoproject.org/meta-selinux"
     branch: "master"
 
-  meta-qt5:
-    url: "https://github.com/meta-qt5/meta-qt5.git"
-    branch: "master"
+  meta-qt6:
+    url: "https://code.qt.io/yocto/meta-qt6.git"
+    branch: "dev"
 
   meta-virtualization:
     url: "https://git.yoctoproject.org/meta-virtualization"
diff --git a/src/configs/arago-master-chromium-config.xml b/src/configs/arago-master-chromium-config.xml
index ec58ea9..acc5a51 100644
--- a/src/configs/arago-master-chromium-config.xml
+++ b/src/configs/arago-master-chromium-config.xml
@@ -24,7 +24,7 @@ 
         <repo name='meta-selinux' url='https://git.yoctoproject.org/meta-selinux' branch='master' commit='HEAD' disabled='true'>
             <layers/>
         </repo>
-        <repo name='meta-qt5' url='https://github.com/meta-qt5/meta-qt5.git' branch='master' commit='HEAD'>
+        <repo name='meta-qt6' url='https://code.qt.io/yocto/meta-qt6.git' branch='dev' commit='HEAD'>
             <layers/>
         </repo>
         <repo name='meta-virtualization' url='https://git.yoctoproject.org/meta-virtualization' branch='master' commit='HEAD'>
diff --git a/src/configs/arago-master-config.xml b/src/configs/arago-master-config.xml
index 94f3ac1..d56ec9a 100644
--- a/src/configs/arago-master-config.xml
+++ b/src/configs/arago-master-config.xml
@@ -24,7 +24,7 @@ 
         <repo name='meta-selinux' url='https://git.yoctoproject.org/meta-selinux' branch='master' commit='HEAD' disabled='true'>
             <layers/>
         </repo>
-        <repo name='meta-qt5' url='https://github.com/meta-qt5/meta-qt5.git' branch='master' commit='HEAD'>
+        <repo name='meta-qt6' url='https://code.qt.io/yocto/meta-qt6.git' branch='dev' commit='HEAD'>
             <layers/>
         </repo>
         <repo name='meta-virtualization' url='https://git.yoctoproject.org/meta-virtualization' branch='master' commit='HEAD'>
diff --git a/src/configs/arago-master-selinux-config.xml b/src/configs/arago-master-selinux-config.xml
index 0c5019f..5041fba 100644
--- a/src/configs/arago-master-selinux-config.xml
+++ b/src/configs/arago-master-selinux-config.xml
@@ -24,7 +24,7 @@ 
         <repo name='meta-selinux' url='https://git.yoctoproject.org/meta-selinux' branch='master' commit='HEAD'>
             <layers/>
         </repo>
-        <repo name='meta-qt5' url='https://github.com/meta-qt5/meta-qt5.git' branch='master' commit='HEAD'>
+        <repo name='meta-qt6' url='https://code.qt.io/yocto/meta-qt6.git' branch='dev' commit='HEAD'>
             <layers/>
         </repo>
         <repo name='meta-virtualization' url='https://git.yoctoproject.org/meta-virtualization' branch='master' commit='HEAD'>