From 09498980216bdeb58d337d4fead94b47f85f6e2e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Oct 2025 15:25:58 +0100 Subject: [PATCH] config.py: add oecore, meta-poky and yocto-docs as default repos We can't just replace poky with bitbake, we need to add the other repo information so we can correclty pass layer override information from the autobuilder layer config. Signed-off-by: Richard Purdie --- config.py | 57 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/config.py b/config.py index ac8ab2c..2df69af 100644 --- a/config.py +++ b/config.py @@ -2,39 +2,39 @@ # SPDX-License-Identifier: GPL-2.0-only # +baserepos = ["bitbake", "oecore", "meta-yocto", "yocto-docs", "poky"] + # ## Build configuration, tied to config.json in yocto-autobuilder-helpers # Repositories used by each builder buildertorepos = { - "a-quick": ["poky", "meta-intel", "oecore", "bitbake", - "meta-mingw", "meta-gplv2"], - "a-full": ["poky", "meta-intel", "oecore", "bitbake", - "meta-mingw", "meta-gplv2", "meta-arm", "meta-aws", "meta-agl", "meta-openembedded", "meta-virtualization", "meta-clang"], - "non-gpl3": ["bitbake", "poky", "meta-gplv2"], - "meta-mingw": ["bitbake", "poky", "meta-mingw"], - "qa-extras": ["bitbake", "poky", "meta-mingw"], - "meta-oe": ["bitbake", "poky", "meta-openembedded"], - "meta-virt": ["bitbake", "poky", "meta-openembedded", "meta-virtualization"], - "meta-intel": ["bitbake", "poky", "meta-intel"], - "meta-exein": ["bitbake", "poky", "meta-exein", "meta-openembedded"], - "meta-arm": ["bitbake", "poky", "meta-arm"], - "meta-agl-core": ["bitbake", "poky", "meta-agl"], - "meta-aws": ["bitbake", "poky", "meta-aws", "meta-openembedded"], - "meta-clang": ["bitbake", "poky", "meta-clang"], - "buildtools-docs": ["bitbake", "poky", "meta-openembedded"], + "a-quick": baserepos + ["meta-intel", "meta-mingw", "meta-gplv2"], + "a-full": baserepos + ["meta-intel", "meta-mingw", "meta-gplv2", "meta-arm", "meta-aws", "meta-agl", "meta-openembedded", "meta-virtualization", "meta-clang"], + "non-gpl3": baserepos + ["meta-gplv2"], + "meta-mingw": baserepos + ["meta-mingw"], + "qa-extras": baserepos + ["meta-mingw"], + "meta-oe": baserepos + ["meta-openembedded"], + "meta-virt": baserepos + ["meta-openembedded", "meta-virtualization"], + "meta-intel": baserepos + ["meta-intel"], + "meta-exein": baserepos + ["meta-exein", "meta-openembedded"], + "meta-arm": baserepos + ["meta-arm"], + "meta-agl-core": baserepos + ["meta-agl"], + "meta-aws": baserepos + ["meta-aws", "meta-openembedded"], + "meta-clang": baserepos + ["meta-clang"], + "buildtools-docs": baserepos + ["meta-openembedded"], "qemuarm-oecore": ["oecore", "bitbake"], - "checkuri": ["bitbake", "poky"], - "check-layer": ["bitbake", "poky", "meta-mingw", "meta-gplv2"], - "check-layer-nightly": ["bitbake", "poky", "meta-agl", "meta-arm", "meta-aws", "meta-intel", "meta-openembedded", "meta-virtualization", "meta-ti", "meta-security", "meta-clang", "meta-exein", "meta-qcom"], + "checkuri": baserepos, + "check-layer": baserepos + ["meta-mingw", "meta-gplv2"], + "check-layer-nightly": baserepos + ["meta-agl", "meta-arm", "meta-aws", "meta-intel", "meta-openembedded", "meta-virtualization", "meta-ti", "meta-security", "meta-clang", "meta-exein", "meta-qcom"], "docs": ["yocto-autobuilder-helper", "yocto-docs", "bitbake"], - "reproducible-meta-oe": ["bitbake", "poky", "meta-openembedded"], - "patchtest": ["bitbake", "poky", "meta-patchtest", "meta-openembedded"], - "meta-oe-mirror": ["bitbake", "poky", "meta-openembedded"], - "auh": ["bitbake", "poky", "auto-upgrade-helper"], - "auh-meta-oe": ["bitbake", "poky", "meta-openembedded", "auto-upgrade-helper"], - "metrics": ["bitbake", "poky", "meta-openembedded"], - "metrics-gitstats": ["bitbake", "poky", "oecore", "bitbake", "meta-openembedded", "yocto-docs"], - "meta-webosose": ["bitbake", "poky", "meta-clang", "meta-openembedded", "meta-qt6", "meta-webosose", "meta-security"], - "default": ["bitbake", "poky"] + "reproducible-meta-oe": baserepos + ["meta-openembedded"], + "patchtest": baserepos + ["meta-patchtest", "meta-openembedded"], + "meta-oe-mirror": baserepos + ["meta-openembedded"], + "auh": baserepos + ["auto-upgrade-helper"], + "auh-meta-oe": baserepos + ["meta-openembedded", "auto-upgrade-helper"], + "metrics": baserepos + ["meta-openembedded"], + "metrics-gitstats": baserepos + ["oecore", "bitbake", "meta-openembedded", "yocto-docs"], + "meta-webosose": baserepos + ["meta-clang", "meta-openembedded", "meta-qt6", "meta-webosose", "meta-security"], + "default": baserepos } # Repositories used that the scripts need to know about and should be buildbot @@ -51,6 +51,7 @@ repos = { "meta-ti": ["ssh://git@push.yoctoproject.org/meta-ti", "master"], "meta-exein": ["https://github.com/exein-io/meta-exein", "main"], "meta-security": ["ssh://git@push.yoctoproject.org/meta-security", "master"], + "meta-yocto": ["ssh://git@push.yoctoproject.org/meta-yocto", "master"], "oecore": ["ssh://git@push.openembedded.org/openembedded-core", "master"], "bitbake": ["ssh://git@push.openembedded.org/bitbake", "master"],