[OE-core] [PATCH] cracklib: fix for base_libdir == libdir
Joshua Lock
joshua.lock at collabora.co.uk
Tue Dec 1 21:41:00 UTC 2015
Don't try and move the python packages from base_libdir to libdir
if they are the same location.
Signed-off-by: Joshua Lock <joshua.lock at collabora.co.uk>
---
meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 11 +++++++----
1 file 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 c0ffe33..23f259c 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"
--
2.4.3
More information about the Openembedded-core
mailing list