cpan-base: Add more debug paths to FILES

We seem to be mostly installing modules into vendor_perl nowadays.
Make sure that the .debug data from there is captured appropriately.

Also, expand ${PERLLIBDIRS} at the point of assignment so we don't
call the python again and again.

[RP: Fixup to whitespace]
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 660c15f549cde84cae9519091de021547ec2c5cd..c109c0fe83b294c1cb5774f0302f572a0f595980 100644 (file)
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -39,8 +39,13 @@ def is_target(d):
         return "yes"
     return "no"
 
-PERLLIBDIRS = "${@perl_get_libdirs(d)}"
+PERLLIBDIRS := "${@perl_get_libdirs(d)}"
+PERLVERSION := "${@get_perl_version(d)}"
 
 FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
                     ${PERLLIBDIRS}/auto/*/*/.debug \
-                    ${PERLLIBDIRS}/auto/*/*/*/.debug"
+                    ${PERLLIBDIRS}/auto/*/*/*/.debug \
+                    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \
+                    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \
+                    ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \
+                    "