From 1de4086b38e3b6461a45847a655c3b4015b6da3d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 26 Apr 2025 13:56:20 +0200 Subject: [PATCH] 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 --- ...-detached_mounts_propagation-and-remove-sys-moun.patch | 8 ++++---- .../{xfstests_2024.03.03.bb => xfstests_2025.03.30.bb} | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta-filesystems/recipes-utils/xfstests/{xfstests_2024.03.03.bb => xfstests_2025.03.30.bb} (93%) 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_2025.03.30.bb similarity index 93% rename from meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb rename to meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb index 695d81c2b1..5a6affa078 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2025.03.30.bb @@ -2,11 +2,11 @@ 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 = "b59671d2b894040bd355ddbf1ff03285607de16f" +SRCREV_unionmount = "c6ab621ac19f2b96d34cd98f244e611750e2bb23" SRCREV_FORMAT = "default_unionmount" -SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \ +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 \ @@ -17,7 +17,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \ S = "${WORKDIR}/git" # brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue) -inherit autotools-brokensep useradd +inherit autotools-brokensep useradd pkgconfig DEPENDS += "xfsprogs acl" RDEPENDS:${PN} += "\