From ffe207686dd1036f5fa1306517a57f83c010349a Mon Sep 17 00:00:00 2001 From: Quanyang Wang Date: Fri, 4 Mar 2022 12:20:50 +0800 Subject: cairo: add trace to PACKAGECONFIG to fix do_package error while enabling multilib Issue: LINCD-8359 In cairo_1.16.0.bb, the macro MULTILIB_SCRIPTS is set to be "${PN}-perf-utils:${bindir}/cairo-trace" which indicates that the script cairo-trace will be handled using update-alternatives with multilib. But in the bbappend meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend, the "trace" is removed from PACKAGECONFIG and this will cause that the class multilib_script can't find the cairo-trace script. The error log is as below: ERROR: cairo-1.16.0-r0 do_package: Error executing a python function in exec_python_func() autogenerated: ...... Exception: bb.process.ExecutionError: Execution of 'build/tmp-glibc/work/cortexa53-wrs-linux/cairo/1.16.0-r0/temp/run.multilibscript_rename.22582' failed with exit code 1: mv: cannot stat 'build/tmp-glibc/work/cortexa53-wrs-linux/cairo/1.16.0-r0/package/usr/bin/cairo-trace': No such file or directory WARNING: exit code 1 from a shell command. So add "trace" back to PACKAGECONFIG to fix the do_package error. Signed-off-by: Quanyang Wang Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-xilinx-core') diff --git a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend index c46e8550..4b8d9935 100644 --- a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend @@ -5,6 +5,7 @@ DEFAULT_PACKAGECONFIG := "${PACKAGECONFIG}" PACKAGECONFIG_LIBMALI = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ egl glesv2 \ + trace \ " PACKAGECONFIG = "${@'${PACKAGECONFIG_LIBMALI}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGECONFIG}'}" -- cgit v1.2.3-54-g00ecf