From 1cb0dae6b8bddcef854aa30a61af8213b638a63a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 22 Mar 2024 21:49:15 +0100 Subject: lvgl: Deduplicate PACKAGECONFIG into lv-conf Move the default PACKAGECONFIG setting from both recipes into lv-conf.inc to avoid duplication. No functional change. Signed-off-by: Marek Vasut Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/lvgl/lv-conf.inc | 2 ++ meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb | 1 - meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc index 8596790ae0..8fd3412c04 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-conf.inc +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -1,3 +1,5 @@ +PACKAGECONFIG ??= "drm" + PACKAGECONFIG[drm] = ",,libdrm" PACKAGECONFIG[fbdev] = ",," PACKAGECONFIG[sdl] = ",,virtual/libsdl2 libsdl2-image" diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb index 2bf56e293c..3fc3f92860 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb @@ -20,7 +20,6 @@ SRCREV_FORMAT = "demo_lvgl" EXTRA_OEMAKE = "DESTDIR=${D}" -PACKAGECONFIG ??= "drm" LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" LVGL_CONFIG_LV_USE_LOG = "1" LVGL_CONFIG_LV_LOG_PRINTF = "1" diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb index 353d0002fa..0ebd6ec422 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb @@ -20,7 +20,6 @@ inherit cmake EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "drm" require lv-conf.inc do_install:append() { -- cgit 1.2.3-korg