diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools_git.bb')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_git.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb index 8ef267c833..da2b68552b 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_git.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb | |||
@@ -18,16 +18,15 @@ PV = "2.7.1+git${SRCPV}" | |||
18 | 18 | ||
19 | PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ | 19 | PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ |
20 | am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ | 20 | am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ |
21 | PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \ | 21 | PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ |
22 | " | 22 | " |
23 | PACKAGECONFIG ??= "lttng-ust" | 23 | PACKAGECONFIG ??= "lttng-ust" |
24 | PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" | 24 | PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" |
25 | PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" | 25 | PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" |
26 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" | 26 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" |
27 | PACKAGECONFIG_remove_libc-musl = "lttng-ust" | 27 | PACKAGECONFIG_remove_libc-musl = "lttng-ust" |
28 | 28 | ||
29 | SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ | 29 | SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ |
30 | file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \ | ||
31 | file://stop-using-SIGUNUSED.patch \ | 30 | file://stop-using-SIGUNUSED.patch \ |
32 | file://runtest-2.4.0.patch \ | 31 | file://runtest-2.4.0.patch \ |
33 | file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \ | 32 | file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \ |
@@ -35,7 +34,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ | |||
35 | 34 | ||
36 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
37 | 36 | ||
38 | inherit autotools-brokensep ptest pkgconfig useradd python-dir | 37 | inherit autotools-brokensep ptest pkgconfig useradd python3-dir |
39 | 38 | ||
40 | USERADD_PACKAGES = "${PN}" | 39 | USERADD_PACKAGES = "${PN}" |
41 | GROUPADD_PARAM_${PN} = "tracing" | 40 | GROUPADD_PARAM_${PN} = "tracing" |