From: Randolph Sapp <[email protected]> Move the master config to use qt6 instead of qt5. 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 <[email protected]> --- bitbake-setup/arago-master-wip-config.json | 8 ++++---- .../arago-master-wip-config/bblayers.conf.sample | 2 +- kas/arago-master-wip-config.yml | 6 +++--- src/configs/arago-master-wip-config.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bitbake-setup/arago-master-wip-config.json b/bitbake-setup/arago-master-wip-config.json index 42885ed..cea3704 100644 --- a/bitbake-setup/arago-master-wip-config.json +++ b/bitbake-setup/arago-master-wip-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/conf/templates/arago-master-wip-config/bblayers.conf.sample b/conf/templates/arago-master-wip-config/bblayers.conf.sample index f70b6af..4f26d30 100644 --- a/conf/templates/arago-master-wip-config/bblayers.conf.sample +++ b/conf/templates/arago-master-wip-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/kas/arago-master-wip-config.yml b/kas/arago-master-wip-config.yml index f994926..f1628d0 100644 --- a/kas/arago-master-wip-config.yml +++ b/kas/arago-master-wip-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/src/configs/arago-master-wip-config.xml b/src/configs/arago-master-wip-config.xml index ded9e5a..8a2d7f5 100644 --- a/src/configs/arago-master-wip-config.xml +++ b/src/configs/arago-master-wip-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'> -- 2.48.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15854): https://lists.yoctoproject.org/g/meta-arago/message/15854 Mute This Topic: https://lists.yoctoproject.org/mt/111262249/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
