temp

bhargavdas · Sep 15, 2024 · bad1bcd · bad1bcd
1 parent 5655bd1
commit bad1bcd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - yocto-ci-test
     tags:
       - v*
   pull_request:
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build image
         run: |
           export KAS_BUILD_DIR=${PWD}/build-yocto
@@ -47,9 +47,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build image
-        if: github.ref == 'refs/heads/master'
         run: |
           export KAS_BUILD_DIR=${PWD}/build-yocto
           ./kas-container build kas/yocto/mtda-qemu-yocto.yml
diff --git a/kas/yocto/mtda-qemu-yocto.yml b/kas/yocto/mtda-qemu-yocto.yml
@@ -50,6 +50,8 @@ local_conf_header:
     CONF_VERSION = "2"
     USER_CLASSES = "buildstats"
     PATCHRESOLVE = "noop"
+    INHERIT += "rm_work"
+    DISTRO_FEATURES:append = "usrmerge"
   debug-tweaks: |
     EXTRA_IMAGE_FEATURES = "debug-tweaks"
   diskmon: |

diff --git a/meta-yocto/conf/layer.conf b/meta-yocto/conf/layer.conf
@@ -17,7 +17,7 @@ BBFILE_PATTERN_meta-mtda-oe = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-mtda-oe = "10"
 
 LAYERDEPENDS_meta-mtda-oe = "core"
-LAYERSERIES_COMPAT_meta-mtda-oe = "kirkstone mickledore"
+LAYERSERIES_COMPAT_meta-mtda-oe = "kirkstone mickledore styhead"
 LAYERDIR_mtda = "${LAYERDIR}"
 
 DISTRO_FEATURES:append = " systemd "