diff options
Diffstat (limited to 'yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb')
| -rw-r--r-- | yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb index c0ffe3316..3bd3f9367 100644 --- a/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb +++ b/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb @@ -18,6 +18,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ SRC_URI[md5sum] = "376790a95c1fb645e59e6e9803c78582" SRC_URI[sha256sum] = "59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88be3fa33" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/" +UPSTREAM_CHECK_REGEX = "/cracklib/(?P<pver>(\d+[\.\-_]*)+)/" + inherit autotools gettext pythonnative python-dir do_install_append_class-target() { @@ -26,20 +29,19 @@ do_install_append_class-target() { do_install_append() { src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages" - rm -f $src_dir/*.pyo - rm -f $src_dir/test_cracklib.py - # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} - install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/ - mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR} - rm -fr ${D}${base_libdir}/${PYTHON_DIR} + rm -f $src_dir/test_cracklib.py* + + if [ "${base_libdir}" != "${libdir}" ] ; then + # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} + install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/ + mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR} + rm -fr ${D}${base_libdir}/${PYTHON_DIR} + fi } BBCLASSEXTEND = "native nativesdk" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py \ - ${PYTHON_SITEPACKAGES_DIR}/_cracklib.so \ - " -FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/_cracklib.so" -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a \ - ${PYTHON_SITEPACKAGES_DIR}/_cracklib.la \ - " +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py* \ + ${PYTHON_SITEPACKAGES_DIR}/_cracklib.*" + +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a" |
