From b2754811ccbc7fa4ebf741b8a92f74a5e5bc71aa Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 4 May 2021 18:15:22 +0200 Subject: [PATCH] weston-init: fix build by removing duplicate entry for ccimx6 platforms In the free meta-scale layer, the same entry "use-g2d = 1" is uncommented for mx6dl and mx6q, however our ccimx6 platform has both machines in its definition, so the same entry is uncommented twice and throws an unexpected error. This commit adds a append in the install process to uncomment this entry for the ccimx6 platform. Signed-off-by: Arturo Buzarra --- .../recipes-graphics/wayland/weston-init.bbappend | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend index b7ca70be3..9dcc65394 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend @@ -7,11 +7,13 @@ SRC_URI += " \ file://profile \ " -# Digi: use g2d on ccimx6sbc to fix desktop window issue -# Also needed to workaround an HDMI hotplug issue on the ccimx6qpsbc -INI_UNCOMMENT_ASSIGNMENTS_append_ccimx6 = " \ - use-g2d=1 \ -" +# Remove duplicate entries for the ccimx6 platform +# and uncomment with an individual append +INI_UNCOMMENT_ASSIGNMENTS_remove_ccimx6 = "use-g2d=1" + +do_install_append_ccimx6() { + uncomment "use-g2d=1" ${D}${sysconfdir}/xdg/weston/weston.ini +} do_install_append() { install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh