From dc4ac7877c0ca71d2a89583c3f2f2836e7da6005 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:05:16 +0200 Subject: parted: upgrade 3.4 -> 3.5 (From OE-Core rev: 68a3a770b7ecd8b29fa08908d6cef86d90eb6111) Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../recipes-extended/parted/files/check-vfat.patch | 51 ------------------ meta/recipes-extended/parted/parted_3.4.bb | 62 ---------------------- meta/recipes-extended/parted/parted_3.5.bb | 60 +++++++++++++++++++++ 3 files changed, 60 insertions(+), 113 deletions(-) delete mode 100644 meta/recipes-extended/parted/files/check-vfat.patch delete mode 100644 meta/recipes-extended/parted/parted_3.4.bb create mode 100644 meta/recipes-extended/parted/parted_3.5.bb 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 @@ -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.4.bb deleted file mode 100644 index d83b002f82..0000000000 --- a/meta/recipes-extended/parted/parted_3.4.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Disk partition editing/resizing utility" -HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" -DESCRIPTION = "GNU Parted manipulates partition tables. This is useful for creating space for new operating systems, reorganizing disk usage, copying data on hard disks and disk imaging." -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" -SECTION = "console/tools" -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" - -inherit autotools pkgconfig gettext texinfo ptest - -PACKAGECONFIG ?= "readline" -PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" - -BBCLASSEXTEND = "native nativesdk" - -do_compile_ptest() { - oe_runmake -C tests print-align print-max dup-clobber duplicate fs-resize print-flags -} - -do_install_ptest() { - t=${D}${PTEST_PATH} - mkdir $t/build-aux - cp ${S}/build-aux/test-driver $t/build-aux/ - cp -r ${S}/tests $t - cp ${B}/tests/Makefile $t/tests/ - mkdir $t/lib - cp ${B}/lib/config.h $t/lib - sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile - sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile - sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile - sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile - sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile - sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile - for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ - do cp ${B}/tests/.libs/$i $t/tests/; \ - done - sed -e 's| ../parted||' -i $t/tests/*.sh -} - -RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" -RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" -RDEPENDS:${PN}-ptest:append:libc-glibc = "\ - glibc-utils \ - locale-base-en-us \ - " - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "partprobe" -ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe" diff --git a/meta/recipes-extended/parted/parted_3.5.bb b/meta/recipes-extended/parted/parted_3.5.bb new file mode 100644 index 0000000000..ea2b68bbd8 --- /dev/null +++ b/meta/recipes-extended/parted/parted_3.5.bb @@ -0,0 +1,60 @@ +SUMMARY = "Disk partition editing/resizing utility" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +DESCRIPTION = "GNU Parted manipulates partition tables. This is useful for creating space for new operating systems, reorganizing disk usage, copying data on hard disks and disk imaging." +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" +SECTION = "console/tools" +DEPENDS = "ncurses util-linux virtual/libiconv" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ + file://fix-doc-mandir.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2" + +inherit autotools pkgconfig gettext texinfo ptest + +PACKAGECONFIG ?= "readline" +PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" + +BBCLASSEXTEND = "native nativesdk" + +do_compile_ptest() { + oe_runmake -C tests print-align print-max dup-clobber duplicate fs-resize print-flags +} + +do_install_ptest() { + t=${D}${PTEST_PATH} + mkdir $t/build-aux + cp ${S}/build-aux/test-driver $t/build-aux/ + cp -r ${S}/tests $t + cp ${B}/tests/Makefile $t/tests/ + mkdir $t/lib + cp ${B}/lib/config.h $t/lib + sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile + sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile + sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile + sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile + sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile + sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile + for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ + do cp ${B}/tests/.libs/$i $t/tests/; \ + done + sed -e 's| ../parted||' -i $t/tests/*.sh +} + +RDEPENDS:${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" +RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ + glibc-utils \ + locale-base-en-us \ + " + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "partprobe" +ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe" -- cgit v1.2.3-54-g00ecf