From 8533f93719f5ee30c71a07e28d0a91e80b7c99a2 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 17 Apr 2023 10:07:13 -0500 Subject: [PATCH] fsl-imx-base.inc: Fix fetcher failure for Qt 5.15.2 [YOCIMX-6895] The Qt bugfix branches are removed, so the meta-qt5 recipes are broken: ``` ERROR: qtbase-5.15.2+gitAUTOINC+40143c189b-r0 do_fetch: Fetcher failure: Unable to find revision 40143c189b7c1bf3c2058b77d00ea5c4e3be8b28 in branch 5.15.2 even from upstream ERROR: qtbase-5.15.2+gitAUTOINC+40143c189b-r0 do_fetch: Fetcher failure for URL: 'git://code.qt.io/qt/qtbase.git;name=qtbase;branch=5.15.2;protocol=git'. Unable to fetch URL from any source. ``` Fix the problem by disabling branch checking. Signed-off-by: Tom Hochstein (cherry picked from commit 4bba4a5dc980ba523470d0bfe3b186fa4fb60c17) (cherry picked from commit 60905dc94d0270f1a66e41fd5e051e4839199d8c) (cherry picked from commit d176aee3567cdccb5a7fb7c7e70a7cb3bee51bc0) --- meta-sdk/conf/distro/include/fsl-imx-base.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-sdk/conf/distro/include/fsl-imx-base.inc b/meta-sdk/conf/distro/include/fsl-imx-base.inc index 052404eca5..45038e2a90 100644 --- a/meta-sdk/conf/distro/include/fsl-imx-base.inc +++ b/meta-sdk/conf/distro/include/fsl-imx-base.inc @@ -12,3 +12,7 @@ POKY_DEFAULT_DISTRO_FEATURES_remove = "wayland ${REMOVE_VULKAN_FEATURE}" POKY_DEFAULT_DISTRO_FEATURES_append_mx8 = " jailhouse" INHERIT_remove = "uninative" + +# Set nobranch since bugfix branches like 5.15.2 were dropped +QT_MODULE_BRANCH_PARAM = "${QT_MODULE_BRANCH_PARAM_IMX}" +QT_MODULE_BRANCH_PARAM_IMX ?= "nobranch=1"