From d3a16ad4aec3f496484295bbdb1f3d661911e69b Mon Sep 17 00:00:00 2001 From: alperak Date: Mon, 15 Apr 2024 21:19:59 +0300 Subject: Use PYTHON_SITEPACKAGES_DIR instead of hard-coded site-packages directory path The following paths have been replaced with PYTHON_SITEPACKAGES_DIR: - "${libdir}/${PYTHON_DIR}/site-packages" - "${libdir}/python${PYTHON_BASEVERSION}/site-packages" - "${libdir}/python*/site-packages" - "${libdir}/python3.*/site-packages" Signed-off-by: alperak Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb | 4 ++-- meta-networking/recipes-support/libldb/libldb_2.8.0.bb | 4 ++-- meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb | 2 +- meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb | 2 +- meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-networking') diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb index 3e5fc91dad..63476d3495 100644 --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb @@ -33,6 +33,6 @@ RDEPENDS:${PN}-python = " python3-core " RDEPENDS:${PN} = " python3-core " FILES:${PN} += " \ - ${libdir}/${PYTHON_DIR}/site-packages/iec61850.py \ - ${libdir}/${PYTHON_DIR}/site-packages/_iec61850.so \ + ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ + ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ " diff --git a/meta-networking/recipes-support/libldb/libldb_2.8.0.bb b/meta-networking/recipes-support/libldb/libldb_2.8.0.bb index 58d683eab4..bdd87993d7 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.8.0.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.8.0.bb @@ -63,10 +63,10 @@ FILES:${PN}-dbg += "${bindir}/.debug/* \ ${libdir}/ldb/.debug/* \ ${libdir}/ldb/modules/ldb/.debug/*" -FILES:pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ +FILES:pyldb = "${PYTHON_SITEPACKAGES_DIR}/* \ ${libdir}/libpyldb-util.*.so.* \ " -FILES:pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ +FILES:pyldb-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug \ ${libdir}/.debug/libpyldb-util.*.so.*" FILES:pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb index 394c176287..b617f097cf 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.4.2.bb @@ -53,7 +53,7 @@ PACKAGES += "pytalloc pytalloc-dev" RPROVIDES:${PN}-dbg += "pytalloc-dbg" -FILES:pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ +FILES:pytalloc = "${PYTHON_SITEPACKAGES_DIR}/* \ ${libdir}/libpytalloc-util.so.2 \ ${libdir}/libpytalloc-util.so.2.1.1 \ " diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb index f23b157e8c..bd3f9f63a9 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb @@ -58,6 +58,6 @@ RPROVIDES:${PN}-dbg += "python3-tdb-dbg" FILES:${PN} = "${libdir}/*.so.*" FILES:tdb-tools = "${bindir}/*" -FILES:python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES:python3-tdb = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS:python3-tdb = "python3" INSANE_SKIP:${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb index 67f36083bf..ac80f3733a 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb @@ -57,6 +57,6 @@ PACKAGES += "python3-tevent" RPROVIDES:${PN}-dbg += "python3-tevent-dbg" -FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES:python3-tevent = "${PYTHON_SITEPACKAGES_DIR}/*" INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" -- cgit v1.2.3-54-g00ecf