sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: f24eb53979c18bdfc7b0806055de86e812d78e63)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2016-02-29 21:05:13 +00:00 committed by Richard Purdie
parent a005d25185
commit d6e63beb72
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-extended/cracklib/cracklib_2.9.5.bb
View File

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