mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
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 Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
09dd36bedf
commit
c1d5aa4610
|
|
@ -0,0 +1,28 @@
|
|||
From f172ea004d34b00aa7bd5baff9422b2ab80df6e7 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From dd43cbc7f50266cdc6210f2b920d7f648a83bdd6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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
|
||||
|
||||
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
|
||||
for the mount() API prototype. Until thats resolved lets not build this
|
||||
testcase
|
||||
|
||||
Upstream-Status: Inappropriate [Libc specific Workaround]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/Makefile | 2 +-
|
||||
src/vfs/utils.c | 1 -
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 665edcf9..7debcbbd 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -31,7 +31,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
|
||||
|
||||
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 <stdlib.h>
|
||||
#include <sys/eventfd.h>
|
||||
#include <sys/fsuid.h>
|
||||
-#include <sys/mount.h>
|
||||
#include <sys/prctl.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
|
@ -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 \
|
||||
Loading…
Reference in New Issue
Block a user