From 7cce43e632daa8650f683ac726f9124681b302a4 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Tue, 1 Oct 2024 11:07:46 -0400 Subject: [PATCH] Revert "CI: switch to building against styhead branches where possible" This reverts commit 2b1348d74f9fb4e49ece3a8a0107307ec432f392. Revert to allow the meta-arm master branch to use the master branch of other layers. --- ci/base.yml | 2 +- ci/clang.yml | 1 - ci/meta-secure-core.yml | 1 - ci/meta-virtualization.yml | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index 7b550dbf..d1c933d0 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -7,7 +7,7 @@ distro: poky defaults: repos: - branch: styhead + branch: master repos: meta-arm: diff --git a/ci/clang.yml b/ci/clang.yml index 7dd5d522..402292a6 100644 --- a/ci/clang.yml +++ b/ci/clang.yml @@ -6,7 +6,6 @@ header: repos: meta-clang: url: https://github.com/kraj/meta-clang - branch: master local_conf_header: toolchain: | diff --git a/ci/meta-secure-core.yml b/ci/meta-secure-core.yml index 81280e73..b34562b2 100644 --- a/ci/meta-secure-core.yml +++ b/ci/meta-secure-core.yml @@ -6,7 +6,6 @@ header: repos: meta-secure-core: url: https://github.com/Wind-River/meta-secure-core.git - branch: master layers: meta-secure-core-common: meta-signing-key: diff --git a/ci/meta-virtualization.yml b/ci/meta-virtualization.yml index d699d70a..c0ba70ba 100644 --- a/ci/meta-virtualization.yml +++ b/ci/meta-virtualization.yml @@ -8,4 +8,3 @@ header: repos: meta-virtualization: url: https://git.yoctoproject.org/meta-virtualization - branch: master