Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/build-test-recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,20 @@ jobs:
run: |
echo diff:
echo ${{ needs.changed.outputs.diff }}

# Map machine to architecture for COMPATIBLE_HOST check
case "${{ matrix.machine }}" in
qemuarm)
ARCH="arm"
;;
qemuarm64)
ARCH="aarch64"
;;
qemux86-64)
ARCH="x86-64"
;;
esac

export RECIPES=$( echo "${{ needs.changed.outputs.diff }}" | tr ' ' '\n' | grep '\.bb.*$' | sed 's!.*/!!' | sed 's!.bb!!' | sed 's!_.*!!' | sort | uniq | sed -z $'s/\\\n/ /g')
if [ "" == "$RECIPES" ]; then
echo "No changed recipes, adding everything with a ptest to test, build"
Expand All @@ -119,6 +133,16 @@ jobs:
export RECIPES=$(find meta-aws/ -name *.bb -type f \( ${THINGS_TO_EXCLUDE} \) -print | xargs grep -l 'inherit.*ptest.*'| sed 's!.*/!!' | sed 's!.bb!!' | sed 's!_.*!!' | sort | uniq | sed -z $'s/\\\n/ /g')
echo THINGS_TO_EXCLUDE: $THINGS_TO_EXCLUDE
fi

# Filter out recipes with COMPATIBLE_HOST:$ARCH = "null"
FILTERED_RECIPES=""
for recipe in $RECIPES; do
if ! find meta-aws/ -name "${recipe}.bb" -o -name "${recipe}_*.bb" | xargs grep -q "COMPATIBLE_HOST:${ARCH}[[:space:]]*=[[:space:]]*\"null\"" 2>/dev/null; then
FILTERED_RECIPES+="$recipe "
fi
done
export RECIPES="$FILTERED_RECIPES"

echo RECIPES to build, test: "$RECIPES"
echo "recipes=$RECIPES" >> $GITHUB_OUTPUT
- name: Run build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SRC_URI = "\
file://ptest_result.py \
"

SRCREV = "cf817bc5d18f3e4bd499c6b0f9a68c6f4d7e01de"
SRCREV = "84f94300f92c3f4d3886f86e3652eabcc892e5e5"

inherit cmake pkgconfig ptest

Expand All @@ -46,9 +46,12 @@ FILES:${PN} += "\
${libdir} \
"

# nooelint: oelint.vars.specific
COMPATIBLE_HOST:arm = "null"

CFLAGS:append = " -Wl,-Bsymbolic"

# nooelint: oelint.vars.specific - arm32 gives this warning
# nooelint: oelint.vars.specific
CFLAGS:append:arm = " -Wno-incompatible-pointer-types"

EXTRA_OECMAKE += "\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
From 28528bb16dbecef64bc19dffdc2098c3bcd27bc1 Mon Sep 17 00:00:00 2001
From: Thomas Roos <throos@amazon.de>
Date: Wed, 23 Jul 2025 16:39:01 +0000
Subject: [PATCH] amazon-kvs-webrtc-sdk: disable download of kvs-common-lws

This will disable the download of the kvsCommonLws library, which is not needed for the build.
As we use the system-installed version of kvsCommonLws, we do not need to download it again.

Upstream-Status: Inappropriate [oe-specific]
---
CMakeLists.txt | 10 ----------
1 file changed, 10 deletions(-)

Index: amazon-kvs-webrtc-sdk-1.12.1/CMakeLists.txt
===================================================================
--- amazon-kvs-webrtc-sdk-1.12.1.orig/CMakeLists.txt
+++ amazon-kvs-webrtc-sdk-1.12.1/CMakeLists.txt
@@ -265,16 +265,6 @@ if(BUILD_DEPENDENCIES)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6d2546979..214fb77550 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,16 +281,6 @@ if(BUILD_DEPENDENCIES)
message(STATUS "Finished building dependencies.")
endif()

-# building kvsCommonLws also builds kvspic
-set(BUILD_ARGS
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
Expand All @@ -22,5 +30,5 @@ Index: amazon-kvs-webrtc-sdk-1.12.1/CMakeLists.txt
-build_dependency(kvsCommonLws ${BUILD_ARGS})
-
############# find dependent libraries ############

find_package(Threads)
Loading