3 files changed, 60 insertions, 62 deletions

diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc
deleted file mode 100755
index 45eed5398e..0000000000
--- a/meta-networking/conf/include/non-repro-meta-networking.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-# List of known non-reproducible package of the meta-networking layer
-# Please keep this list sorted
-KNOWN_NON_REPRO_META_NETWORKING = " \
-    blueman \
-    blueman-dbg \
-    blueman-src \
-    civetweb-dev \
-    dhcp-relay-staticdev \
-    ettercap-src \
-    fetchmail \
-    fetchmail-dbg \
-    freediameter \
-    freediameter-src \
-    freeradius \
-    htpdate-doc \
-    keepalived \
-    keepalived-dbg \
-    libbearssl-staticdev \
-    libfko3 \
-    libfko-client \
-    libfko-daemon \
-    libfko-dbg \
-    libmosquitto1 \
-    libowfat-staticdev \
-    libruli-staticdev \
-    libsamba-util0 \
-    mosquitto \
-    mosquitto-dbg \
-    ncftp \
-    ncftp-dbg \
-    ncftp-src \
-    ndisc6-dbg \
-    ndisc6-misc \
-    ndisc6-ndisc6 \
-    ndisc6-rdisc6 \
-    ndisc6-rdnssd \
-    ndisc6-rltraceroute6 \
-    netsniff-ng-doc \
-    ntpsec-src \
-    openl2tp \
-    openl2tp-dbg \
-    ot-br-posix \
-    ot-br-posix-dbg \
-    postfix-cfg \
-    proftpd \
-    proftpd-dbg \
-    proftpd-dev \
-    rdist \
-    rdist-dbg \
-    samba-dbg \
-    tayga \
-    tayga-dbg \
-    wolfssl \
-    wolfssl-dbg \
-    znc \
-    znc-doc \
-"
diff --git a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc
index 7ec6f9063d..7f7519ff84 100644
--- a/meta-networking/conf/include/ptest-packagelists-meta-networking.inc
+++ b/meta-networking/conf/include/ptest-packagelists-meta-networking.inc
@@ -9,29 +9,43 @@
 PTESTS_FAST_META_NETWORKING = "\
     freediameter \
     geoip \
+    geoip-perl \
     libcoap \
     libldb \
     libnftnl \
     libtalloc \
     libtdb \
+    libtevent \
     lldpd \
     mbedtls \
     openhpi \
+    openl2tp \
     squid \
     tcpdump \
+    wolfssl \
 "
+PTESTS_FAST_META_NETWORKING:remove:libc-musl = "\
+    libtalloc \
+    libtevent \
+    libtdb \
+    openhpi \
+    "
 
 # firewalld currently hangs forever so disable it for now
 #    firewalld
 PTESTS_SLOW_META_NETWORKING = "\
-    net-snmp \
+    openvpn \
 "
 
 PTESTS_PROBLEMS_META_NETWORKING = "\
-    geoip-perl \
-    libtevent \
     lksctp-tools \
+    net-snmp \
     nftables \
-    openl2tp \
     python3-scapy \
 "
+PTESTS_PROBLEMS_META_NETWORKING:append:libc-musl = "\
+    libtalloc \
+    libtevent \
+    libtdb \
+    openhpi \
+    "
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index a9ba4abade..58126a575f 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1"
 
 LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer"
 
-LAYERSERIES_COMPAT_networking-layer = "styhead"
+LAYERSERIES_COMPAT_networking-layer = "walnascar whinlatter"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -27,3 +27,44 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 BBFILES_DYNAMIC += " \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
 "
+
+# List of known non-reproducible package of the meta-networking layer
+# Please keep this list sorted
+OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \
+    babeld \
+    babeld-dbg \
+    dhcp-relay-staticdev \
+    ettercap-src \
+    freediameter \
+    freeradius \
+    htpdate-doc \
+    libbearssl-staticdev \
+    libmosquitto1 \
+    libowfat-staticdev \
+    libruli-staticdev \
+    mosquitto \
+    ncftp \
+    ncp \
+    ncp-dbg \
+    ndisc6-dbg \
+    ndisc6-misc \
+    ndisc6-ndisc6 \
+    ndisc6-rdisc6 \
+    ndisc6-rdnssd \
+    ndisc6-rltraceroute6 \
+    netsniff-ng-doc \
+    ntopng \
+    ntopng-dbg \
+    ntpsec-src \
+    openl2tp \
+    opensaf \
+    phytool \
+    phytool-dbg \
+    postfix-cfg \
+    rp-pppoe \
+    traceroute \
+    traceroute-dbg \
+    udpcast-doc \
+    unbound-doc \
+    znc \
+"