diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-02-05 16:41:55 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-02-05 16:41:55 -0500 |
| commit | 41101a7a51fd2a98fda57ff2493e25f96748359d (patch) | |
| tree | 33a9f5c0a77baa8c633677562f13627d6f423f11 | |
| parent | 142477933dae9b4561ed3f28753d26ab4f150c2e (diff) | |
libvirt: fix python packaging race
The tasks responsible for compiling and installing the python support
were racing against packaging. As a result, a clean build would not
have anything in libvirt-python, but subsequent builds would.
By moving to _appends, we control the order and always get properly
packaged.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | recipes-extended/libvirt/libvirt-python.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc index c630bbb..2144a56 100644 --- a/recipes-extended/libvirt/libvirt-python.inc +++ b/recipes-extended/libvirt/libvirt-python.inc @@ -13,7 +13,7 @@ PACKAGES += "${PN}-python-staticdev ${PN}-python-dev ${PN}-python-dbg ${PN}-pyth 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 += "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_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}" @@ -39,19 +39,17 @@ python __anonymous () { d.setVar('LIBVIRT_PYTHON_ENABLE', '0') } -do_compile_python() { +do_compile_append() { if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then cd ${WORKDIR}/libvirt-python-${PV} && \ ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build fi } -addtask do_compile_python before do_install after do_compile - -do_install_python() { + +do_install_append() { if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then cd ${WORKDIR}/${PN}-python-${PV} && \ ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install \ --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${LIBVIRT_INSTALL_ARGS} fi } -addtask do_install_python before do_populate_sysroot after do_install |