From be76d86372d1230790a82d7881659be463110a7e Mon Sep 17 00:00:00 2001
From: h5b <h5b@users.noreply.github.com>
Date: Sat, 16 Nov 2024 19:41:08 +0100
Subject: [PATCH 1/3] Update to poky/scarthgap

---
 dev/bootstrap.sh | 4 ++--
 dev/init_env.sh  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
index c09f745..6eada17 100755
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -4,7 +4,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-MANIFEST_BRANCH="${1:-main}"
+MANIFEST_BRANCH="${1:-scarthgap}"
 YOCTO_TARGET_ARCH="x86_64"
 
 YOCTO_GID="1000"
@@ -34,7 +34,7 @@ podman run \
   -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \
   -v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \
   --env YOCTO_TARGET_ARCH="${YOCTO_TARGET_ARCH}" \
-  --env TEMPLATECONF="${YOCTO_WORKDIR}"/protos/conf/templates \
+  --env TEMPLATECONF="${YOCTO_WORKDIR}"/protos/meta-protos/conf/templates/default \
   --env "BB_ENV_PASSTHROUGH_ADDITIONS=YOCTO_TARGET_ARCH" \
   ghcr.io/jhnc-oss/yocto-image/yocto:38 \
   bash -c "dev/init_env.sh ${MANIFEST_BRANCH}"
diff --git a/dev/init_env.sh b/dev/init_env.sh
index 537fb67..4983356 100755
--- a/dev/init_env.sh
+++ b/dev/init_env.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-MANIFEST_BRANCH="${1:-main}"
+MANIFEST_BRANCH="${1:-scarthgap}"
 MANIFEST_URL="https://github.com/jhnc-oss/yocto-manifests.git"
 
 repo init \

From a2474afd8a06d38895c78f32b0456ff5b2da15f4 Mon Sep 17 00:00:00 2001
From: offa <bm-dev@yandex.com>
Date: Sun, 15 Dec 2024 13:26:11 +0100
Subject: [PATCH 2/3] Add Scarthgap to docs

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ae790bf..b0d1297 100644
--- a/README.md
+++ b/README.md
@@ -67,5 +67,6 @@ For further details please refer to containers-storage.conf(5).
 
 | Yocto Release Branch | Status | Note |
 |:--------------------:|:------:|------|
+| **`scarthgap`**      | :heavy_check_mark: LTS | |
 | **`kirkstone`**      | :heavy_check_mark: LTS | :arrows_clockwise: Synced from `main` — *do not contribute directly* |
 | **`dunfell`**        | :heavy_check_mark: LTS | |

From d924d8435819507149c610af3cca1e6639357e8d Mon Sep 17 00:00:00 2001
From: offa <bm-dev@yandex.com>
Date: Sun, 15 Dec 2024 13:35:30 +0100
Subject: [PATCH 3/3] Update main to scarthgap (#63)

---
 .github/workflows/sync-main.yml | 2 +-
 README.md                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml
index ada881c..d9bd410 100644
--- a/.github/workflows/sync-main.yml
+++ b/.github/workflows/sync-main.yml
@@ -15,5 +15,5 @@ jobs:
       - uses: jojomatik/sync-branch@v2
         with:
           source: "main"
-          target: "kirkstone"
+          target: "scarthgap"
           strategy: "fail"
diff --git a/README.md b/README.md
index b0d1297..79df08c 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,6 @@ For further details please refer to containers-storage.conf(5).
 
 | Yocto Release Branch | Status | Note |
 |:--------------------:|:------:|------|
-| **`scarthgap`**      | :heavy_check_mark: LTS | |
-| **`kirkstone`**      | :heavy_check_mark: LTS | :arrows_clockwise: Synced from `main` — *do not contribute directly* |
+| **`scarthgap`**      | :heavy_check_mark: LTS | :arrows_clockwise: Synced from `main` — *do not contribute directly* |
+| **`kirkstone`**      | :heavy_check_mark: LTS | |
 | **`dunfell`**        | :heavy_check_mark: LTS | |