From 68a3a770b7ecd8b29fa08908d6cef86d90eb6111 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:05:16 +0200 Subject: [PATCH] parted: upgrade 3.4 -> 3.5 Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../parted/files/check-vfat.patch | 51 ------------------- .../parted/{parted_3.4.bb => parted_3.5.bb} | 4 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 meta/recipes-extended/parted/files/check-vfat.patch rename meta/recipes-extended/parted/{parted_3.4.bb => parted_3.5.bb} (92%) 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 fad50292d93..00000000000 --- a/meta/recipes-extended/parted/files/check-vfat.patch +++ /dev/null @@ -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 - -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 || diff --git a/meta/recipes-extended/parted/parted_3.4.bb b/meta/recipes-extended/parted/parted_3.5.bb similarity index 92% rename from meta/recipes-extended/parted/parted_3.4.bb rename to meta/recipes-extended/parted/parted_3.5.bb index d83b002f82e..ea2b68bbd81 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" 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 -- 2.47.2