merge of '79b90d4ef7df69035b001466908501f67f8aac76'

     and '81a14649e513b12b58d75276170ffa386580f244'

diff --git a/packages/pam/libpam_1.0.2.bb b/packages/pam/libpam_1.0.2.bb
index cf98944..0b7eada 100644 (file)
--- a/packages/pam/libpam_1.0.2.bb
+++ b/packages/pam/libpam_1.0.2.bb
@@ -10,6 +10,10 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 
+DEPENDS = "flex flex-native"
+
+PR = "r1"
+
 # The project is actually called Linux-PAM but that gives
 # a bad OE package name because of the upper case characters
 pn = "Linux-PAM"
@@ -24,12 +28,15 @@ inherit autotools
 LEAD_SONAME = "libpam.so.*"
 
 python populate_packages_prepend () {
-        pam_libdir    = bb.data.expand('${libdir}/security', d)
+       import os.path
+
+       pam_libdir    = bb.data.expand('${libdir}/security', d)
        pam_libdirdebug = bb.data.expand('${libdir}/security/.debug', d)
-        pam_filterdir = bb.data.expand('${libdir}/security/pam_filter', d)
+       pam_filterdir = bb.data.expand('${libdir}/security/pam_filter', d)
        do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
-        do_split_packages(d, pam_libdir, '^pam(.*)\.la$', 'pam-plugin%s-dev', 'PAM plugin for %s dev', extra_depends='')
-       do_split_packages(d, pam_libdirdebug, '^pam(.*)\.so$', 'pam-plugin%s-dbg', 'PAM plugin for %s debugging symbols', extra_depends='')
+       do_split_packages(d, pam_libdir, '^pam(.*)\.la$', 'pam-plugin%s-dev', 'PAM plugin for %s dev', extra_depends='')
+       if os.path.exists(pam_libdirdebug):
+               do_split_packages(d, pam_libdirdebug, '^pam(.*)\.so$', 'pam-plugin%s-dbg', 'PAM plugin for %s debugging symbols', extra_depends='')
        do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
 }