From patchwork Sat Nov 4 07:48:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 33861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15FCFC4167B for ; Sat, 4 Nov 2023 07:48:23 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web11.5512.1699084093576871866 for ; Sat, 04 Nov 2023 00:48:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=Tv23Pgk0; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=r40BE10S; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 0101018b994dc109-1982360a-4470-453c-ae84-896edb7f1387-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1699084091; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=VUYmXegGEdpNlhIrOTKCIRlWUIMLUk7VnyFyhd1ccQM=; b=Tv23Pgk0y4ZFSosMDFPdGB4dFhzVDckBn+mI6qZOgOC6w3RNjIptyA8Vf2WbQ34S peen85DnHwmX8esJsVMDjbpzVsO0SNXEGAnAgYUkLYGKq3+UplFrySoXRvfeHpRr1JI nD3/sD2IORkWZrP8pLFAiTZN3sSGHPEheiygFZ54= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1699084091; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=VUYmXegGEdpNlhIrOTKCIRlWUIMLUk7VnyFyhd1ccQM=; b=r40BE10SFOXWppdjnye44qD89RNaqre/8UxhnBgjAdOzT2ohFnZuJo6+Nu8aw4ou 6/sBH4WUotrzZPZsyVK8HeXK532Z1TCl4G6Gb2vabXCfvnQWch8yjADOxEQTJnHWO4F r5Dn0N+ty75vckVihKfhcXUGSFwSsEgo7zuPI4Zk= MIME-Version: 1.0 From: auh@yoctoproject.org To: Forced@yoctoproject.org, maintainer@yoctoproject.org, for@yoctoproject.org, AUH@yoctoproject.org Cc: openembedded-devel@lists.openembedded.org Subject: [AUH] xfstests: upgrading to 2023.10.29 SUCCEEDED Message-ID: <0101018b994dc109-1982360a-4470-453c-ae84-896edb7f1387-000000@us-west-2.amazonses.com> Date: Sat, 4 Nov 2023 07:48:11 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.11.04-54.240.27.33 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 04 Nov 2023 07:48:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/106361 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *xfstests* to *2023.10.29* has Succeeded. Next steps: - apply the patch: git am 0001-xfstests-upgrade-2023.03.05-2023.10.29.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 99e3d2744d7e476c94f5296d7874a01413a2c972 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 4 Nov 2023 07:39:42 +0000 Subject: [PATCH] xfstests: upgrade 2023.03.05 -> 2023.10.29 --- .../0001-Add-a-return-type-to-aio_rw.patch | 28 --------------- ...for-FTW_ACTIONRETVAL-along-with-nftw.patch | 34 ------------------- ...unts_propagation-and-remove-sys-moun.patch | 31 +++++------------ ...s_2023.03.05.bb => xfstests_2023.10.29.bb} | 5 ++- 4 files changed, 10 insertions(+), 88 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 rename meta-filesystems/recipes-utils/xfstests/{xfstests_2023.03.05.bb => xfstests_2023.10.29.bb} (92%) 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 e0a04c907..000000000 --- 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 fd34989fd..000000000 --- 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 a594b73a1..856fd270f 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.10.29.bb similarity index 92% rename from meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb rename to meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb index cfb6e4fd8..79775fcb7 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb @@ -2,13 +2,12 @@ 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=master;name=xfstests \ +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://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"