From e7d842673952aa4aaa141f64958bc1344dbe8210 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 9 Aug 2016 10:01:41 +0200 Subject: Use PYTHON_SITEPACKAGES_DIR insted of hard-coded *site-packages* For thoese recipes that are inheriting python*-dir.bbclass, there is already a PYTHON_SITEPACKAGES_DIR present, use that definition replacing redundant "${libdir}/python*/site-packages". Signed-off-by: Ming Liu Signed-off-by: Ross Burton --- meta/recipes-kernel/lttng/lttng-tools_git.bb | 10 +++++----- meta/recipes-kernel/perf/perf.bb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb index b0c369ce96..fe1e2a3167 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_git.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb @@ -16,8 +16,8 @@ RDEPENDS_${PN}-ptest += "make perl bash" SRCREV = "a90f2c1e10b759782653a81815625e9d1bbb75ca" PV = "2.7.1+git${SRCPV}" -PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ - am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ +PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ + am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ " PACKAGECONFIG ??= "lttng-ust" @@ -39,9 +39,9 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "tracing" FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" -FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la" + ${PYTHON_SITEPACKAGES_DIR}/*" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" # Since files are installed into ${libdir}/lttng/libexec we match # the libexec insane test so skip it. diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 1e84a2231b..d4855488ae 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -217,7 +217,7 @@ RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent" FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" -FILES_${PN}-python = "${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python" +FILES_${PN}-python = "${libdir}/perf/perf-core/scripts/python ${PYTHON_SITEPACKAGES_DIR}" FILES_${PN}-python += "${libexecdir}/perf-core/scripts/python/*" FILES_${PN}-perl = "${libdir}/perf/perf-core/scripts/perl" -- cgit 1.2.3-korg