[oe-commits] Robert Yang : cracklib: add python support back
git at git.openembedded.org
git at git.openembedded.org
Wed Apr 15 13:30:42 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 3438ee928ca6dd41653c37610786c67e8bea15b5
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3438ee928ca6dd41653c37610786c67e8bea15b5
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Sun Sep 7 19:05:52 2014 -0700
cracklib: add python support back
It had been disabled because of installed-vs-shipped:
WARNING: /usr/lib/python2.7
WARNING: /usr/lib/python2.7/site-packages
Now we fix it and add cracklib-python back.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
meta/recipes-extended/cracklib/cracklib_2.9.2.bb | 28 ++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.2.bb b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
index 177ab27..fceca54 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
@@ -4,10 +4,12 @@ HOMEPAGE = "http://sourceforge.net/projects/cracklib"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
-DEPENDS = "cracklib-native zlib"
-DEPENDS_class-native = "zlib-native"
+DEPENDS = "cracklib-native zlib python"
+RDEPEND_${PN}-python += "python"
-EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
+PACKAGES += "${PN}-python"
+
+EXTRA_OECONF = "--with-python --libdir=${base_libdir}"
SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \
file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \
@@ -18,10 +20,28 @@ SRC_URI[sha256sum] = "c1c899291d443e99d1aecfbc879e4ac9c0cbc265574f47b487842da11e
PR = "r1"
-inherit autotools gettext
+inherit autotools gettext pythonnative python-dir
do_install_append_class-target() {
create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small
}
+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}
+}
+
BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py \
+ ${PYTHON_SITEPACKAGES_DIR}/_cracklib.so \
+ "
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/_cracklib.so"
+FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a \
+ ${PYTHON_SITEPACKAGES_DIR}/_cracklib.la \
+ "
More information about the Openembedded-commits
mailing list