From 469e232c77d74cb030fe8a9af4ffe9127214a29b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 31 Mar 2026 18:56:52 +0200 Subject: [PATCH] yocto-builer: fetch corresponding branch for bitbake Use 2.16 branch for whinlatter. This is just temporary work around to unblock first whinlatter PR: https://github.com/agherzan/meta-raspberrypi/pull/1586 Signed-off-by: Martin Jansa --- .../docker-images/yocto-builder/entrypoint-build.sh | 6 ++++-- .../yocto-builder/entrypoint-yocto-check-layer.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh index 0d37d27..937f2e6 100755 --- a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh +++ b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh @@ -29,8 +29,10 @@ REPOS=" \ git://git.yoctoproject.org/meta-yocto \ " for repo in $REPOS; do - log "Cloning $repo on branch $BASE_REF..." - git clone --depth 1 --branch "$BASE_REF" "$repo" + BRANCH="$BASE_REF" + [ "$repo" = "git://git.openembedded.org/bitbake" -a "$BASE_REF" = "whinlatter" ] && BRANCH=2.16 + log "Cloning $repo on branch $BRANCH..." + git clone --depth 1 --branch "$BRANCH" "$repo" done # shellcheck disable=SC1091,SC2240 diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh index 71805d8..519e48a 100755 --- a/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh +++ b/.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh @@ -24,8 +24,10 @@ REPOS=" \ git://git.openembedded.org/bitbake \ " for repo in $REPOS; do - log "Cloning $repo on branch $BASE_REF..." - git clone --depth 1 --branch "$BASE_REF" "$repo" + BRANCH="$BASE_REF" + [ "$repo" = "git://git.openembedded.org/bitbake" -a "$BASE_REF" = "whinlatter" ] && BRANCH=2.16 + log "Cloning $repo on branch $BRANCH..." + git clone --depth 1 --branch "$BRANCH" "$repo" done # shellcheck disable=SC1091,SC2240