mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
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 <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -101,7 +101,7 @@ FILES:${PN} += "${systemd_unitdir}/system/lircd.service"
|
||||
FILES:${PN} += "${systemd_unitdir}/system/lircd.socket"
|
||||
FILES:${PN} += "${libdir}/tmpfiles.d/lirc.conf"
|
||||
FILES:${PN}-dbg += "${libdir}/lirc/plugins/.debug"
|
||||
FILES:${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${libdir}/python*/site-packages"
|
||||
FILES:${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${PYTHON_SITEPACKAGES_DIR}"
|
||||
|
||||
INITSCRIPT_PACKAGES = "lirc lirc-exec"
|
||||
INITSCRIPT_NAME:lirc-exec = "lircexec"
|
||||
|
||||
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=http
|
||||
SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake
|
||||
inherit cmake python3-dir
|
||||
|
||||
EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
|
||||
${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
|
||||
@@ -34,6 +34,6 @@ PACKAGES =+ "${PN}-python"
|
||||
|
||||
RPROVIDES:${PN}-dbg += "${PN}-python-dbg"
|
||||
|
||||
FILES:${PN}-python = "${libdir}/python*/site-packages/konkretmof.py* ${libdir}/python*/site-packages/_konkretmof.so"
|
||||
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/konkretmof.py* ${PYTHON_SITEPACKAGES_DIR}/_konkretmof.so"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;prot
|
||||
SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
FILES:${PN} += "${libdir}/python3.*/site-packages"
|
||||
FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
|
||||
|
||||
PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools"
|
||||
PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
|
||||
|
||||
@@ -26,8 +26,8 @@ do_configure:prepend() {
|
||||
}
|
||||
|
||||
do_install:append () {
|
||||
if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then
|
||||
chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so
|
||||
if [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/plist/_plist.so ]; then
|
||||
chrpath -d ${D}${PYTHON_SITEPACKAGES_DIR}/plist/_plist.so
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -38,4 +38,4 @@ PACKAGES =+ "${PN}-utils \
|
||||
FILES:${PN} = "${libdir}/libplist-2.0${SOLIBS}"
|
||||
FILES:${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}"
|
||||
FILES:${PN}-utils = "${bindir}/*"
|
||||
FILES:${PN}-python = "${libdir}/python*/site-packages/*"
|
||||
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
|
||||
@@ -28,8 +28,8 @@ do_configure:prepend() {
|
||||
}
|
||||
|
||||
do_install:append () {
|
||||
if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then
|
||||
chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so
|
||||
if [ -e ${D}${PYTHON_SITEPACKAGES_DIR}/plist/_plist.so ]; then
|
||||
chrpath -d ${D}${PYTHON_SITEPACKAGES_DIR}/plist/_plist.so
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -40,4 +40,4 @@ PACKAGES =+ "${PN}-utils \
|
||||
FILES:${PN} = "${libdir}/libplist-2.0${SOLIBS}"
|
||||
FILES:${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}"
|
||||
FILES:${PN}-utils = "${bindir}/*"
|
||||
FILES:${PN}-python = "${libdir}/python*/site-packages/*"
|
||||
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
|
||||
@@ -124,8 +124,8 @@ RDEPENDS:${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-
|
||||
|
||||
DESCRIPTION:${PN}-python = \
|
||||
"The ${PN}-python package includes RRDtool bindings for python."
|
||||
FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
|
||||
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
|
||||
RDEPENDS:${PN}-python = "python3"
|
||||
|
||||
FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
|
||||
${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"
|
||||
${PYTHON_SITEPACKAGES_DIR}/.debug"
|
||||
|
||||
@@ -101,7 +101,7 @@ PACKAGE_WRITE_DEPS += "qemu-native"
|
||||
|
||||
PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo"
|
||||
|
||||
FILES:${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/"
|
||||
FILES:${PN}-python += "${PYTHON_SITEPACKAGES_DIR}/ ${libdir}/graphviz/python/"
|
||||
FILES:${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/"
|
||||
FILES:${PN}-demo += "${datadir}/graphviz/demo/"
|
||||
|
||||
|
||||
@@ -44,8 +44,8 @@ EXTRA_OECONF = " \
|
||||
|
||||
EXTRA_OEMAKE = " \
|
||||
PYTHON=python3 \
|
||||
pythondir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \
|
||||
pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \
|
||||
pythondir=${PYTHON_SITEPACKAGES_DIR} \
|
||||
pyexecdir=${PYTHON_SITEPACKAGES_DIR} \
|
||||
STDINC='${STAGING_INCDIR}' \
|
||||
"
|
||||
|
||||
|
||||
@@ -48,12 +48,12 @@ RDEPENDS:${PN}-bin = " \
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/geisview \
|
||||
${libdir}/${PYTHON_DIR}/site-packages/geis* \
|
||||
${libdir}/${PYTHON_DIR}/site-packages/_*.so \
|
||||
${PYTHON_SITEPACKAGES_DIR}/geis* \
|
||||
${PYTHON_SITEPACKAGES_DIR}/_*.so \
|
||||
"
|
||||
|
||||
FILES:${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
|
||||
FILES:${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
|
||||
|
||||
FILES:${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la"
|
||||
FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/_*.la"
|
||||
|
||||
FILES:${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a"
|
||||
FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_*.a"
|
||||
|
||||
@@ -37,4 +37,4 @@ BBCLASSEXTEND = "native nativesdk"
|
||||
PACKAGES =+ "${PN}-python ftdi-eeprom"
|
||||
|
||||
FILES:ftdi-eeprom = "${bindir}/ftdi_eeprom"
|
||||
FILES:${PN}-python = "${libdir}/${PYTHON_DIR}/site-packages/"
|
||||
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/"
|
||||
|
||||
Reference in New Issue
Block a user