3 files changed, 23 insertions, 4 deletions

diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest
index a27f697..4740ae9 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest
@@ -17,6 +17,29 @@ print_test_result() {
     fi
 }
 
+ARCH=$(uname -m)
+
+case "$ARCH" in
+  x86_64)
+    KDIR="x86"
+    ;;
+  riscv64)
+    KDIR="riscv"
+    ;;
+  aarch64)
+    KDIR="arm64"
+    ;;
+  powerpc64le | ppc64le)
+    KDIR="powerpc"
+    ;;
+  *)
+    echo "Architecture not present, Add the architecture in run-ptest: $ARCH"
+    exit 1
+    ;;
+esac
+
+export BCC_KERNEL_SOURCE="/usr/src/kernel/arch/$KDIR"
+
 # Run CC tests, set IFS as test names have spaces
 IFS=$(printf '\n\t')
 for test_name in $(./cc/test_libbcc_no_libbpf --list-test-names-only); do
diff --git a/recipes-devtools/castxml/castxml_0.6.11.bb b/recipes-devtools/castxml/castxml_0.6.11.bb
index 7eccc77..69663e0 100644
--- a/recipes-devtools/castxml/castxml_0.6.11.bb
+++ b/recipes-devtools/castxml/castxml_0.6.11.bb
@@ -6,8 +6,6 @@ SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master"
 
 SRCREV = "f38c024b395187814f14f77974d8f5240bb2e71f"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "clang"
 inherit cmake pkgconfig python3native
 
diff --git a/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb b/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
index 9ba16b6..7c4392f 100644
--- a/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
+++ b/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
@@ -15,8 +15,6 @@ SRCREV = "fa1094c0b3848f82244778bc6153cc84f8a890f6"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
-
 inherit cmake python3native
 
 EXTRA_OECMAKE = "-DIWYU_RESOURCE_RELATIVE_TO=iwyu"