From 2397f700cf78bd2fd0225c874640f17a7a56c5f1 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 6 Oct 2020 14:13:14 +0200 Subject: [PATCH] meta-digi-dey: qtbase: fix build path error of qt5.sh script Signed-off-by: Mike Engel --- meta-digi-dey/recipes-qt/qt5/qtbase/{fb => ccimx6ul}/qt5.sh | 0 meta-digi-dey/recipes-qt/qt5/qtbase/{xwayland => }/qt5.sh | 0 meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend | 4 +--- 3 files changed, 1 insertion(+), 3 deletions(-) rename meta-digi-dey/recipes-qt/qt5/qtbase/{fb => ccimx6ul}/qt5.sh (100%) rename meta-digi-dey/recipes-qt/qt5/qtbase/{xwayland => }/qt5.sh (100%) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index f7ae3240b..c1ed65746 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -6,11 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SCRIPT_DIR = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', 'fb', d)}" - # Digi: we use a custom script per platform, not per backend like NXP does SRC_URI_append = " \ - file://${SCRIPT_DIR}/qt5.sh \ + file://qt5.sh \ " SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \