From 16c7da9d10a84e1766b5469f5d3d097638d8e877 Mon Sep 17 00:00:00 2001 From: Olaf Mandel Date: Mon, 22 May 2023 11:03:23 +0200 Subject: [PATCH] Remove hard dependency on meta-python Set up the BBFILES_DYNAMIC variable to include meta-python and move all python recipes to the corresponding dynamic-layers directory. This prevents failures to parse recipes if meta-python is not available. Pick-to: 6.5 Fixes: QTBUG-113712 Change-Id: If26668e8d901c89be8527ff3951a00d739a89372 Reviewed-by: Samuli Piippo --- conf/layer.conf | 2 ++ .../recipes-devtools}/python/python3-antlr4-runtime_4.9.2.bb | 0 .../recipes-devtools}/python/python3-appdirs_1.4.4.bbappend | 0 .../meta-python/recipes-devtools}/python/python3-path_16.2.0.bb | 0 .../recipes-devtools}/python/python3-pathtools3_0.2.1.bb | 0 .../recipes-devtools}/python/python3-pytest-qt_4.0.2.bb | 0 .../meta-python/recipes-devtools}/python/python3-qface_2.0.4.bb | 0 .../recipes-devtools}/python/python3-watchdog_0.9.0.bb | 0 8 files changed, 2 insertions(+) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-antlr4-runtime_4.9.2.bb (100%) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-appdirs_1.4.4.bbappend (100%) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-path_16.2.0.bb (100%) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-pathtools3_0.2.1.bb (100%) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-pytest-qt_4.0.2.bb (100%) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-qface_2.0.4.bb (100%) rename {recipes-devtools => dynamic-layers/meta-python/recipes-devtools}/python/python3-watchdog_0.9.0.bb (100%) diff --git a/conf/layer.conf b/conf/layer.conf index af389be..2520c14 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -16,6 +16,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" # bbappends for optional layers BBFILES_DYNAMIC += " \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \ + meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \ " BBFILE_COLLECTIONS += "qt6-layer" diff --git a/recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb similarity index 100% rename from recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb rename to dynamic-layers/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb diff --git a/recipes-devtools/python/python3-appdirs_1.4.4.bbappend b/dynamic-layers/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bbappend similarity index 100% rename from recipes-devtools/python/python3-appdirs_1.4.4.bbappend rename to dynamic-layers/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bbappend diff --git a/recipes-devtools/python/python3-path_16.2.0.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-path_16.2.0.bb similarity index 100% rename from recipes-devtools/python/python3-path_16.2.0.bb rename to dynamic-layers/meta-python/recipes-devtools/python/python3-path_16.2.0.bb diff --git a/recipes-devtools/python/python3-pathtools3_0.2.1.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-pathtools3_0.2.1.bb similarity index 100% rename from recipes-devtools/python/python3-pathtools3_0.2.1.bb rename to dynamic-layers/meta-python/recipes-devtools/python/python3-pathtools3_0.2.1.bb diff --git a/recipes-devtools/python/python3-pytest-qt_4.0.2.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-pytest-qt_4.0.2.bb similarity index 100% rename from recipes-devtools/python/python3-pytest-qt_4.0.2.bb rename to dynamic-layers/meta-python/recipes-devtools/python/python3-pytest-qt_4.0.2.bb diff --git a/recipes-devtools/python/python3-qface_2.0.4.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-qface_2.0.4.bb similarity index 100% rename from recipes-devtools/python/python3-qface_2.0.4.bb rename to dynamic-layers/meta-python/recipes-devtools/python/python3-qface_2.0.4.bb diff --git a/recipes-devtools/python/python3-watchdog_0.9.0.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-watchdog_0.9.0.bb similarity index 100% rename from recipes-devtools/python/python3-watchdog_0.9.0.bb rename to dynamic-layers/meta-python/recipes-devtools/python/python3-watchdog_0.9.0.bb