We have added checking for unused patches in our repo checking tool. Remove two patch files that it found.
Signed-off-by: Ryan Eatmon <[email protected]> --- .../0001-galUtil-Fix-compile-error.patch | 182 ----------------- ...6ead3d6ef504c82551b12306e751d23ddb45.patch | 193 ------------------ 2 files changed, 375 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-galUtil-Fix-compile-error.patch delete mode 100644 meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/2d066ead3d6ef504c82551b12306e751d23ddb45.patch diff --git a/meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-galUtil-Fix-compile-error.patch b/meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-galUtil-Fix-compile-error.patch deleted file mode 100644 index 6f94771f..00000000 --- a/meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-galUtil-Fix-compile-error.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 01cda63954dd7eb5468550f44c666eedc2706741 Mon Sep 17 00:00:00 2001 -From: Ryan Eatmon <[email protected]> -Date: Wed, 12 Mar 2025 10:37:01 -0500 -Subject: [PATCH] galUtil: Fix compile error - -Fix several compile errors realted to incompatible pointers. The fourth -argument is defined as void *. - -galUtil.c: In function 'GalLoadDIBitmap': -galUtil.c:137:65: error: passing argument 4 of 'gcoOS_Open' from incompatible pointer type [-Wincompatible-pointer-types] - 137 | if (gcmIS_ERROR(gcoOS_Open(gcvNULL, filename, gcvFILE_READ, &fp))) - | ^~~ - | | - | FILE ** - -Upstream-Status: Inactive-Upstream [lastcommit: 2017-01-16] - -Signed-off-by: Ryan Eatmon <[email protected]> ---- - .../hal/common/UnitTest/galUtil/galUtil.c | 30 +++++++++---------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/tests/src/test/hal/common/UnitTest/galUtil/galUtil.c b/tests/src/test/hal/common/UnitTest/galUtil/galUtil.c -index c2aefa6..f235f3a 100755 ---- a/tests/src/test/hal/common/UnitTest/galUtil/galUtil.c -+++ b/tests/src/test/hal/common/UnitTest/galUtil/galUtil.c -@@ -134,7 +134,7 @@ unsigned char * CDECL GalLoadDIBitmap(const char *filename, BMPINFO **info) - BMPFILEHEADER header; /* File header */ - - /* Try opening the file; use "rb" mode to read this *binary* file. */ -- if (gcmIS_ERROR(gcoOS_Open(gcvNULL, filename, gcvFILE_READ, &fp))) -+ if (gcmIS_ERROR(gcoOS_Open(gcvNULL, filename, gcvFILE_READ, (void*) &fp))) - { - /* Failed to open the file. */ - GalOutput(GalOutputType_Error, "*ERROR* Failed to open the file %s", filename); -@@ -335,7 +335,7 @@ int static GalSaveDIBitmap(const char *filename, BMPINFO *info, unsigned char *b - return -1; - } - -- if (gcmIS_ERROR(gcoOS_Open(gcvNULL, filename, gcvFILE_CREATE, &fp))) -+ if (gcmIS_ERROR(gcoOS_Open(gcvNULL, filename, gcvFILE_CREATE, (void*) &fp))) - { - /* Failed to open the file. */ - GalOutput(GalOutputType_Error, "*ERROR* Failed to open the file %s", filename); -@@ -1927,7 +1927,7 @@ gctBOOL GalSaveSurfaceToVimg(gcoSURF surface, const char *FileName) - head.imageStride = aStride = alignedWidth * bpp[0]; - lineSize = width[0] * bpp[0]; - -- if (gcmIS_ERROR(gcoOS_Open(gcvNULL, FileName, gcvFILE_CREATE, &file))) -+ if (gcmIS_ERROR(gcoOS_Open(gcvNULL, FileName, gcvFILE_CREATE, (void*) &file))) - { - /* Failed to open the file. */ - GalOutput(GalOutputType_Error, "*ERROR* Failed to open the file %s", FileName); -@@ -2070,7 +2070,7 @@ gceSTATUS GalSaveTSurfToVimg( - gcmONERROR(gcvSTATUS_NOT_SUPPORTED); - } - -- gcmONERROR(gcoOS_Open(NULL, Filename, gcvFILE_CREATE, &file)); -+ gcmONERROR(gcoOS_Open(NULL, Filename, gcvFILE_CREATE, (void*) &file)); - - gcmONERROR(gcoOS_Write( - gcvNULL, -@@ -2808,7 +2808,7 @@ gceSTATUS CDECL GalLoadYUV2Surface2( - gceSURF_FORMAT format; - gctBOOL swap = gcvFALSE; - -- gcmONERROR(gcoOS_Open(Os, filename, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(Os, filename, gcvFILE_READ, (void*) &file)); - - head.Width = read_dword(file); - head.Height = read_dword(file); -@@ -3444,7 +3444,7 @@ gceSTATUS GalCreateTSurfWithPool( - alignedBase = 256; - } - -- gcmONERROR(gcoOS_Allocate(gcvNULL, sizeof(T2D_SURF), &surf)); -+ gcmONERROR(gcoOS_Allocate(gcvNULL, sizeof(T2D_SURF), (void*) &surf)); - memset(surf, 0, sizeof(T2D_SURF)); - - if (TileStatusConfig == gcv2D_TSC_2D_COMPRESSED || -@@ -3869,7 +3869,7 @@ gceSTATUS GalLoadVimgToTSurfWithPool( - gctUINT n; - gctUINT32 vsupertile = ~0u; - -- gcmONERROR(gcoOS_Open(NULL, Filename, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, Filename, gcvFILE_READ, (void*) &file)); - - gcmONERROR(gcoOS_Read( - NULL, -@@ -4092,7 +4092,7 @@ gceSTATUS CDECL GalLoadVimgToSurface( - gceSURF_FORMAT format; - gctBOOL swap = gcvFALSE; - -- gcmONERROR(gcoOS_Open(NULL, filename, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, filename, gcvFILE_READ, (void*) &file)); - - gcmONERROR(gcoOS_Read( - NULL, -@@ -4446,7 +4446,7 @@ gceSTATUS CDECL GalLoadVimgToSurfaceWithPool( - gceSURF_FORMAT format; - gctBOOL swap = gcvFALSE; - -- gcmONERROR(gcoOS_Open(NULL, filename, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, filename, gcvFILE_READ, (void*) &file)); - - gcmONERROR(gcoOS_Read( - NULL, -@@ -4800,7 +4800,7 @@ gceSTATUS CDECL GalLoadRawToSurface( - gcoSURF surf; - gctBOOL swap = gcvFALSE; - -- gcmONERROR(gcoOS_Open(NULL, filename, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, filename, gcvFILE_READ, (void*) &file)); - - /* Check the type. */ - switch (format) -@@ -5441,7 +5441,7 @@ gceSTATUS CDECL GalCreateMonoStream( - GalMonoStream *stream = gcvNULL; - - do { -- gcmERR_BREAK(gcoOS_Allocate(Os, sizeof(GalMonoStream), &stream)); -+ gcmERR_BREAK(gcoOS_Allocate(Os, sizeof(GalMonoStream), (void*) &stream)); - - memset(stream, 0, sizeof(GalMonoStream)); - -@@ -6196,7 +6196,7 @@ gceSTATUS CDECL GalLoadDECTPCRawToTSurfWithPool( - ImageWidth, ImageHeight, - Pool, &surf)); - -- gcmONERROR(gcoOS_Open(NULL, DataName0, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, DataName0, gcvFILE_READ, (void*) &file)); - - aStride = surf->aWidth * bpp[0]; - lineSize = width[0] * bpp[0]; -@@ -6247,7 +6247,7 @@ gceSTATUS CDECL GalLoadDECTPCRawToTSurfWithPool( - gcmONERROR(gcoOS_Close(gcvNULL, file)); - } - -- gcmONERROR(gcoOS_Open(NULL, DataName1, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, DataName1, gcvFILE_READ, (void*) &file)); - } - - /* Copy data */ -@@ -6304,7 +6304,7 @@ gceSTATUS CDECL GalLoadDECTPCRawToTSurfWithPool( - gcmONERROR(gcoOS_Close(gcvNULL, file)); - } - -- gcmONERROR(gcoOS_Open(NULL, DataName2, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, DataName2, gcvFILE_READ, (void*) &file)); - } - - /* Copy data */ -@@ -6348,7 +6348,7 @@ gceSTATUS CDECL GalLoadDECTPCRawToTSurfWithPool( - /* Tile status buffer */ - if (TableName0 != gcvNULL && surf->tileStatuslogical != gcvNULL) - { -- gcmONERROR(gcoOS_Open(NULL, TableName0, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, TableName0, gcvFILE_READ, (void*) &file)); - - /* Copy tile status data */ - for (n = 0; n < height[0]; n++) -@@ -6391,7 +6391,7 @@ gceSTATUS CDECL GalLoadDECTPCRawToTSurfWithPool( - gctUINT aStride1 = (surf->aWidth/2) * bpp[1]; - gctUINT lineSize1 = width[1] * bpp[1]; - -- gcmONERROR(gcoOS_Open(NULL, TableName1, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, TableName1, gcvFILE_READ, (void*) &file)); - - /* Copy tile status data */ - for (n = 0; n < height[1]; n++) -@@ -6443,7 +6443,7 @@ gceSTATUS CDECL GalLoadDECTPCRawToTSurfWithPool( - aStride2 = (surf->aWidth/2) * bpp[2]; - lineSize2 = width[2] * bpp[2]; - -- gcmONERROR(gcoOS_Open(NULL, TableName2, gcvFILE_READ, &file)); -+ gcmONERROR(gcoOS_Open(NULL, TableName2, gcvFILE_READ, (void*) &file)); - - /* Copy tile status data */ - for (n = 0; n < height[1]; n++) --- -2.17.1 - diff --git a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/2d066ead3d6ef504c82551b12306e751d23ddb45.patch b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/2d066ead3d6ef504c82551b12306e751d23ddb45.patch deleted file mode 100644 index 1c06e254..00000000 --- a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/2d066ead3d6ef504c82551b12306e751d23ddb45.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 2d066ead3d6ef504c82551b12306e751d23ddb45 Mon Sep 17 00:00:00 2001 -From: Wei Gao <[email protected]> -Date: Sun, 14 Dec 2025 02:15:20 +0000 -Subject: [PATCH] listmount04.c: Update struct mnt_id_req support for kernel >= 6.18 - -Kernel change from v6.18-rc7 -78f0e33cd6c93 ("fs/namespace: correctly handle errors returned by grab_requested_mnt_ns") -causes the test failure with following error message: -listmount04.c:128: TFAIL: invalid mnt_id_req.spare expected EINVAL: EBADF (9) - -The fix require following changes: - -* struct mnt_id_req got new member mnt_ns_fd in v6.18-rc7. That is -fixed in a fallback defintion in lapi/. If the fallback is used is now -done via typedef (that requires also update in statmount.h). - -* New kernels (>= 6.18) have also different errno. This is fixed by -runtime check. - -Link: https://lore.kernel.org/ltp/[email protected]/ -Reviewed-by: Petr Vorel <[email protected]> -Reviewed-by: Li Wang <[email protected]> -Reviewed-by: Cyril Hrubis <[email protected]> -Signed-off-by: Wei Gao <[email protected]> -[ pvorel: Shorten TCONF, rewrite commit message ] -Signed-off-by: Petr Vorel <[email protected]> ---- - configure.ac | 2 +- - include/lapi/mount.h | 10 +++-- - .../kernel/syscalls/listmount/listmount.h | 2 +- - .../kernel/syscalls/listmount/listmount04.c | 37 +++++++++++++++++-- - .../kernel/syscalls/statmount/statmount.h | 2 +- - 5 files changed, 44 insertions(+), 9 deletions(-) - -Upstream-Status: Backport - -Index: ltp-20250930/configure.ac -=================================================================== ---- ltp-20250930.orig/configure.ac -+++ ltp-20250930/configure.ac -@@ -262,7 +262,7 @@ AC_CHECK_TYPES([struct cachestat_range], - AC_CHECK_TYPES([struct cachestat],,,[#include <sys/mman.h>]) - - # Defined in <linux/mount.h>, but include/lapi/mount.h includes <sys/mount.h> */ --AC_CHECK_TYPES([struct mnt_id_req],,,[#include <sys/mount.h>]) -+AC_CHECK_MEMBERS([struct mnt_id_req.mnt_ns_fd],,,[#include <sys/mount.h>]) - AC_CHECK_TYPES([struct statmount],,,[#include <sys/mount.h>]) - AC_CHECK_MEMBERS([struct statmount.mnt_ns_id],,,[#include <unistd.h> - #include <linux/mount.h>]) -Index: ltp-20250930/include/lapi/mount.h -=================================================================== ---- ltp-20250930.orig/include/lapi/mount.h -+++ ltp-20250930/include/lapi/mount.h -@@ -45,14 +45,18 @@ - # define MS_NOSYMFOLLOW 256 - #endif - --#ifndef HAVE_STRUCT_MNT_ID_REQ --struct mnt_id_req { -+struct mnt_id_req_fallback { - uint32_t size; -- uint32_t spare; -+ uint32_t mnt_ns_fd; - uint64_t mnt_id; - uint64_t param; - uint64_t mnt_ns_id; - }; -+ -+#ifndef HAVE_STRUCT_MNT_ID_REQ_MNT_NS_FD -+typedef struct mnt_id_req_fallback mnt_id_req; -+#else -+typedef struct mnt_id_req mnt_id_req; - #endif - - #ifndef HAVE_STRUCT_STATMOUNT -Index: ltp-20250930/testcases/kernel/syscalls/listmount/listmount.h -=================================================================== ---- ltp-20250930.orig/testcases/kernel/syscalls/listmount/listmount.h -+++ ltp-20250930/testcases/kernel/syscalls/listmount/listmount.h -@@ -15,7 +15,7 @@ - static inline ssize_t listmount(uint64_t mnt_id, uint64_t last_mnt_id, - uint64_t list[], size_t num, unsigned int flags) - { -- struct mnt_id_req req = { -+ mnt_id_req req = { - .size = MNT_ID_REQ_SIZE_VER0, - .mnt_id = mnt_id, - .param = last_mnt_id, -Index: ltp-20250930/testcases/kernel/syscalls/listmount/listmount04.c -=================================================================== ---- ltp-20250930.orig/testcases/kernel/syscalls/listmount/listmount04.c -+++ ltp-20250930/testcases/kernel/syscalls/listmount/listmount04.c -@@ -14,14 +14,18 @@ - - #define _GNU_SOURCE - -+#include "config.h" - #include "tst_test.h" - #include "lapi/mount.h" - #include "lapi/syscalls.h" - - #define MNT_SIZE 32 -+#define BEFORE_6_18 1 -+#define AFTER_6_18 2 - --static struct mnt_id_req *request; -+static mnt_id_req *request; - static uint64_t mnt_ids[MNT_SIZE]; -+static int kver; - - static struct tcase { - int req_usage; -@@ -34,6 +38,7 @@ static struct tcase { - uint64_t flags; - int exp_errno; - char *msg; -+ int kver; - } tcases[] = { - { - .req_usage = 0, -@@ -79,6 +84,18 @@ static struct tcase { - .nr_mnt_ids = MNT_SIZE, - .exp_errno = EINVAL, - .msg = "invalid mnt_id_req.spare", -+ .kver = BEFORE_6_18, -+ }, -+ { -+ .req_usage = 1, -+ .size = MNT_ID_REQ_SIZE_VER0, -+ .spare = -1, -+ .mnt_id = LSMT_ROOT, -+ .mnt_ids = mnt_ids, -+ .nr_mnt_ids = MNT_SIZE, -+ .exp_errno = EBADF, -+ .msg = "invalid mnt_id_req.mnt_ns_fd", -+ .kver = AFTER_6_18, - }, - { - .req_usage = 1, -@@ -113,7 +130,12 @@ static struct tcase { - static void run(unsigned int n) - { - struct tcase *tc = &tcases[n]; -- struct mnt_id_req *req = NULL; -+ mnt_id_req *req = NULL; -+ -+ if (tc->kver && tc->kver != kver) { -+ tst_res(TCONF, "Test not suitable for current kernel version"); -+ return; -+ } - - memset(mnt_ids, 0, sizeof(mnt_ids)); - -@@ -122,7 +144,7 @@ static void run(unsigned int n) - req->mnt_id = tc->mnt_id; - req->param = tc->param; - req->size = tc->size; -- req->spare = tc->spare; -+ req->mnt_ns_fd = tc->spare; - } - - TST_EXP_FAIL(tst_syscall(__NR_listmount, req, tc->mnt_ids, -@@ -130,8 +152,17 @@ static void run(unsigned int n) - "%s", tc->msg); - } - -+static void setup(void) -+{ -+ if (tst_kvercmp(6, 18, 0) >= 0) -+ kver = AFTER_6_18; -+ else -+ kver = BEFORE_6_18; -+} -+ - static struct tst_test test = { - .test = run, -+ .setup = setup, - .tcnt = ARRAY_SIZE(tcases), - .min_kver = "6.8", - .bufs = (struct tst_buffers []) { -Index: ltp-20250930/testcases/kernel/syscalls/statmount/statmount.h -=================================================================== ---- ltp-20250930.orig/testcases/kernel/syscalls/statmount/statmount.h -+++ ltp-20250930/testcases/kernel/syscalls/statmount/statmount.h -@@ -16,7 +16,7 @@ - static inline int statmount(uint64_t mnt_id, uint64_t mask, struct statmount *buf, - size_t bufsize, unsigned int flags) - { -- struct mnt_id_req req = { -+ mnt_id_req req = { - .size = MNT_ID_REQ_SIZE_VER0, - .mnt_id = mnt_id, - .param = mask, -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17134): https://lists.yoctoproject.org/g/meta-arago/message/17134 Mute This Topic: https://lists.yoctoproject.org/mt/117966244/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
