summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-12-01 21:41:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:49 +0000
commit11b952412f69868252b08a88673980386d43e135 (patch)
tree6a7942263bd590f048b3432374611c1c7f90fddf
parentd9f73ca6dfb7c81660ff140efe0b10027e775e07 (diff)
downloadpoky-11b952412f69868252b08a88673980386d43e135.tar.gz
poky-11b952412f69868252b08a88673980386d43e135.tar.bz2
poky-11b952412f69868252b08a88673980386d43e135.zip
cracklib: fix for base_libdir == libdir
Don't try and move the python packages from base_libdir to libdir if they are the same location. (From OE-Core rev: bb6a34a6c70206e46011e6d946f47a9acba7371d) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cracklib/cracklib_2.9.5.bb11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
index c0ffe33160..23f259c6a6 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
@@ -28,10 +28,13 @@ do_install_append() {
src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages"
rm -f $src_dir/*.pyo
rm -f $src_dir/test_cracklib.py
- # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir}
- install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/
- mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR}
- rm -fr ${D}${base_libdir}/${PYTHON_DIR}
+
+ if [ "${base_libdir}" != "${libdir}" ] ; then
+ # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir}
+ install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/
+ mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR}
+ rm -fr ${D}${base_libdir}/${PYTHON_DIR}
+ fi
}
BBCLASSEXTEND = "native nativesdk"