@@ -338,7 +338,8 @@
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-networking'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'e2tools-ptest xfsprogs-doc zfs zfs-dbg zfs-dev'"
+ "include conf/include/non-repro-meta-filesystems.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_FILESYSTEMS}'"
]
},
"step2" : {
@@ -359,7 +360,8 @@
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-networking'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'geary geary-dbg gegl-dev gimp gimp-dbg gnome-terminal-src grilo-src gtk-vnc-src ibus'"
+ "include conf/include/non-repro-meta-gnome.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_GNOME}'"
]
},
"step3" : {
@@ -390,8 +392,8 @@
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-multimedia'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'crossguid libcamera libcamera-dbg libcamera-src libgssdp-1.6-src libgupnp-1.6-src libsquish-staticdev'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'oscam oscam-dbg oscam-src rtmpdump-staticdev'"
+ "include conf/include/non-repro-meta-multimedia.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_MULTIMEDIA}'"
]
},
"step5" : {
@@ -409,14 +411,8 @@
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-networking'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'blueman blueman-dbg blueman-src civetweb-dev dhcp-relay-staticdev ettercap-src fetchmail fetchmail-dbg'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'freediameter freediameter-src freeradius htpdate-doc keepalived keepalived-dbg'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'kernel-module-mdio-netlink-6.6.17-yocto-standard libbearssl-staticdev libfko3 libfko-client libfko-daemon'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'libfko-dbg libmosquitto1 libowfat-staticdev libruli-staticdev libsamba-util0 mdio-netlink-dbg mosquitto'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'mosquitto-dbg ncftp ncftp-dbg ncftp-src ndisc6-dbg ndisc6-misc ndisc6-ndisc6 ndisc6-rdisc6 ndisc6-rdnssd'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'ndisc6-rltraceroute6 netsniff-ng-doc ntpsec-src openl2tp openl2tp-dbg ot-br-posix ot-br-posix-dbg'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'postfix-cfg proftpd proftpd-dbg proftpd-dev rdist rdist-dbg samba-dbg tayga tayga-dbg wolfssl wolfssl-dbg'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'znc znc-doc'"
+ "include conf/include/non-repro-meta-networking.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_NETWORKING}'"
]
},
"step6" : {
@@ -428,20 +424,8 @@
"extravars" : [
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'boinc-client-dev cjson-ptest cpuid-doc crash crash-dbg crash-src dhrystone dhrystone-dbg dhrystone-dev'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'dhrystone-src directfb directfb-dbg doxygen-src editorconfig-core-c-dev etcd-cpp-apiv3-dev fbgrab-doc'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'fluentbit-src fvwm-dbg fvwm-doc fvwm-extra gcab-src gosu gosu-dbg gosu-dev gosu-staticdev gphoto2'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'gphoto2-dbg hddtemp-locale-de hdf5 hdf5-dbg hdf5-src hdf5-staticdev hplip hplip-dbg jpnevulator-doc'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'jsonrpc-dev kpatch-build kpatch-doc ldns libbotan-3-bin libbotan-3-dbg libbotan-3-dev libck-doc'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'libdbus-cxx-dev libforms libiio-src libjcat-dbg libjcat-ptest libthrift-c-glib-zlib-src libvncserver-dev'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'libwebsockets-testapps libwmf libyui-ncurses-dbg libyui-ncurses-dev lmbench-staticdev log4cpp lprng'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'lprng-dbg lshw lshw-locale-fr mariadb-dbg mariadb-server mariadb-src mce-test mime-support-doc minifi-cpp'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'minifi-cpp-dbg minifi-cpp-src mozjs-115-src mpv mpv-dbg nana nbench-byte nbench-byte-dbg nbench-byte-src'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'nspr-staticdev openocd openocd-dbg pcp pcp-dev pcp-doc pcp-src perfetto perfetto-dbg php-phar pidgin'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'pidgin-dbg pim435-staticdev postgresql-server-dev qcbor-staticdev sharutils sharutils-dbg smemstat-doc'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'soci-dev thin-provisioning-tools-dev vulkan-cts vulkan-cts-dbg waylandpp-dev yasm-src zlog-staticdev'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'zsh zsh-dbg zsh-src'"
-
+ "include conf/include/non-repro-meta-oe.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_OE}'"
]
},
"step7" : {
@@ -457,7 +441,8 @@
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-perl'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'libencode-perl-src libhtml-tree-perl libhtml-tree-perl-doc libmodule-build-tiny-perl po4a po4a-doc'"
+ "include conf/include/non-repro-meta-perl.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_PERL}'"
]
},
"step8" : {
@@ -471,10 +456,8 @@
"EXCLUDE_FROM_WORLD:layer-openembedded-layer = '1'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'python3-frozenlist python3-frozenlist-dbg python3-kivy-src python3-pycocotools-src python3-pydantic-core'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'python3-pyproj python3-pyproj-dbg python3-pyproj-src python3-pyzmq python3-yarl python3-yarl-dbg'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'python3-pandas-dbg python3-pandas-src python3-pandas'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += 'python3-evdev-src python3-pynacl-dbg python3-pynacl-src python3-pynacl'"
+ "include conf/include/non-repro-meta-python.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_PYTHON}'"
]
},
"step9" : {
@@ -490,7 +473,8 @@
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-webserver'",
"USERADD_GID_TABLES:append = ' files/static-group-meta-oe'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-oe'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'netdata-dbg netdata php-phar'"
+ "include conf/include/non-repro-meta-webserver.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_WEBSERVER}'"
]
},
"step10" : {
@@ -517,7 +501,8 @@
"USERADD_GID_TABLES:append = ' files/static-group-meta-multimedia'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-multimedia'",
"USERADD_UID_TABLES:append = ' files/static-passwd-meta-gnome'",
- "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = 'catfish libsamba-util0 samba-dbg'"
+ "include conf/include/non-repro-meta-xfce.inc",
+ "OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES = '${KNOWN_NON_REPRO_META_XFCE}'"
]
}
},
For now, the known non-reproducible packages list is stored inside the autobuilder config.json file. This is not ideal. Let's move this list into each layers of meta-openembedded. Since commit [0], non-repro-meta-*.inc files contain KNOWN_NON_REPRO_META_* variables that contain list of known non-reproducible package, we can use this for OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES. [0]: https://git.openembedded.org/meta-openembedded/commit/?id=d3751ce994dcc70be3009cbf982983d051c6f6db Signed-off-by: Yoann Congal <yoann.congal@smile.fr> --- config.json | 51 ++++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 33 deletions(-)