Switch to styhead, move scarthgap to a separate branch and include it…

… in weekly builds

Signed-off-by: Neil Armstrong <[email protected]>

.github/workflows/weekly.yml

@@ -31,28 +31,15 @@ jobs:
     secrets:
       TUXSUITE_TOKEN: ${{ secrets.TUXSUITE_TOKEN }}
 
-  dunfell:
+  scarthgap:
     uses: ./.github/workflows/build-template.yml
     with:
       host: ubuntu-20.04
       images: core-image-base core-image-weston core-image-x11 amlogic-image-headless-initrd amlogic-image-headless-sd amlogic-image-sato
       machines: amlogic-p200 amlogic-p200-sdboot amlogic-p201-sdboot amlogic-p212 amlogic-p212-sdboot amlogic-s400 friendlyelec-nanopik2 hardkernel-odroidc2 hardkernel-odroidc2-sdboot hardkernel-odroidc4 hardkernel-odroidc4-sdboot hardkernel-odroidhc4 hardkernel-odroidhc4-sdboot hardkernel-odroidn2 hardkernel-odroidn2-sdboot hardkernel-odroidn2plus hardkernel-odroidn2plus-sdboot khadas-vim khadas-vim-sdboot khadas-vim2 khadas-vim3 khadas-vim3-sdboot khadas-vim3l khadas-vim3l-sdboot libretech-ac libretech-cc seirobotics-sei510 seirobotics-sei610 
       ref_type: branch
-      ref: dunfell
-      branch: dunfell
-      url: ${{github.server_url}}/${{github.repository}}
-    secrets:
-      TUXSUITE_TOKEN: ${{ secrets.TUXSUITE_TOKEN }}
-
-  nanbield:
-    uses: ./.github/workflows/build-template.yml
-    with:
-      host: ubuntu-20.04
-      images: core-image-base core-image-weston core-image-x11 amlogic-image-headless-initrd amlogic-image-headless-sd amlogic-image-sato
-      machines: amlogic-p200 amlogic-p200-sdboot amlogic-p201-sdboot amlogic-p212 amlogic-p212-sdboot amlogic-s400 friendlyelec-nanopik2 hardkernel-odroidc2 hardkernel-odroidc2-sdboot hardkernel-odroidc4 hardkernel-odroidc4-sdboot hardkernel-odroidhc4 hardkernel-odroidhc4-sdboot hardkernel-odroidn2 hardkernel-odroidn2-sdboot hardkernel-odroidn2plus hardkernel-odroidn2plus-sdboot khadas-vim khadas-vim-sdboot khadas-vim2 khadas-vim3 khadas-vim3-sdboot khadas-vim3l khadas-vim3l-sdboot libretech-ac libretech-cc seirobotics-sei510 seirobotics-sei610 
-      ref_type: branch
-      ref: nanbield
-      branch: nanbield
+      ref: scarthgap
+      branch: scarthgap
       url: ${{github.server_url}}/${{github.repository}}
     secrets:
       TUXSUITE_TOKEN: ${{ secrets.TUXSUITE_TOKEN }}

README.md

@@ -20,12 +20,12 @@ $ mkdir amlogic-bsp
 Checkout Yocto/Poky :
 ```
 $ cd amlogic-bsp
-amlogic-bsp$ git clone --depth 1 git://git.yoctoproject.org/poky -b nanbield poky
+amlogic-bsp$ git clone --depth 1 git://git.yoctoproject.org/poky -b master poky
 ```
 
 Checkout meta-meson :
 ```
-amlogic-bsp$ git clone https://github.com/superna9999/meta-meson.git meta-meson -b nanbield
+amlogic-bsp$ git clone https://github.com/superna9999/meta-meson.git meta-meson -b master
 ```
 
 Initialize environment :

conf/layer.conf

@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "meson"
 BBFILE_PATTERN_meson = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meson = "1"
-LAYERSERIES_COMPAT_meson = "scarthgap"
+LAYERSERIES_COMPAT_meson = "styhead"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers