Skip to content

Commit

Permalink
lttng-ust: try to enable old API
Browse files Browse the repository at this point in the history
* unfortunatelly this isn't enough and it still fails, so disable WEBOS_LTTNG_ENABLED
  until it's resolved
  • Loading branch information
shr-project committed Sep 13, 2021
1 parent 43f059e commit 91f3308
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion meta-webos/classes/webos_lttng.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

inherit webos_prerelease_dep
WEBOS_LTTNG_ENABLED ??= "0"
WEBOS_LTTNG_ENABLED ?= "${@ '0' if '${WEBOS_DISTRO_PRERELEASE}' == '' else '1' }"
#WEBOS_LTTNG_ENABLED ?= "${@ '0' if '${WEBOS_DISTRO_PRERELEASE}' == '' else '1' }"
# Only enable LTTng for target components
WEBOS_LTTNG_ENABLED:class-native = "0"
WEBOS_LTTNG_ENABLED:class-nativesdk = "0"
Expand Down
18 changes: 18 additions & 0 deletions meta-webos/recipes-kernel/lttng/lttng-ust_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright (c) 2021 LG Electronics, Inc.

EXTENDPRAUTO:append = "webos1"

# enable old API to fix http://gecko.lge.com/Builds/Details/672098
# luna-surfacemanager, qtwayland-webos, qml-webos-components, audiod, webruntime, pmtrace are all failing like:
# TOPDIR/BUILD/work/qemux86-webos-linux/luna-surfacemanager/2.0.0-358-r51/recipe-sysroot/usr/include/lttng/tracepoint-event.h:67:10: error: #include expects "FILENAME" or <FILENAME>
# 67 | #include LTTNG_UST_TRACEPOINT_INCLUDE
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

# TOPDIR/BUILD/work/qemux86-webos-linux/pmtrace/1.0.0-9-r11/git/src/libmemtracker/liblttng-ust-mtrace-malloc/./ust_mtrace_malloc.h:41:9: error: static assertion failed: "Non-integer type `bt` not supported as element of LTTNG_UST_FIELD_ARRAY or LTTNG_UST_FIELD_SEQUENCE"
# 41 | ctf_sequence(void *, bt, bt, size_t, depth)
# | ^~~~~~~~~~~~

# TOPDIR/BUILD/work/qemux86-webos-linux/pmtrace/1.0.0-9-r11/git/src/libmemtracker/liblttng-ust-mtrace-malloc/./ust_mtrace_malloc.h:36:1: error: expected expression before ')' token
# 36 | TRACEPOINT_EVENT(mtrace_malloc, malloc,
# | ^~~~~~~~~~~~~~~~
CFLAGS += "-DLTTNG_UST_COMPAT_API_VERSION=0"

0 comments on commit 91f3308

Please sign in to comment.