summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-09-10 22:48:46 +0800
committerKhem Raj <raj.khem@gmail.com>2018-09-10 08:53:52 -0700
commit99c7136fbd315644855f60581ec1f9505484ecd6 (patch)
treede7078c2b9e3e6a95895d4304fd4927789e872c1
parent131eb1f69791dda54557d0f919903cbd73831440 (diff)
downloadmeta-openembedded-99c7136fbd315644855f60581ec1f9505484ecd6.tar.gz
libpwquality: clean up python3-libpwquality
Since `8d3d529 libpwquality: Inherit distutils3-base' applied, sub package python3-libpwquality was merged into package libpwquality. So clean up obsolete python3-libpwquality definition. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
index 7e82bd61a..9fb25cdc7 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
@@ -16,8 +16,7 @@ UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases"
16 16
17S = "${WORKDIR}/${SRCNAME}-${PV}" 17S = "${WORKDIR}/${SRCNAME}-${PV}"
18 18
19DEPENDS = "cracklib virtual/gettext python3" 19DEPENDS = "cracklib virtual/gettext"
20RDEPENDS_python3-libpwquality = "${PN}"
21 20
22inherit autotools distutils3-base gettext 21inherit autotools distutils3-base gettext
23 22
@@ -26,8 +25,6 @@ B = "${S}"
26export PYTHON_DIR 25export PYTHON_DIR
27export BUILD_SYS 26export BUILD_SYS
28export HOST_SYS 27export HOST_SYS
29export STAGING_LIBDIR
30export STAGING_INCDIR
31 28
32EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ 29EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \
33 --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ 30 --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \
@@ -38,10 +35,7 @@ EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \
38PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 35PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
39PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" 36PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
40 37
41PACKAGES += "python3-libpwquality python3-libpwquality-dbg"
42FILES_${PN} += "${libdir}/security/pam_pwquality.so" 38FILES_${PN} += "${libdir}/security/pam_pwquality.so"
43FILES_${PN}-dbg += "${libdir}/security/.debug" 39FILES_${PN}-dbg += "${libdir}/security/.debug"
44FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" 40FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a"
45FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la" 41FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la"
46FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*"
47FILES_python3-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug"