perl: fix issues with debug packages, from Poky

diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index 4cddcdb..4f607e1 100644 (file)
--- a/packages/perl/perl.inc
+++ b/packages/perl/perl.inc
@@ -65,7 +65,7 @@ PACKAGES_DYNAMIC = "perl-module-*"
 python populate_packages_prepend () {
        libdir = bb.data.expand('${libdir}/perl5/${PV}', d)
        archlibdir =  bb.data.expand('${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}', d)
-       do_split_packages(d, archlibdir, 'auto/(.*)/', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True)
+       do_split_packages(d, archlibdir, 'auto/(.*)(?!\.debug)/', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True)
        do_split_packages(d, archlibdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True)
        do_split_packages(d, libdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True)
 }
@@ -76,3 +76,8 @@ FILES_${PN}-lib = "/usr/lib/libperl.so*"
 FILES_${PN}-dev = "/usr/lib/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/"
 FILES_${PN}-pod = "/usr/lib/perl5/${PV}/pod"
 FILES_perl-misc = "/usr/bin/*"
+FILES_${PN}-dbg += " \
+        ${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/auto/*/.debug \
+        ${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/auto/*/*/.debug \
+        ${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/auto/*/*/*/.debug"
+

diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb
index 35ff774..7509f1b 100644 (file)
--- a/packages/perl/perl_5.8.4.bb
+++ b/packages/perl/perl_5.8.4.bb
@@ -1,3 +1,3 @@
 require perl.inc
 
-PR = "r4"
+PR = "r5"

diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 05e1f1c..7c8cbaa 100644 (file)
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -21,7 +21,7 @@ SRC_URI_append_sh3 += "file://makefile-usegcc-to-link.patch;patch=1"
 
 PARALLEL_MAKE = ""
 
-PR = "r20"
+PR = "r21"
 
 do_configure() {
        ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl