summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/parted
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:05:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:38 +0100
commitdc4ac7877c0ca71d2a89583c3f2f2836e7da6005 (patch)
tree3a6103bd56d8557d36a551219edd4c339859a5b3 /meta/recipes-extended/parted
parent3704331fc673c8686165f7ad7670c20a4104d8eb (diff)
downloadpoky-dc4ac7877c0ca71d2a89583c3f2f2836e7da6005.tar.gz
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>
Diffstat (limited to 'meta/recipes-extended/parted')
-rw-r--r--meta/recipes-extended/parted/files/check-vfat.patch51
-rw-r--r--meta/recipes-extended/parted/parted_3.5.bb (renamed from meta/recipes-extended/parted/parted_3.4.bb)4
2 files changed, 1 insertions, 54 deletions
diff --git a/meta/recipes-extended/parted/files/check-vfat.patch b/meta/recipes-extended/parted/files/check-vfat.patch
deleted file mode 100644
index fad50292d9..0000000000
--- a/meta/recipes-extended/parted/files/check-vfat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1Add checks for both mkfs.vfat and the vfat file system in the kernel before
2running tests.
3
4Upstream-Status: Submitted [https://alioth-lists.debian.net/pipermail/parted-devel/2021-August/005653.html]
5Signed-off-by: Ross Burton <ross.burton@arm.com>
6
7diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh
8index 4c6c75f..2cc7577 100644
9--- a/tests/t-lib-helpers.sh
10+++ b/tests/t-lib-helpers.sh
11@@ -418,3 +418,13 @@ require_64bit_()
12 ;;
13 esac
14 }
15+
16+# Check if the specified filesystem is either built into the kernel, or can be loaded
17+# as a module
18+# Usage: has_filesystem vfat
19+# Ruturns 0 if the filesystem is available, otherwise skips the test
20+require_filesystem_()
21+{
22+ grep -q $1 /proc/filesystems && return 0
23+ modprobe --quiet --dry-run $1 || skip_ "this test requires kernel support for $1"
24+}
25diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh
26index f1a13df..0f47b08 100755
27--- a/tests/t1100-busy-label.sh
28+++ b/tests/t1100-busy-label.sh
29@@ -19,6 +19,9 @@
30 . "${srcdir=.}/init.sh"; path_prepend_ ../parted
31 require_root_
32 require_scsi_debug_module_
33+require_fat_
34+require_filesystem_ vfat
35+
36 ss=$sector_size_
37
38 scsi_debug_setup_ sector_size=$ss dev_size_mb=90 > dev-name ||
39diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh
40index e35e6f0..c813848 100755
41--- a/tests/t1101-busy-partition.sh
42+++ b/tests/t1101-busy-partition.sh
43@@ -22,6 +22,8 @@ test "$VERBOSE" = yes && parted --version
44
45 require_root_
46 require_scsi_debug_module_
47+require_fat_
48+require_filesystem_ vfat
49
50 # create memory-backed device
51 scsi_debug_setup_ dev_size_mb=80 > dev-name ||
diff --git a/meta/recipes-extended/parted/parted_3.4.bb b/meta/recipes-extended/parted/parted_3.5.bb
index d83b002f82..ea2b68bbd8 100644
--- a/meta/recipes-extended/parted/parted_3.4.bb
+++ b/meta/recipes-extended/parted/parted_3.5.bb
@@ -9,11 +9,9 @@ DEPENDS = "ncurses util-linux virtual/libiconv"
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://run-ptest \ 11 file://run-ptest \
12 file://check-vfat.patch \
13 " 12 "
14 13
15SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80" 14SRC_URI[sha256sum] = "4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2"
16SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342"
17 15
18inherit autotools pkgconfig gettext texinfo ptest 16inherit autotools pkgconfig gettext texinfo ptest
19 17