[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH] cracklib: fix Python packaging
From:       ross.burton () intel ! com (Ross Burton)
Date:       2016-02-29 21:05:13
Message-ID: 1456779913-3776-1-git-send-email-ross.burton () intel ! com
[Download RAW message or body]

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>
---
 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"
-- 
2.7.0


[prev in list] [next in list] [prev in thread] [next in thread]