summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch30
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb7
2 files changed, 3 insertions, 34 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch b/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch
deleted file mode 100644
index d05c04c662..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From: Otavio Salvador <otavio@ossystems.com.br>
2Date: Fri, 4 Dec 2015 16:11:41 +0000
3Subject: [PATCH] Revert "Build: look for python >= 3.0 when building python bindings"
4Organization: O.S. Systems Software LTDA.
5
6This reverts commit 227703a2ceada3c104edd56756d48455ca4c271a.
7
8Upstream-Status: Pending
9
10Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 4dee4b4..6608bcd 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -339,7 +339,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes])
20
21 if test "x${enable_python_binding:-yes}" = xyes; then
22 AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
23- AM_PATH_PYTHON([3.0])
24+ AM_PATH_PYTHON
25
26 AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
27 AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
28--
292.1.4
30
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
19PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ 19PYTHON_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"
23PACKAGECONFIG ??= "lttng-ust" 23PACKAGECONFIG ??= "lttng-ust"
24PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" 24PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
25PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" 25PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
26PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" 26PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
27PACKAGECONFIG_remove_libc-musl = "lttng-ust" 27PACKAGECONFIG_remove_libc-musl = "lttng-ust"
28 28
29SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ 29SRC_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
36S = "${WORKDIR}/git" 35S = "${WORKDIR}/git"
37 36
38inherit autotools-brokensep ptest pkgconfig useradd python-dir 37inherit autotools-brokensep ptest pkgconfig useradd python3-dir
39 38
40USERADD_PACKAGES = "${PN}" 39USERADD_PACKAGES = "${PN}"
41GROUPADD_PARAM_${PN} = "tracing" 40GROUPADD_PARAM_${PN} = "tracing"