From 1de4086b38e3b6461a45847a655c3b4015b6da3d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 26 Apr 2025 13:56:20 +0200 Subject: xfstests: upgrade to 2025.03.30 to fix build with gcc-15 * switched to gnu11 in: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=77aab5c2bfc9135fde66c17286ca4be87b417f39 * add one more commit to unionmount-testsuite https://github.com/amir73il/unionmount-testsuite/commit/c6ab621ac19f2b96d34cd98f244e611750e2bb23 * fixes: http://errors.yoctoproject.org/Errors/Details/852985/ * add pkgconfig used since: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=1ba4f6f4bcd2aaef18e9549da89c3f0976f3fd01 to fix: http://errors.yoctoproject.org/Errors/Details/852995/ configure:15434: error: possibly undefined macro: AC_DEFINE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure:15435: error: possibly undefined macro: AC_DEFINE_UNQUOTED Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- ...ed_mounts_propagation-and-remove-sys-moun.patch | 8 +-- .../recipes-utils/xfstests/xfstests_2024.03.03.bb | 78 ---------------------- .../recipes-utils/xfstests/xfstests_2025.03.30.bb | 78 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb create mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb 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 e823297343..9fdf69ff46 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,4 +1,4 @@ -From 79c4715a46b80653eb98b61731c094c85e969220 Mon Sep 17 00:00:00 2001 +From 340e708f79b824816aacfa74e330d8acdafc5129 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Aug 2022 13:33:05 -0700 Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from @@ -17,15 +17,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index e7442487..970f087a 100644 +index 6ac72b36..5472ba66 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -33,7 +33,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ +@@ -34,7 +34,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 \ - detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \ + ext4_resize t_readdir_3 splice2pipe \ - uuid_ioctl t_snapshot_deleted_subvolume + uuid_ioctl t_snapshot_deleted_subvolume fiemap-fault min_dio_alignment EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb deleted file mode 100644 index 695d81c2b1..0000000000 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "File system QA test suite" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" - -SRCREV = "088e5bd4cb6d7295612430a56ae84ff5c8f54730" -SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" -SRCREV_FORMAT = "default_unionmount" - -SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \ - git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ - file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ - file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ - file://0001-include-libgen.h-for-basename-API-prototype.patch \ - file://0002-Add-missing-STATX_ATTR_-defines-from-musl-sys-stat.h.patch \ - " - -S = "${WORKDIR}/git" - -# brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue) -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 \ - gawk \ - util-linux-mkfs \ - util-linux-mount \ - util-linux-findmnt \ - inetutils-hostname \ - grep \ -" - -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" - -do_configure:prepend() { - # this is done by Makefile configure target, but we don't call it in do_configure - cp -a ${S}/include/install-sh . -} - -do_install() { - # otherwise install-sh duplicates DESTDIR prefix - export DIST_ROOT="/" DIST_MANIFEST="" DESTDIR="${D}" - oe_runmake install - - unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite - install -d $unionmount_target_dir/tests - install ${UNPACKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests - install ${UNPACKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir - install ${UNPACKDIR}/unionmount-testsuite/run -t $unionmount_target_dir - install ${UNPACKDIR}/unionmount-testsuite/README -t $unionmount_target_dir -} - -FILES:${PN} += "${prefix}/xfstests" - -# This one is reproducible only on 32bit MACHINEs -# http://errors.yoctoproject.org/Errors/Details/766963/ -# lstat64.c:65:14: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] -# bstat.c:18:19: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] -CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb new file mode 100644 index 0000000000..5a6affa078 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb @@ -0,0 +1,78 @@ +SUMMARY = "File system QA test suite" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" + +SRCREV = "b59671d2b894040bd355ddbf1ff03285607de16f" +SRCREV_unionmount = "c6ab621ac19f2b96d34cd98f244e611750e2bb23" +SRCREV_FORMAT = "default_unionmount" + +SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master;tag=v${PV} \ + git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ + file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ + file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ + file://0001-include-libgen.h-for-basename-API-prototype.patch \ + file://0002-Add-missing-STATX_ATTR_-defines-from-musl-sys-stat.h.patch \ + " + +S = "${WORKDIR}/git" + +# brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue) +inherit autotools-brokensep useradd pkgconfig + +DEPENDS += "xfsprogs acl" +RDEPENDS:${PN} += "\ + bash \ + bc \ + coreutils \ + e2fsprogs \ + e2fsprogs-tune2fs \ + e2fsprogs-resize2fs \ + libaio \ + libcap-bin \ + overlayfs-tools \ + perl \ + python3 \ + python3-core \ + xfsprogs \ + acl \ + gawk \ + util-linux-mkfs \ + util-linux-mount \ + util-linux-findmnt \ + inetutils-hostname \ + grep \ +" + +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" + +do_configure:prepend() { + # this is done by Makefile configure target, but we don't call it in do_configure + cp -a ${S}/include/install-sh . +} + +do_install() { + # otherwise install-sh duplicates DESTDIR prefix + export DIST_ROOT="/" DIST_MANIFEST="" DESTDIR="${D}" + oe_runmake install + + unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite + install -d $unionmount_target_dir/tests + install ${UNPACKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests + install ${UNPACKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/run -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/README -t $unionmount_target_dir +} + +FILES:${PN} += "${prefix}/xfstests" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766963/ +# lstat64.c:65:14: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] +# bstat.c:18:19: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" -- cgit v1.2.3-54-g00ecf