From: Ross Burton <ross.burton@intel.com>
Date: Mon, 29 Feb 2016 21:05:13 +0000 (+0000)
Subject: cracklib: fix Python packaging
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26717
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f24eb53979c18bdfc7b0806055de86e812d78e63;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
index 8c9063e07cb..3bd3f93674e 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"