[oe-commits] [openembedded-core] 28/32: cracklib: fix Python packaging

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit f24eb53979c18bdfc7b0806055de86e812d78e63
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Feb 29 21:05:13 2016 +0000

    cracklib: fix Python packaging
    
    Don't assume that we know precisely what Python files were installed as patching
    automake can change what optimised forms get installed by matching *.py* in
    FILES and not deleting *.pyo explictly.
    
    Similarly, remove all forms of test_cracklib from the packages.
    
    The python .la file is mostly redundant but if we're shipping it, put it in
    -python where it belongs instead of -staticdev.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
index 8c9063e..3bd3f93 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
@@ -29,8 +29,7 @@ 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
+	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}
@@ -42,9 +41,7 @@ do_install_append() {
 
 BBCLASSEXTEND = "native nativesdk"
 
-FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py \
-	${PYTHON_SITEPACKAGES_DIR}/_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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.