From 9796d2df851c445781185bc424d43e956dd37ce9 Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Mon, 3 Jun 2024 17:36:42 +0200 Subject: [PATCH 1/3] Add scarthgap layer compat Signed-off-by: Kai-Uwe Hermann --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 71dfe99..13b9147 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "meta-everest" BBFILE_PATTERN_meta-everest = "^${LAYERDIR}/" LAYERDEPENDS_meta-everest = "core" -LAYERSERIES_COMPAT_meta-everest = "kirkstone" +LAYERSERIES_COMPAT_meta-everest = "kirkstone scarthgap" From e9e48ea4c83b315e15ba53a84322c3c60b55cb91 Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Mon, 3 Jun 2024 17:37:22 +0200 Subject: [PATCH 2/3] Update libwebsockets to 4.3.3 Signed-off-by: Kai-Uwe Hermann --- .../{libwebsockets_4.3.2.bb => libwebsockets_4.3.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-backports/libwebsockets/{libwebsockets_4.3.2.bb => libwebsockets_4.3.3.bb} (97%) diff --git a/recipes-backports/libwebsockets/libwebsockets_4.3.2.bb b/recipes-backports/libwebsockets/libwebsockets_4.3.3.bb similarity index 97% rename from recipes-backports/libwebsockets/libwebsockets_4.3.2.bb rename to recipes-backports/libwebsockets/libwebsockets_4.3.3.bb index 21297f2..5d41681 100644 --- a/recipes-backports/libwebsockets/libwebsockets_4.3.2.bb +++ b/recipes-backports/libwebsockets/libwebsockets_4.3.3.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "b0a749c8e7a8294b68581ce4feac0e55045eb00b" +SRCREV = "4415e84c095857629863804e941b9e1c2e9347ef" SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" From e29e96997a79abeb66f5f35f65dd872b8062f7df Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Mon, 3 Jun 2024 17:38:25 +0200 Subject: [PATCH 3/3] Set PYTHON_INCLUDE_DIRS explicitly to prevent host python to be found Signed-off-by: Kai-Uwe Hermann --- recipes-core/everest/everest-framework_0.13.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-core/everest/everest-framework_0.13.0.bb b/recipes-core/everest/everest-framework_0.13.0.bb index 47384cc..21fe724 100644 --- a/recipes-core/everest/everest-framework_0.13.0.bb +++ b/recipes-core/everest/everest-framework_0.13.0.bb @@ -36,10 +36,12 @@ DEPENDS = "\ FILES:${PN} += "${libdir}/everest/* ${datadir}/everest/*" +# we need to set PYTHON_INCLUDE_DIRS explicity, otherwise the host python is found EXTRA_OECMAKE += "\ -DDISABLE_EDM=ON \ -DNO_FETCH_CONTENT=ON \ -DPYTHON_MODULE_EXTENSION=.so \ -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF \ -DEVEREST_INSTALL_ADMIN_PANEL=OFF \ + -DPYTHON_INCLUDE_DIRS="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" \ "