3 files changed, 19 insertions, 17 deletions

diff --git a/meta-perl/conf/include/non-repro-meta-perl.inc b/meta-perl/conf/include/non-repro-meta-perl.inc
deleted file mode 100755
index 9082691f67..0000000000
--- a/meta-perl/conf/include/non-repro-meta-perl.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-# List of known non-reproducible package of the meta-perl layer
-# Please keep this list sorted
-KNOWN_NON_REPRO_META_PERL = " \
-    libencode-perl-src \
-    libhtml-tree-perl \
-    libhtml-tree-perl-doc \
-    libmodule-build-tiny-perl \
-    po4a \
-    po4a-doc \
-"
diff --git a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
index 842f817f1f..e0c5707f4b 100644
--- a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
+++ b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc
@@ -8,7 +8,6 @@
 # ptests which take less than ~30s each
 PTESTS_FAST_META_PERL = "\
     libcapture-tiny-perl \
-    libcgi-perl \
     libcrypt-openssl-random-perl \
     libdigest-hmac-perl \
     liberror-perl \
@@ -16,7 +15,7 @@ PTESTS_FAST_META_PERL = "\
     libextutils-installpaths-perl \
     libhtml-tagset-perl \
     libmozilla-ca-perl \
-    libmodule-build-tiny-perl \
+    libnet-ldap-perl \
     libstrictures-perl \
     libterm-readkey-perl \
     libtest-nowarnings-perl \
@@ -27,20 +26,21 @@ PTESTS_SLOW_META_PERL = "\
     libio-socket-ssl-perl \
 "
 
-PTESTS_PROBLEMS_META_PERL ="\
+PTESTS_PROBLEMS_META_PERL = "\
     libauthen-sasl-perl \
+    libcgi-perl \
     libconfig-autoconf-perl \
     libcrypt-openssl-guess-perl \
     libcrypt-openssl-rsa-perl \
     libdata-hexdump-perl \
     libdbd-sqlite-perl \
     libdigest-sha1-perl \
-    libnet-dns-perl \
-    libnet-dns-sec-perl \
-    libnet-ldap-perl \
     libfile-slurper-perl \
     libhtml-parser-perl \
     libmime-types-perl \
+    libmodule-build-tiny-perl \
+    libnet-dns-perl \
+    libnet-dns-sec-perl \
     libnet-ssleay-perl \
     libsub-uplevel-perl \
     libtest-deep-perl \
@@ -48,5 +48,6 @@ PTESTS_PROBLEMS_META_PERL ="\
     libtest-warn-perl \
     libunicode-linebreak-perl \
     libunix-statgrab \
+    liburi-perl \
     libxml-libxml-perl \
 "
diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf
index fb1fe88453..7ae1a39fcd 100644
--- a/meta-perl/conf/layer.conf
+++ b/meta-perl/conf/layer.conf
@@ -15,4 +15,15 @@ LAYERVERSION_perl-layer = "1"
 
 LAYERDEPENDS_perl-layer = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_perl-layer = "styhead"
+LAYERSERIES_COMPAT_perl-layer = "walnascar whinlatter"
+
+# List of known non-reproducible package of the meta-perl layer
+# Please keep this list sorted
+OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \
+    libencode-perl-src \
+    libhtml-tree-perl \
+    libhtml-tree-perl-doc \
+    libmodule-build-tiny-perl \
+    po4a \
+    po4a-doc \
+"