| Message ID | 20231107071240.1519631-12-pkj@axis.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,01/16] jack: Revert to 1.9.22 | expand |
this seems to fail a QA check ERROR: xfstests-2023.10.29-r0 do_package_qa: QA Issue: /usr/xfstests/src/soak_duration.awk contained in package xfstests requires /usr/bin/awk, but no providers found in RDEPENDS:xfstests? [file-rdeps] ERROR: xfstests-2023.10.29-r0 do_package_qa: Fatal QA errors were found, failing task. On Mon, Nov 6, 2023 at 11:13 PM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote: > > The "update" in commit 2af7d3f63e added a SRCREV rather than updating > SRCREV_xfstests. Change the recipe to actually use SRCREV so that it is > compatible with future AUH updates. > > Also replace "/usr" with "${prefix}". > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > > I wonder if this recipe really should have been updated to 2023.10.29, > since that tag is on the "for-next" branch, which I assume means it is > not released yet. But I cannot find a way to make devtool upgrade only > look for revisions that are available from a specific branch. > > ...itly-use-int-for-return-type-for-aio.patch | 30 ------------------- > .../xfstests/xfstests_2023.10.29.bb | 17 +++++------ > 2 files changed, 7 insertions(+), 40 deletions(-) > delete mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch > > diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch > deleted file mode 100644 > index 5e9e9d9a7..000000000 > --- a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 0927d0def968ea7e19905c7e39182f65961c11cf Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Sun, 5 Nov 2023 01:17:52 -0700 > -Subject: [PATCH] ltp/fsx.h: Explicitly use int for return type for aio_rw() > - > -Fixes build with clang-17+ > -error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] > - > -Upstream-Status: Submitted [https://marc.info/?l=fstests&m=169917222008646&w=2] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - ltp/fsx.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/ltp/fsx.c b/ltp/fsx.c > -index ee4b8fe4..c0aec23f 100644 > ---- a/ltp/fsx.c > -+++ b/ltp/fsx.c > -@@ -2581,7 +2581,7 @@ out_error: > - return -1; > - } > - #else > --aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) > -+int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) > - { > - fprintf(stderr, "io_rw: need AIO support!\n"); > - exit(111); > --- > -2.42.1 > - > diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb > index 4e8e31840..be7c2d473 100644 > --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb > +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb > @@ -3,18 +3,15 @@ LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" > > SRCREV = "11914614784735c504f43b5b6baabaa713375984" > -SRCREV_FORMAT = "xfstests_unionmount" > +SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" > +SRCREV_FORMAT = "default_unionmount" > > -SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next;name=xfstests \ > +SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next \ > git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ > - file://0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch \ > file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ > file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ > " > > -SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" > -SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" > - > S = "${WORKDIR}/git" > > inherit autotools-brokensep useradd > @@ -53,14 +50,14 @@ do_configure:prepend() { > } > > do_install:append() { > - unionmount_target_dir=${D}/usr/xfstests/unionmount-testsuite > - install -d ${D}/usr/xfstests/unionmount-testsuite/tests > - install -D ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests > + unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite > + install -d $unionmount_target_dir/tests > + install ${WORKDIR}/unionmount-testsuite/tests/* $unionmount_target_dir/tests > install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir > install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir > install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir > } > > FILES:${PN} += "\ > - /usr/xfstests \ > + ${prefix}/xfstests \ > " > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#106427): https://lists.openembedded.org/g/openembedded-devel/message/106427 > Mute This Topic: https://lists.openembedded.org/mt/102438671/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch deleted file mode 100644 index 5e9e9d9a7..000000000 --- a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0927d0def968ea7e19905c7e39182f65961c11cf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 5 Nov 2023 01:17:52 -0700 -Subject: [PATCH] ltp/fsx.h: Explicitly use int for return type for aio_rw() - -Fixes build with clang-17+ -error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] - -Upstream-Status: Submitted [https://marc.info/?l=fstests&m=169917222008646&w=2] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ltp/fsx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ltp/fsx.c b/ltp/fsx.c -index ee4b8fe4..c0aec23f 100644 ---- a/ltp/fsx.c -+++ b/ltp/fsx.c -@@ -2581,7 +2581,7 @@ out_error: - return -1; - } - #else --aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) -+int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) - { - fprintf(stderr, "io_rw: need AIO support!\n"); - exit(111); --- -2.42.1 - diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb index 4e8e31840..be7c2d473 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb @@ -3,18 +3,15 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" SRCREV = "11914614784735c504f43b5b6baabaa713375984" -SRCREV_FORMAT = "xfstests_unionmount" +SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" +SRCREV_FORMAT = "default_unionmount" -SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next;name=xfstests \ +SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next \ git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ - file://0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch \ file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ " -SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" -SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" - S = "${WORKDIR}/git" inherit autotools-brokensep useradd @@ -53,14 +50,14 @@ do_configure:prepend() { } do_install:append() { - unionmount_target_dir=${D}/usr/xfstests/unionmount-testsuite - install -d ${D}/usr/xfstests/unionmount-testsuite/tests - install -D ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests + unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite + install -d $unionmount_target_dir/tests + install ${WORKDIR}/unionmount-testsuite/tests/* $unionmount_target_dir/tests install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir } FILES:${PN} += "\ - /usr/xfstests \ + ${prefix}/xfstests \ "
The "update" in commit 2af7d3f63e added a SRCREV rather than updating SRCREV_xfstests. Change the recipe to actually use SRCREV so that it is compatible with future AUH updates. Also replace "/usr" with "${prefix}". Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- I wonder if this recipe really should have been updated to 2023.10.29, since that tag is on the "for-next" branch, which I assume means it is not released yet. But I cannot find a way to make devtool upgrade only look for revisions that are available from a specific branch. ...itly-use-int-for-return-type-for-aio.patch | 30 ------------------- .../xfstests/xfstests_2023.10.29.bb | 17 +++++------ 2 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch