summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-29 21:05:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:45 +0000
commitd6e63beb725296f8ae1bc5aca2b0e4e9b8874180 (patch)
tree981e58b5128f04fe9015070eafeedef0cd27239b /meta
parenta005d251857b05e37f81abb19cbe02e860eaea24 (diff)
downloadpoky-d6e63beb725296f8ae1bc5aca2b0e4e9b8874180.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cracklib/cracklib_2.9.5.bb13
1 files 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 8c9063e07c..3bd3f93674 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() {
29 29
30do_install_append() { 30do_install_append() {
31 src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages" 31 src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages"
32 rm -f $src_dir/*.pyo 32 rm -f $src_dir/test_cracklib.py*
33 rm -f $src_dir/test_cracklib.py
34 33
35 if [ "${base_libdir}" != "${libdir}" ] ; then 34 if [ "${base_libdir}" != "${libdir}" ] ; then
36 # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} 35 # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir}
@@ -42,9 +41,7 @@ do_install_append() {
42 41
43BBCLASSEXTEND = "native nativesdk" 42BBCLASSEXTEND = "native nativesdk"
44 43
45FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py \ 44FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py* \
46 ${PYTHON_SITEPACKAGES_DIR}/_cracklib.so \ 45 ${PYTHON_SITEPACKAGES_DIR}/_cracklib.*"
47 " 46
48FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a \ 47FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a"
49 ${PYTHON_SITEPACKAGES_DIR}/_cracklib.la \
50 "