summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-08-11 17:21:44 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:52 +0100
commitf9f818351a58ce2b640c2e304d57e7026c050b5e (patch)
tree226dbc9893838578aa803b121778ee73adb814e4
parent52dbe717f0122578adb89801715eb9cdf21bd3cd (diff)
downloadpoky-f9f818351a58ce2b640c2e304d57e7026c050b5e.tar.gz
libpam: Allow use during build and in SDK
The recipe had libpam hardcoded in some places which were causing failures as the metadata renaming hooks does not change those, generating a broken dependencies list. This patch fixes those and add the native and nativesdk support. (From OE-Core rev: df3038768f59f7a0c814974ff674d4e59cbdfca4) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.6.bb19
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index 3190aaf0d1..c06709f512 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -61,7 +61,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libd
61FILES_${PN}-runtime = "${sysconfdir}" 61FILES_${PN}-runtime = "${sysconfdir}"
62FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" 62FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests"
63 63
64PACKAGES_DYNAMIC += "^pam-plugin-.*" 64PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*"
65 65
66def get_multilib_bit(d): 66def get_multilib_bit(d):
67 baselib = d.getVar('baselib', True) or '' 67 baselib = d.getVar('baselib', True) or ''
@@ -69,12 +69,12 @@ def get_multilib_bit(d):
69 69
70libpam_suffix = "suffix${@get_multilib_bit(d)}" 70libpam_suffix = "suffix${@get_multilib_bit(d)}"
71 71
72RPROVIDES_${PN} += "libpam-${libpam_suffix}" 72RPROVIDES_${PN} += "${PN}-${libpam_suffix}"
73RPROVIDES_${PN}-runtime += "libpam-runtime-${libpam_suffix}" 73RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
74 74
75RDEPENDS_${PN}-runtime = "libpam-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}" 75RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}"
76RDEPENDS_${PN}-xtests = "libpam-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils" 76RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils"
77RRECOMMENDS_${PN} = "libpam-runtime-${libpam_suffix}" 77#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
78 78
79python populate_packages_prepend () { 79python populate_packages_prepend () {
80 def pam_plugin_append_file(pn, dir, file): 80 def pam_plugin_append_file(pn, dir, file):
@@ -85,14 +85,15 @@ python populate_packages_prepend () {
85 d.setVar('FILES_' + pn, nf) 85 d.setVar('FILES_' + pn, nf)
86 86
87 def pam_plugin_hook(file, pkg, pattern, format, basename): 87 def pam_plugin_hook(file, pkg, pattern, format, basename):
88 pn = d.getVar('PN', True)
88 libpam_suffix = d.getVar('libpam_suffix', True) 89 libpam_suffix = d.getVar('libpam_suffix', True)
89 mlprefix = d.getVar('MLPREFIX', True) or '' 90 mlprefix = d.getVar('MLPREFIX', True) or ''
90 91
91 rdeps = d.getVar('RDEPENDS_' + pkg, True) 92 rdeps = d.getVar('RDEPENDS_' + pkg, True)
92 if rdeps: 93 if rdeps:
93 rdeps = rdeps + " " + mlprefix + "libpam-" + libpam_suffix 94 rdeps = rdeps + " " + mlprefix + pn + "-" + libpam_suffix
94 else: 95 else:
95 rdeps = mlprefix + "libpam-" + libpam_suffix 96 rdeps = mlprefix + pn + "-" + libpam_suffix
96 d.setVar('RDEPENDS_' + pkg, rdeps) 97 d.setVar('RDEPENDS_' + pkg, rdeps)
97 98
98 provides = d.getVar('RPROVIDES_' + pkg, True) 99 provides = d.getVar('RPROVIDES_' + pkg, True)
@@ -142,3 +143,5 @@ python do_pam_sanity () {
142 bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") 143 bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly")
143} 144}
144addtask pam_sanity before do_configure 145addtask pam_sanity before do_configure
146
147BBCLASSEXTEND = "nativesdk native"