parted: upgrade 3.4 -> 3.5

(From OE-Core rev: 68a3a770b7ecd8b29fa08908d6cef86d90eb6111)

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>
This commit is contained in:
Alexander Kanavin
2022-05-05 07:05:16 +02:00
committed by Richard Purdie
parent 3704331fc6
commit dc4ac7877c
2 changed files with 1 additions and 54 deletions

View File

@@ -1,51 +0,0 @@
Add checks for both mkfs.vfat and the vfat file system in the kernel before
running tests.
Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2021-August/005653.html]
Signed-off-by: Ross Burton <ross.burton@arm.com>
diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh
index 4c6c75f..2cc7577 100644
--- a/tests/t-lib-helpers.sh
+++ b/tests/t-lib-helpers.sh
@@ -418,3 +418,13 @@ require_64bit_()
;;
esac
}
+
+# Check if the specified filesystem is either built into the kernel, or can be loaded
+# as a module
+# Usage: has_filesystem vfat
+# Ruturns 0 if the filesystem is available, otherwise skips the test
+require_filesystem_()
+{
+ grep -q $1 /proc/filesystems && return 0
+ modprobe --quiet --dry-run $1 || skip_ "this test requires kernel support for $1"
+}
diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh
index f1a13df..0f47b08 100755
--- a/tests/t1100-busy-label.sh
+++ b/tests/t1100-busy-label.sh
@@ -19,6 +19,9 @@
. "${srcdir=.}/init.sh"; path_prepend_ ../parted
require_root_
require_scsi_debug_module_
+require_fat_
+require_filesystem_ vfat
+
ss=$sector_size_
scsi_debug_setup_ sector_size=$ss dev_size_mb=90 > dev-name ||
diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh
index e35e6f0..c813848 100755
--- a/tests/t1101-busy-partition.sh
+++ b/tests/t1101-busy-partition.sh
@@ -22,6 +22,8 @@ test "$VERBOSE" = yes && parted --version
require_root_
require_scsi_debug_module_
+require_fat_
+require_filesystem_ vfat
# create memory-backed device
scsi_debug_setup_ dev_size_mb=80 > dev-name ||

View File

@@ -9,11 +9,9 @@ DEPENDS = "ncurses util-linux virtual/libiconv"
SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
file://fix-doc-mandir.patch \
file://run-ptest \
file://check-vfat.patch \
"
SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80"
SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342"
SRC_URI[sha256sum] = "4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2"
inherit autotools pkgconfig gettext texinfo ptest