From 2af7d3f63efda0014f29e0b0456e2e3f4506677e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 4 Nov 2023 14:00:22 -0700 Subject: xfstests: upgrade 2023.03.05 -> 2023.10.29 Signed-off-by: Khem Raj --- .../0001-Add-a-return-type-to-aio_rw.patch | 28 ---------- ...heck-for-FTW_ACTIONRETVAL-along-with-nftw.patch | 34 ----------- ...ed_mounts_propagation-and-remove-sys-moun.patch | 31 +++-------- .../recipes-utils/xfstests/xfstests_2023.03.05.bb | 65 ---------------------- .../recipes-utils/xfstests/xfstests_2023.10.29.bb | 64 +++++++++++++++++++++ 5 files changed, 72 insertions(+), 150 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0001-Add-a-return-type-to-aio_rw.patch delete mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch delete mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb create mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb (limited to 'meta-filesystems') diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-Add-a-return-type-to-aio_rw.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-Add-a-return-type-to-aio_rw.patch deleted file mode 100644 index e0a04c9073..0000000000 --- a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-Add-a-return-type-to-aio_rw.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f172ea004d34b00aa7bd5baff9422b2ab80df6e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 14 Aug 2022 13:32:10 -0700 -Subject: [PATCH 1/2] Add a return type to aio_rw - -Compilers complain about the function prototype otherwise - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - ltp/fsx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ltp/fsx.c b/ltp/fsx.c -index 12c2cc33..55b4e9b6 100644 ---- a/ltp/fsx.c -+++ b/ltp/fsx.c -@@ -2429,6 +2429,7 @@ out_error: - return -1; - } - #else -+int - aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) - { - fprintf(stderr, "io_rw: need AIO support!\n"); --- -2.37.2 - diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch deleted file mode 100644 index fd34989fdf..0000000000 --- a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2a4fed8331f996421e65db446559991a854e2ad3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 24 Mar 2023 18:23:01 -0700 -Subject: [PATCH] m4: Check for FTW_ACTIONRETVAL along with nftw - -FTW_ACTIONRETVAL is glibc specific extention which is used to implement -xfsfind but it may not be available on other C library implementations on Linux -e.g. musl. Therefore ensure that these defines are available before declaring -nftw() to be usable - -Upstream-Status: Submitted [https://lore.kernel.org/fstests/20230325012858.587801-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj -Cc: Darrick J. Wong -Cc: Zorro Lang ---- - m4/package_libcdev.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 -index b41c087b..7f731044 100644 ---- a/m4/package_libcdev.m4 -+++ b/m4/package_libcdev.m4 -@@ -132,7 +132,7 @@ AC_DEFUN([AC_HAVE_NFTW], - #include - #include - ]], [[ -- nftw("/", (int (*)(const char *, const struct stat *, int, struct FTW *))1, 0, 0); -+ nftw("/", (int (*)(const char *, const struct stat *, int, struct FTW *))1, 0, FTW_ACTIONRETVAL); - ]])],[have_nftw=yes - AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]) - AC_SUBST(have_nftw) --- -2.40.0 - diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch index a594b73a12..856fd270f5 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch +++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch @@ -1,8 +1,8 @@ -From dd43cbc7f50266cdc6210f2b920d7f648a83bdd6 Mon Sep 17 00:00:00 2001 +From 559f685f83d12d11bf9ec6c6ce924ee4d0702a2a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Aug 2022 13:33:05 -0700 -Subject: [PATCH 2/2] Drop detached_mounts_propagation and remove sys/mount.h - from vfs/utils.c +Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from + vfs/utils.c with glibc 2.36+ sys/mount.h conflicts with linux/mount.h and here linux/mount.h is included via xfs/xfs.h header and we need sys/mount.h @@ -12,16 +12,16 @@ testcase Upstream-Status: Inappropriate [Libc specific Workaround] Signed-off-by: Khem Raj + --- - src/Makefile | 2 +- - src/vfs/utils.c | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 665edcf9..7debcbbd 100644 +index 2815f919..448fccc9 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -31,7 +31,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ +@@ -32,7 +32,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ @@ -30,18 +30,3 @@ index 665edcf9..7debcbbd 100644 uuid_ioctl EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ -diff --git a/src/vfs/utils.c b/src/vfs/utils.c -index 1388edda..aacd6c0a 100644 ---- a/src/vfs/utils.c -+++ b/src/vfs/utils.c -@@ -10,7 +10,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.37.2 - diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb deleted file mode 100644 index cfb6e4fd82..0000000000 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "File system QA test suite" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" - -SRCREV_FORMAT = "xfstests_unionmount" - -SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;name=xfstests \ - git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ - file://0001-Add-a-return-type-to-aio_rw.patch \ - file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ - file://0001-m4-Check-for-FTW_ACTIONRETVAL-along-with-nftw.patch \ - " - -SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" -SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep useradd - -DEPENDS += "xfsprogs acl" -RDEPENDS:${PN} += "\ - bash \ - bc \ - coreutils \ - e2fsprogs \ - e2fsprogs-tune2fs \ - e2fsprogs-resize2fs \ - libaio \ - libcap-bin \ - overlayfs-tools \ - perl \ - python3 \ - python3-core \ - xfsprogs \ - acl \ -" - -USERADD_PACKAGES = "${PN}" -# these users are necessary to run the tests -USERADD_PARAM:${PN} = "-U -m fsgqa; -N 123456-fsgqa; -N fsgqa2" - -EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" - -TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE" -# install-sh script in the project is outdated -# we use the one from the latest libtool to solve installation issues -# It looks like the upstream is not interested in having it fixed :( -# https://www.spinics.net/lists/fstests/msg16981.html -do_configure:prepend() { - cp ${STAGING_DIR_NATIVE}${datadir}/libtool/build-aux/install-sh ${B} -} - -do_install:append() { - unionmount_target_dir=${D}/usr/xfstests/unionmount-testsuite - install -d ${D}/usr/xfstests/unionmount-testsuite/tests - install -D ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests - install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir - install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir - install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir -} - -FILES:${PN} += "\ - /usr/xfstests \ -" diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb new file mode 100644 index 0000000000..79775fcb78 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb @@ -0,0 +1,64 @@ +SUMMARY = "File system QA test suite" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" + +SRCREV = "11914614784735c504f43b5b6baabaa713375984" +SRCREV_FORMAT = "xfstests_unionmount" + +SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next;name=xfstests \ + git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ + file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ + " + +SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" +SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep useradd + +DEPENDS += "xfsprogs acl" +RDEPENDS:${PN} += "\ + bash \ + bc \ + coreutils \ + e2fsprogs \ + e2fsprogs-tune2fs \ + e2fsprogs-resize2fs \ + libaio \ + libcap-bin \ + overlayfs-tools \ + perl \ + python3 \ + python3-core \ + xfsprogs \ + acl \ +" + +USERADD_PACKAGES = "${PN}" +# these users are necessary to run the tests +USERADD_PARAM:${PN} = "-U -m fsgqa; -N 123456-fsgqa; -N fsgqa2" + +EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" + +TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE" +# install-sh script in the project is outdated +# we use the one from the latest libtool to solve installation issues +# It looks like the upstream is not interested in having it fixed :( +# https://www.spinics.net/lists/fstests/msg16981.html +do_configure:prepend() { + cp ${STAGING_DIR_NATIVE}${datadir}/libtool/build-aux/install-sh ${B} +} + +do_install:append() { + unionmount_target_dir=${D}/usr/xfstests/unionmount-testsuite + install -d ${D}/usr/xfstests/unionmount-testsuite/tests + install -D ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests + install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir + install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir + install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir +} + +FILES:${PN} += "\ + /usr/xfstests \ +" -- cgit v1.2.3-54-g00ecf