Skip to contentSkip to conversation

xfstests: Upgrade to 2022.07.31 release

PATCH New Khem Raj 1 participant 1 message Aug 14, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 xfstests: Upgrade to 2022.07.31 release

Rename recipe to reflect version number
Add patches to build with glibc 2.36 Disable one test namely detached_mounts_propagation

---
 .../0001-Add-a-return-type-to-aio_rw.patch    | 28 +++++++++++
 ...unts_propagation-and-remove-sys-moun.patch | 47 +++++++++++++++++++
 ...xfstests_git.bb => xfstests_2022.07.31.bb} |  5 +-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0001-Add-a-return-type-to-aio_rw.patch
 create mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch
 rename meta-filesystems/recipes-utils/xfstests/{xfstests_git.bb => xfstests_2022.07.31.bb} (90%)
meta-filesystems/recipes-utils/xfstests/xfstests/0001-Add-a-return-type-to-aio_rw.patch new file +28 -0
new file mode 100644
index 0000000000..e0a04c9073
@@ -0,0 +1,28 @@
+From f172ea004d34b00aa7bd5baff9422b2ab80df6e7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch new file +47 -0

47 lines not on this page · raw message

meta-filesystems/recipes-utils/xfstests/xfstests_2022.07.31.bb renamed from meta-filesystems/recipes-utils/xfstests/xfstests_git.bb +4 -1
similarity index 90%
rename from meta-filesystems/recipes-utils/xfstests/xfstests_git.bb
rename to meta-filesystems/recipes-utils/xfstests/xfstests_2022.07.31.bb
index a6fc89d606..647b6fcd73 100644
@@ -7,9 +7,11 @@ 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 \
 "
 
-SRCREV_xfstests = "47ed066309716c73a97fff9b7f557f72d90bffb4"
+SRCREV_xfstests = "b91889d79e1d92e22860504e40108a2e4d054c33"
 SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914"
 
 S = "${WORKDIR}/git"
@@ -24,6 +26,7 @@ RDEPENDS:${PN} += "\
     e2fsprogs \
     e2fsprogs-tune2fs \
     e2fsprogs-resize2fs \
+    libaio \
     libcap-bin \
     overlayfs-progs \
     perl \
Signature · 1 line
2.37.2