From be4e792f694bf44d23aefc32a81f7be9823e29db Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 9 May 2016 17:17:13 +0300 Subject: cracklib: disable building the python module It's tricky to convert to Python 3 and isn't required by anything in oe-core or meta-oe. (From OE-Core rev: a5aa15188b0c43432251039adc82c6c5cc453b2e) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 25 +++--------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb index 3bd3f93674..c185d23efd 100644 --- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb +++ b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb @@ -4,12 +4,9 @@ HOMEPAGE = "http://sourceforge.net/projects/cracklib" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -DEPENDS = "cracklib-native zlib python" -RDEPEND_${PN}-python += "python" +DEPENDS = "cracklib-native zlib" -PACKAGES += "${PN}-python" - -EXTRA_OECONF = "--with-python --libdir=${base_libdir}" +EXTRA_OECONF = "--without-python --libdir=${base_libdir}" SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ @@ -21,27 +18,11 @@ SRC_URI[sha256sum] = "59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88b UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/" UPSTREAM_CHECK_REGEX = "/cracklib/(?P(\d+[\.\-_]*)+)/" -inherit autotools gettext pythonnative python-dir +inherit autotools gettext 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/test_cracklib.py* - - 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" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py* \ - ${PYTHON_SITEPACKAGES_DIR}/_cracklib.*" - -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a" -- cgit 1.2.3-korg