diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:04:47 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:37 +0100 |
commit | 63fb37b1ac28e7a9c05631c7ddab3423ba9db9e4 (patch) | |
tree | b6e0e21d54748409f40713effd5cffad2bac7002 /meta/recipes-core | |
parent | f6a029b9de728ef18afdccabd6025fca857a79d9 (diff) | |
download | poky-63fb37b1ac28e7a9c05631c7ddab3423ba9db9e4.tar.gz |
util-linux: upgrade 2.37.4 -> 2.38
(From OE-Core rev: 929af31db89bb5540b56d953dee2950833390407)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-libuuid_2.38.bb (renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.37.4.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/run-ptest | 3 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.38.bb (renamed from meta/recipes-core/util-linux/util-linux_2.37.4.bb) | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.4.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.38.bb index 5d759aed94..5d759aed94 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.4.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.38.bb | |||
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 982ec669a2..c9bddfb7a6 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -37,4 +37,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin | |||
37 | file://avoid_parallel_tests.patch \ | 37 | file://avoid_parallel_tests.patch \ |
38 | " | 38 | " |
39 | 39 | ||
40 | SRC_URI[sha256sum] = "634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83" | 40 | SRC_URI[sha256sum] = "6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64" |
diff --git a/meta/recipes-core/util-linux/util-linux/run-ptest b/meta/recipes-core/util-linux/util-linux/run-ptest index 3a910be121..097107cd09 100644 --- a/meta/recipes-core/util-linux/util-linux/run-ptest +++ b/meta/recipes-core/util-linux/util-linux/run-ptest | |||
@@ -13,6 +13,9 @@ current_path=$(readlink -f $0) | |||
13 | export bindir=$(dirname $current_path) | 13 | export bindir=$(dirname $current_path) |
14 | export PATH=$bindir/bin:$PATH | 14 | export PATH=$bindir/bin:$PATH |
15 | 15 | ||
16 | # losetup tests will be skipped and/or fail otherwise | ||
17 | modprobe loop | ||
18 | |||
16 | ./tests/run.sh --use-system-commands --parsable --show-diff | sed -u '{ | 19 | ./tests/run.sh --use-system-commands --parsable --show-diff | sed -u '{ |
17 | s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ | 20 | s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ |
18 | s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ | 21 | s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ |
diff --git a/meta/recipes-core/util-linux/util-linux_2.37.4.bb b/meta/recipes-core/util-linux/util-linux_2.38.bb index b39020884f..8a7b47a0c6 100644 --- a/meta/recipes-core/util-linux/util-linux_2.37.4.bb +++ b/meta/recipes-core/util-linux/util-linux_2.38.bb | |||
@@ -138,7 +138,7 @@ 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 mdadm procps sed socat which xz" |
141 | RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" | 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" |
144 | 144 | ||