diff options
-rw-r--r-- | meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 25 |
1 files 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" | |||
4 | LICENSE = "LGPLv2.1+" | 4 | LICENSE = "LGPLv2.1+" |
5 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" | 5 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" |
6 | 6 | ||
7 | DEPENDS = "cracklib-native zlib python" | 7 | DEPENDS = "cracklib-native zlib" |
8 | RDEPEND_${PN}-python += "python" | ||
9 | 8 | ||
10 | PACKAGES += "${PN}-python" | 9 | EXTRA_OECONF = "--without-python --libdir=${base_libdir}" |
11 | |||
12 | EXTRA_OECONF = "--with-python --libdir=${base_libdir}" | ||
13 | 10 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ |
15 | file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ | 12 | file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ |
@@ -21,27 +18,11 @@ SRC_URI[sha256sum] = "59ab0138bc8cf90cccb8509b6969a024d5e58d2d02bcbdccbb9ba9b88b | |||
21 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/" | 18 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cracklib/files/cracklib/" |
22 | UPSTREAM_CHECK_REGEX = "/cracklib/(?P<pver>(\d+[\.\-_]*)+)/" | 19 | UPSTREAM_CHECK_REGEX = "/cracklib/(?P<pver>(\d+[\.\-_]*)+)/" |
23 | 20 | ||
24 | inherit autotools gettext pythonnative python-dir | 21 | inherit autotools gettext |
25 | 22 | ||
26 | do_install_append_class-target() { | 23 | do_install_append_class-target() { |
27 | create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small | 24 | create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small |
28 | } | 25 | } |
29 | 26 | ||
30 | do_install_append() { | ||
31 | src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages" | ||
32 | rm -f $src_dir/test_cracklib.py* | ||
33 | |||
34 | if [ "${base_libdir}" != "${libdir}" ] ; then | ||
35 | # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} | ||
36 | install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
37 | mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR} | ||
38 | rm -fr ${D}${base_libdir}/${PYTHON_DIR} | ||
39 | fi | ||
40 | } | ||
41 | |||
42 | BBCLASSEXTEND = "native nativesdk" | 27 | BBCLASSEXTEND = "native nativesdk" |
43 | 28 | ||
44 | FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py* \ | ||
45 | ${PYTHON_SITEPACKAGES_DIR}/_cracklib.*" | ||
46 | |||
47 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a" | ||