libvirt-python: update install and packaging

To work with oe-core master, we need to update the libvirt-python
FILES_* specification to properly pick up and package the support
libraries.

We can also follow the lead of distutils and use a common set of
install arguments for the configuration and install of our nested
libvirt-python support.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 8f553988..c630bbba 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -9,22 +9,28 @@ RDEPENDS_${PN}-python += "python"
 PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python"
 
 PACKAGES += "${PN}-python-staticdev ${PN}-python-dev ${PN}-python-dbg ${PN}-python"
+
 FILES_${PN}-python-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
 FILES_${PN}-python-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
 FILES_${PN}-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
-FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN}-python += "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
 
 SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
 SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
 
-SRC_URI[libvirt_python.md5sum] = "38158e5740be65f17eef9f99ffa5dadf"
-SRC_URI[libvirt_python.sha256sum] = "2fe7e341cb1b35cff130b7a04d0d58f3607094e63cbca689bc16c7b47da0f52b"
+SRC_URI[libvirt_python.md5sum] = "e1effd6007b2ebd5d024c6c3838456fb"
+SRC_URI[libvirt_python.sha256sum] = "bce558606b157d0717ee7bd6537d85dd4c0321c59b4235c967db7a3aad80e246"
 
 export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
 export LIBVIRT_CFLAGS = "-I${S}/include"
 export LIBVIRT_LIBS = "-L${S}/src/.libs -lvirt -ldl"
 export LDFLAGS="-L${S}/src/.libs"
 
+LIBVIRT_INSTALL_ARGS = "--root=${D} \
+    --prefix=${prefix} \
+    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
+    --install-data=${datadir}"
+
 python __anonymous () {
     pkgconfig = d.getVar('PACKAGECONFIG', True)
     if ('python') in pkgconfig.split():
@@ -43,10 +49,9 @@ addtask do_compile_python before do_install after do_compile
         
 do_install_python() {
         if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then
-                cd ${WORKDIR}/libvirt-python-${PV} && \
+                cd ${WORKDIR}/${PN}-python-${PV} && \
                   ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install \
-                  --install-lib=${PYTHON_SITEPACKAGES_DIR} \
-                  --root=${WORKDIR}/image
+                       --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${LIBVIRT_INSTALL_ARGS}
         fi
 }
 addtask do_install_python before do_populate_sysroot after do_install