From: Randolph Sapp <[email protected]> Move the master-next config to use qt6 instead of qt5 now that master-wip 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 <[email protected]> --- bitbake-setup/arago-master-next-config.json | 8 ++++---- .../arago-master-next-config/bblayers.conf.sample | 2 +- configs/arago-master-next-config.txt | 2 +- kas/arago-master-next-config.yml | 6 +++--- src/configs/arago-master-next-config.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bitbake-setup/arago-master-next-config.json b/bitbake-setup/arago-master-next-config.json index 1b9238d..d0065e1 100644 --- a/bitbake-setup/arago-master-next-config.json +++ b/bitbake-setup/arago-master-next-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-next-config/bblayers.conf.sample b/conf/templates/arago-master-next-config/bblayers.conf.sample index f70b6af..4f26d30 100644 --- a/conf/templates/arago-master-next-config/bblayers.conf.sample +++ b/conf/templates/arago-master-next-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/configs/arago-master-next-config.txt b/configs/arago-master-next-config.txt index 0868327..4076923 100644 --- a/configs/arago-master-next-config.txt +++ b/configs/arago-master-next-config.txt @@ -13,7 +13,7 @@ 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-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-next,HEAD,layers=meta-ti-extras:meta-beagle:meta-ti-bsp diff --git a/kas/arago-master-next-config.yml b/kas/arago-master-next-config.yml index 03dadec..a678b03 100644 --- a/kas/arago-master-next-config.yml +++ b/kas/arago-master-next-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-next-config.xml b/src/configs/arago-master-next-config.xml index 122258f..415236f 100644 --- a/src/configs/arago-master-next-config.xml +++ b/src/configs/arago-master-next-config.xml @@ -25,7 +25,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 (#15855): https://lists.yoctoproject.org/g/meta-arago/message/15855 Mute This Topic: https://lists.yoctoproject.org/mt/111262345/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
