diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-09-07 19:05:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-19 13:34:41 +0100 |
commit | 21efa90e3cee7ea920b0266a14e55fadda585b4a (patch) | |
tree | 957771c267f3d90ddf70959d4c02eeb2bca4fc50 /meta/recipes-extended | |
parent | e1bf75322769f438f20093d178e7722396aff032 (diff) | |
download | poky-21efa90e3cee7ea920b0266a14e55fadda585b4a.tar.gz |
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.
(From OE-Core rev: fafa6b8f4444da3c0fc911d3a11eef2cd6ed825c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/cracklib/cracklib_2.9.2.bb | 28 |
1 files 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 177ab27a2b..fceca5445e 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" | |||
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" | 7 | DEPENDS = "cracklib-native zlib python" |
8 | DEPENDS_class-native = "zlib-native" | 8 | RDEPEND_${PN}-python += "python" |
9 | 9 | ||
10 | EXTRA_OECONF = "--without-python --libdir=${base_libdir}" | 10 | PACKAGES += "${PN}-python" |
11 | |||
12 | EXTRA_OECONF = "--with-python --libdir=${base_libdir}" | ||
11 | 13 | ||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \ |
13 | file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ | 15 | file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ |
@@ -18,10 +20,28 @@ SRC_URI[sha256sum] = "c1c899291d443e99d1aecfbc879e4ac9c0cbc265574f47b487842da11e | |||
18 | 20 | ||
19 | PR = "r1" | 21 | PR = "r1" |
20 | 22 | ||
21 | inherit autotools gettext | 23 | inherit autotools gettext pythonnative python-dir |
22 | 24 | ||
23 | do_install_append_class-target() { | 25 | do_install_append_class-target() { |
24 | create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small | 26 | create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small |
25 | } | 27 | } |
26 | 28 | ||
29 | do_install_append() { | ||
30 | src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages" | ||
31 | rm -f $src_dir/*.pyo | ||
32 | rm -f $src_dir/test_cracklib.py | ||
33 | # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} | ||
34 | install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
35 | mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR} | ||
36 | rm -fr ${D}${base_libdir}/${PYTHON_DIR} | ||
37 | } | ||
38 | |||
27 | BBCLASSEXTEND = "native nativesdk" | 39 | BBCLASSEXTEND = "native nativesdk" |
40 | |||
41 | FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/cracklib.py \ | ||
42 | ${PYTHON_SITEPACKAGES_DIR}/_cracklib.so \ | ||
43 | " | ||
44 | FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/_cracklib.so" | ||
45 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_cracklib.a \ | ||
46 | ${PYTHON_SITEPACKAGES_DIR}/_cracklib.la \ | ||
47 | " | ||