From faa9d6a7b14a7b204d8ea02b847e04a2db5ceed1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 8 Apr 2023 00:07:37 +0200 Subject: lvgl,lv-lib-png,lv-drivers: fix installed-vs-shipped QA issue with multilib * with multilib BASELIB is just "lib" while baselib is "lib64" and libdir is "/usr/lib64". * fixes: ERROR: QA Issue: lvgl: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/liblvgl.a Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. lvgl: 2 installed and not shipped files. [installed-vs-shipped] * lowercase baselib should work for ppc64 as well (I hope) # $baselib [3 operations] # set oe-core/meta/conf/bitbake.conf:10 # "${BASELIB}" # set oe-core/meta/conf/bitbake.conf:11 # [vardepvalue] "${baselib}" # set oe-core/meta/conf/multilib.conf:2 # "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" # pre-expansion value: # "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" baselib="lib64" * simplify destsuffix/S setting * I was surprised that ${WORKDIR}/${PN}-${PV} works in multilib build but then I've noticed that it's because destsuffix is set to S which is a bit uncommon, so drop that and use default "git" * use ${STAGING_INCDIR} instead of ${RECIPE_SYSROOT}/${includedir} Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb') diff --git a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb index 032e85f522..22b4826403 100644 --- a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb @@ -8,21 +8,23 @@ DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lod LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_lib_png;;protocol=https;nobranch=1" SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" +S = "${WORKDIR}/git" + # because of lvgl dependency REQUIRED_DISTRO_FEATURES = "wayland" DEPENDS += "lvgl" -EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${BASELIB}" +EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${baselib}" inherit cmake inherit features_check TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" FILES:${PN}-dev = "\ ${includedir}/lvgl/lv_lib_png/ \ -- cgit v1.2.3-54-g00ecf