[PATCH 1/2] libpam: Fix runtime providers

[PATCH 1/2] libpam: Fix runtime providers

[Otavio Salvador]

The runtime providers were commented out. Removing the comment brings
up a issue with the native renaming which has been workarounded
disabling the runtime recommendation. This is indeed a workaround so a
FIXME comment has been added to remind about it in case we someday
move to native prefix.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index d7033d0..f08b4af 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -81,7 +81,10 @@ RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
     pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \
     pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \
     coreutils bash"
-#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
+
+# FIXME: Native suffix breaks here, disable it for now
+RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
+RRECOMMENDS_${PN}_class-native = ""
 
 python populate_packages_prepend () {
     def pam_plugin_append_file(pn, dir, file):
-- 
1.7.10.4

[PATCH 2/2] libpam: Fix multilib packaging

[Otavio Salvador]

The plugin runtime dependencies were not including the multilib
prefix, fix it.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index f08b4af..183480d 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -73,13 +73,18 @@ RPROVIDES_${PN} += "${PN}-${libpam_suffix}"
 RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
 
 RDEPENDS_${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} \
+    ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \
     "
 RDEPENDS_${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} \
+    ${MLPREFIX}pam-plugin-access-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \
+    ${MLPREFIX}pam-plugin-time-${libpam_suffix} \
     coreutils bash"
 
 # FIXME: Native suffix breaks here, disable it for now
@@ -113,13 +118,15 @@ python populate_packages_prepend () {
             provides = pkg + "-" + libpam_suffix
         d.setVar('RPROVIDES_' + pkg, provides)
 
+    mlprefix = d.getVar('MLPREFIX', True) or ''
     dvar = bb.data.expand('${WORKDIR}/package', d, True)
     pam_libdir = d.expand('${base_libdir}/security')
     pam_sbindir = d.expand('${sbindir}')
     pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
+    pam_pkgname = mlprefix + 'pam-plugin%s'
 
-    do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='')
-    mlprefix = d.getVar('MLPREFIX', True) or ''
+    do_split_packages(d, pam_libdir, '^pam(.*)\.so$', pam_pkgname,
+                      'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='')
     pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_chkpwd')
     pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir, 'unix_update')
     pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir, 'pam_tally')
-- 
1.7.10.4

Re: [PATCH 1/2] libpam: Fix runtime providers

[Robert Yang]

Hello,

I've sent a patch to fix the warning like:

WARNING: QA Issue: lib32-pam-plugin-access rdepends on 
lib32-lib32-libpam-suffix, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: lib32-pam-plugin-cracklib rdepends on 
lib32-lib32-libpam-suffix, but it isn't a build dependency? [build-deps]

WARNING: QA Issue: nativesdk-pam-plugin-access rdepends on 
nativesdk-nativesdk-libpam-suffix, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: nativesdk-pam-plugin-cracklib rdepends on 
nativesdk-nativesdk-libpam-suffix, but it isn't a build dependency? [build-deps]


And the patch:
http://lists.openembedded.org/pipermail/openembedded-core/2014-August/096594.html

// Robert

On 08/29/2014 07:33 AM, Otavio Salvador wrote:
> The runtime providers were commented out. Removing the comment brings
> up a issue with the native renaming which has been workarounded
> disabling the runtime recommendation. This is indeed a workaround so a
> FIXME comment has been added to remind about it in case we someday
> move to native prefix.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   meta/recipes-extended/pam/libpam_1.1.6.bb |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
> index d7033d0..f08b4af 100644
> --- a/meta/recipes-extended/pam/libpam_1.1.6.bb
> +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
> @@ -81,7 +81,10 @@ RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
>       pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \
>       pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \
>       coreutils bash"
> -#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
> +
> +# FIXME: Native suffix breaks here, disable it for now
> +RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
> +RRECOMMENDS_${PN}_class-native = ""
>
>   python populate_packages_prepend () {
>       def pam_plugin_append_file(pn, dir, file):
>

Re: [PATCH 1/2] libpam: Fix runtime providers

[Otavio Salvador]

On Sat, Aug 30, 2014 at 7:16 AM, Robert Yang <liezhi.yang@windriver.com> wrote:
> I've sent a patch to fix the warning like:
>
> WARNING: QA Issue: lib32-pam-plugin-access rdepends on
> lib32-lib32-libpam-suffix, but it isn't a build dependency? [build-deps]
> WARNING: QA Issue: lib32-pam-plugin-cracklib rdepends on
> lib32-lib32-libpam-suffix, but it isn't a build dependency? [build-deps]
>
> WARNING: QA Issue: nativesdk-pam-plugin-access rdepends on
> nativesdk-nativesdk-libpam-suffix, but it isn't a build dependency?
> [build-deps]
> WARNING: QA Issue: nativesdk-pam-plugin-cracklib rdepends on
> nativesdk-nativesdk-libpam-suffix, but it isn't a build dependency?
> [build-deps]

Great; it applies fine on top of my previous patch.

Tested-by: Otavio Salvador <otavio@ossystems.com.br>

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[PATCH 1/2] libpam: Fix runtime providers

[Otavio Salvador]

The runtime providers were commented out. Removing the comment brings
up a issue with the native renaming which has been workarounded
disabling the runtime recommendation. This is indeed a workaround so a
FIXME comment has been added to remind about it in case we someday
move to native prefix.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index c06709f..0bf416b 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -74,7 +74,10 @@ RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
 
 RDEPENDS_${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}"
 RDEPENDS_${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"
-#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
+
+# FIXME: Native suffix breaks here, disable it for now
+RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
+RRECOMMENDS_${PN}_class-native = ""
 
 python populate_packages_prepend () {
     def pam_plugin_append_file(pn, dir, file):
-- 
1.7.10.4