diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-extended/libpwquality | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/libpwquality')
2 files changed, 93 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch new file mode 100644 index 000000000..d12492f02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch @@ -0,0 +1,48 @@ +From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 3 Aug 2015 13:43:14 +0800 +Subject: [PATCH] setup.py.in: add missing python include dir for cross + compiling + +Upstream-Status: inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + python/Makefile.am | 2 +- + python/setup.py.in | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index abc5cd3..e35ba71 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,4 +14,4 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} +diff --git a/python/setup.py.in b/python/setup.py.in +index 6457595..d3db0e5 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,6 +6,7 @@ + + from distutils.core import setup, Extension + from distutils.command.build_ext import build_ext as _build_ext ++import os + + class build_ext(_build_ext): + def genconstants(self, headerfile, outputfile): +@@ -23,7 +24,7 @@ class build_ext(_build_ext): + + pwqmodule = Extension('pwquality', + sources = ['pwquality.c'], +- include_dirs = ['../src'], ++ include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])], + library_dirs = ['../src/.libs'], + libraries = ['pwquality']) + +-- +1.9.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb new file mode 100644 index 000000000..2c96063f1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "Library for password quality checking and generating random passwords" +HOMEPAGE = "https://github.com/libpwquality/libpwquality" +SECTION = "devel/lib" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" + +SRCNAME = "libpwquality" +SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.bz2 \ + file://add-missing-python-include-dir-for-cross.patch \ +" + +SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" +SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +DEPENDS = "cracklib virtual/gettext python3" +RDEPENDS_python3-libpwquality = "${PN}" + +inherit autotools python3native gettext + +B = "${S}" + +export PYTHON_DIR +export BUILD_SYS +export HOST_SYS +export STAGING_LIBDIR +export STAGING_INCDIR + +EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ + --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ + --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \ + --libdir=${libdir} \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" + +PACKAGES += "python3-libpwquality python3-libpwquality-dbg" +FILES_${PN} += "${libdir}/security/pam_pwquality.so" +FILES_${PN}-dbg += "${libdir}/security/.debug" +FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" +FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la" +FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES_python3-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug" |