2 files changed, 5 insertions, 1 deletions

diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index a29408a82..eaa86c411 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -36,6 +36,7 @@ PTESTS_FAST_META_OE = "\
     oprofile \
     protobuf \
     pv \
+    python3-pefile \
     sdbus-c++ \
     uthash \
     xmlsec1 \
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index d8f0f5339..a254990ec 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1"
 
 LAYERDEPENDS_openembedded-layer = "core"
 
-LAYERSERIES_COMPAT_openembedded-layer = "scarthgap styhead"
+LAYERSERIES_COMPAT_openembedded-layer = "styhead"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -115,3 +115,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}"
 
 NON_MULTILIB_RECIPES:append = " crash pahole libbpf"
+
+NON_MULTILIB_RECIPES:remove:x86 = "libbpf"
+NON_MULTILIB_RECIPES:remove:x86-64 = "libbpf"