From e6fb3954f64a59653af6af2c4723e68fc00dd94a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 6 Jan 2022 11:18:36 -0600 Subject: [PATCH] Revert "Drop meta-python2 [YOCIMX-5837]" Not quite ready for this. This reverts commit 28e4cb99c89543aa03c03bc41708ba66710561ae. --- meta-sdk/conf/layer.conf | 5 +++++ tools/imx-setup-release.sh | 1 + 2 files changed, 6 insertions(+) diff --git a/meta-sdk/conf/layer.conf b/meta-sdk/conf/layer.conf index 624ad95523..db56d8f492 100644 --- a/meta-sdk/conf/layer.conf +++ b/meta-sdk/conf/layer.conf @@ -31,6 +31,9 @@ LAYERSERIES_COMPAT_networking-layer:append = " zeus gatesgarth" LAYERSERIES_COMPAT_filesystems-layer:append = " zeus gatesgarth" LAYERSERIES_COMPAT_qt6-layer = "zeus dunfell gatesgarth hardknott" +# Add zeus to LAYERSERIERS_COMPAT for meta-python2 +LAYERSERIES_COMPAT_meta-python2:append = " zeus gatesgarth" + BBFILES_DYNAMIC += " \ chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \ chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \ @@ -57,3 +60,5 @@ BBMASK += " \ meta-ivi/meta-ivi/recipes-graphics/wayland/weston-conf.bbappend \ " +# python2 is out of support, this hack is for temporary use +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/tools/imx-setup-release.sh b/tools/imx-setup-release.sh index be1dff1cb6..97aa5cfe58 100755 --- a/tools/imx-setup-release.sh +++ b/tools/imx-setup-release.sh @@ -184,6 +184,7 @@ echo "BBLAYERS += \"\${BSPDIR}/sources/meta-openembedded/meta-networking\"" >> $ echo "BBLAYERS += \"\${BSPDIR}/sources/meta-openembedded/meta-filesystems\"" >> $BUILD_DIR/conf/bblayers.conf echo "BBLAYERS += \"\${BSPDIR}/sources/meta-qt6\"" >> $BUILD_DIR/conf/bblayers.conf +echo "BBLAYERS += \"\${BSPDIR}/sources/meta-python2\"" >> $BUILD_DIR/conf/bblayers.conf # Enable docker for mx8 machines echo "BBLAYERS += \"\${BSPDIR}/sources/meta-virtualization\"" >> conf/bblayers.conf