diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-12-14 11:34:36 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-16 13:05:42 +0000 |
commit | 83cad97561cb950577d36542c874b91ba0c94417 (patch) | |
tree | 653828903c0ef79ff682239342ee2851552c2ef9 | |
parent | 6ce61b435705d5e145bc6110f38f76a8a4697d2e (diff) | |
download | poky-83cad97561cb950577d36542c874b91ba0c94417.tar.gz |
util-linux: Delete md-raid tests
These tests are marked as known failures upstream as well [1]
if we delete them then we can drop dependency on mdadm for ptests which
can further reduce the dependency chain for ptest enabled minimal images
[1] https://github.com/util-linux/util-linux/commit/7519c3edab120b14623931d5ddb16fdc6e7cad5d
(From OE-Core rev: 4f3b4b4f27924f9093dc6b4dd949cabe5cd2891b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.39.2.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.39.2.bb b/meta/recipes-core/util-linux/util-linux_2.39.2.bb index 927037a342..8c08167401 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.2.bb | |||
@@ -137,7 +137,7 @@ RDEPENDS:${PN}-dev += " util-linux-libuuid-dev" | |||
137 | RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" | 137 | RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" |
138 | 138 | ||
139 | RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" | 139 | RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" |
140 | RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" | 140 | RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod procps sed socat which xz" |
141 | RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop kernel-module-algif-hash" | 141 | RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop kernel-module-algif-hash" |
142 | RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" | 142 | RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" |
143 | ALLOW_EMPTY:${PN}-swaponoff = "1" | 143 | ALLOW_EMPTY:${PN}-swaponoff = "1" |
@@ -320,6 +320,12 @@ do_install_ptest() { | |||
320 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then | 320 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then |
321 | rm -rf ${D}${PTEST_PATH}/tests/ts/chfn | 321 | rm -rf ${D}${PTEST_PATH}/tests/ts/chfn |
322 | fi | 322 | fi |
323 | # remove raid tests, known failures and avoid dependency on mdadm therefore | ||
324 | # See https://github.com/util-linux/util-linux/commit/7519c3edab120b14623931d5ddb16fdc6e7cad5d | ||
325 | rm -rf ${D}${PTEST_PATH}/tests/ts/blkid/md-raid0-whole | ||
326 | rm -rf ${D}${PTEST_PATH}/tests/ts/blkid/md-raid1-part | ||
327 | rm -rf ${D}${PTEST_PATH}/tests/ts/blkid/md-raid1-whole | ||
328 | rm -rf ${D}${PTEST_PATH}/tests/ts/fdisk/align-512-4K-md | ||
323 | } | 329 | } |
324 | 330 | ||
325 | # Delete tests not working on musl | 331 | # Delete tests not working on musl |