Skip to content

Commit

Permalink
CI: rework to enable optional meta-qcom-distro configs (#740)
Browse files Browse the repository at this point in the history
Consume the upstream repos directly, not through the combo repo.
  • Loading branch information
sbanerjee-quic authored Feb 18, 2025
2 parents 478f8d2 + c649591 commit 8ff986d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
13 changes: 11 additions & 2 deletions ci/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,19 @@ defaults:
repos:
meta-qcom:

poky:
url: https://git.yoctoproject.org/git/poky
oe-core:
url: https://git.openembedded.org/openembedded-core
layers:
meta:

bitbake:
url: https://git.openembedded.org/bitbake
layers:
.: excluded

meta-yocto:
url: https://git.yoctoproject.org/git/meta-yocto
layers:
meta-poky:

local_conf_header:
Expand Down
11 changes: 11 additions & 0 deletions ci/distro.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json

header:
version: 14

distro: qcom-wayland

repos:
meta-qcom-distro:
url: https://github.com/qualcomm-linux/meta-qcom-distro
branch: main
2 changes: 1 addition & 1 deletion ci/yocto-check-layer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CMD="$CMD $TOPDIR"
# Disable auto layer discovery
CMD="$CMD --no-auto"
# Layers to process for dependencies
CMD="$CMD --dependency $KAS_WORK_DIR/poky/meta"
CMD="$CMD --dependency $KAS_WORK_DIR/oe-core/meta"
# Disable automatic testing of dependencies
CMD="$CMD --no-auto-dependency"
# Set machines to all machines defined in this BSP layer
Expand Down
2 changes: 1 addition & 1 deletion ci/yocto-patchreview.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TOPDIR=$(realpath $(dirname $(readlink -f $0))/..)
export KAS_WORK_DIR=$(realpath ${KAS_WORK_DIR:-$(mktemp -d)})

echo "Running kas in $KAS_WORK_DIR"
kas shell $TOPDIR/ci/base.yml --command "$KAS_WORK_DIR/poky/scripts/contrib/patchreview.py -v -b -j status.json $TOPDIR"
kas shell $TOPDIR/ci/base.yml --command "$KAS_WORK_DIR/oe-core/scripts/contrib/patchreview.py -v -b -j status.json $TOPDIR"

# return an error if any malformed patch is found
cat $KAS_WORK_DIR/build/status.json |
Expand Down

0 comments on commit 8ff986d

Please sign in to comment.