Merge pull request #79 from jhnc-oss/63-merge_scarthgap

Switch main to scarthgap

.github/workflows/sync-main.yml

@@ -15,5 +15,5 @@ jobs:
       - uses: jojomatik/sync-branch@v2
         with:
           source: "main"
-          target: "kirkstone"
+          target: "scarthgap"
           strategy: "fail"

README.md

@@ -67,5 +67,6 @@ For further details please refer to containers-storage.conf(5).
 
 | Yocto Release Branch | Status | Note |
 |:--------------------:|:------:|------|
-| **`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 | |

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}"

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 \