Skip to content

Commit c2f41fd

Browse files
ci: fix meta-qcom-distro builds (#944)
Fixes for meta-qcom-distro builds, including extended lockfile, updated kas-build.yml, correct include order of the kas yml fragment and set qcom-multimedia-image as default distro image. First two changes are general kas clean up fixes (removing deprecated options).
2 parents 4942fb9 + f7b0473 commit c2f41fd

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/build-yocto.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Run kas lock
3838
run: |
39-
${KAS_CONTAINER} dump --update --lock --inplace ci/base.yml
39+
${KAS_CONTAINER} lock --update ci/base.yml:ci/distro.yml
4040
4141
- uses: actions/upload-artifact@v4
4242
with:
@@ -100,7 +100,7 @@ jobs:
100100
- name: poky-altcfg
101101
yamlfile: ""
102102
- name: qcom
103-
yamlfile: 'ci/distro.yml:'
103+
yamlfile: ':ci/distro.yml'
104104
runs-on: [self-hosted, x86]
105105
name: ${{ matrix.machine }}/${{ matrix.distro.name }}
106106
steps:
@@ -120,8 +120,8 @@ jobs:
120120
export KAS_WORK_DIR=$PWD/../kas
121121
mkdir $KAS_WORK_DIR
122122
${KAS_CONTAINER} dump --resolve-env --resolve-local --resolve-refs \
123-
ci/mirror.yml:ci/${{ matrix.machine }}.yml > kas-build.yml
124-
${KAS_CONTAINER} build ci/mirror.yml:${{ matrix.distro.yamlfile }}ci/${{ matrix.machine }}.yml
123+
ci/mirror.yml:ci/${{ matrix.machine }}.yml${{ matrix.distro.yamlfile }} > kas-build.yml
124+
${KAS_CONTAINER} build ci/mirror.yml:ci/${{ matrix.machine }}.yml${{ matrix.distro.yamlfile }}
125125
ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
126126
mv $KAS_WORK_DIR/build/buildchart.svg .
127127

ci/base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
bitbake:
2121
url: https://github.com/openembedded/bitbake
2222
layers:
23-
.: excluded
23+
.: disabled
2424

2525
meta-yocto:
2626
url: https://git.yoctoproject.org/meta-yocto

ci/distro.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ repos:
1919
meta-oe:
2020
meta-python:
2121
meta-xfce:
22+
23+
target:
24+
- qcom-multimedia-image

0 commit comments

Comments
 (0)