summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo/files/statxfix.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-08 15:08:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-03 14:13:53 +0000
commit625e0cdf849dabd4de1b84dc0a4aefacd6cc81b6 (patch)
tree9f9c12a78e1e0f52fdf7dc86336e29e48686c68c /meta/recipes-devtools/pseudo/files/statxfix.patch
parent3118a9cda3fb0cf4186aa34e5495d46026e50c6c (diff)
downloadpoky-625e0cdf849dabd4de1b84dc0a4aefacd6cc81b6.tar.gz
pseudo: Update to account for patches merged on branch
(From OE-Core rev: 9002c81b8996bfbdf3fa1b8b15a198408b749d1d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ea22fb3aa1c5dd3edcd1d8b415a0843a9ee4677c) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/files/statxfix.patch')
-rw-r--r--meta/recipes-devtools/pseudo/files/statxfix.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-devtools/pseudo/files/statxfix.patch b/meta/recipes-devtools/pseudo/files/statxfix.patch
deleted file mode 100644
index c47ff27f9f..0000000000
--- a/meta/recipes-devtools/pseudo/files/statxfix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1There is magic in the posts where specific variable names have specific
2magic. For that magic to work, "path" needs to be used not "pathname" as
3is currently there. Fix this, which fixes path issues on systems using
4statx (Ubuntu 20.04 in particular).
5
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7Upstream-Status: Pending
8
9Index: git/ports/linux/statx/guts/statx.c
10===================================================================
11--- git.orig/ports/linux/statx/guts/statx.c
12+++ git/ports/linux/statx/guts/statx.c
13@@ -5,14 +5,14 @@
14 * SPDX-License-Identifier: LGPL-2.1-only
15 *
16 * int
17- * statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) {
18+ * statx(int dirfd, const char *path, int flags, unsigned int mask, struct statx *statxbuf) {
19 * int rc = -1;
20 */
21 pseudo_msg_t *msg;
22 PSEUDO_STATBUF buf;
23 int save_errno;
24
25- rc = real_statx(dirfd, pathname, flags, mask, statxbuf);
26+ rc = real_statx(dirfd, path, flags, mask, statxbuf);
27 save_errno = errno;
28 if (rc == -1) {
29 return rc;
30@@ -25,16 +25,16 @@
31 buf.st_mode = statxbuf->stx_mode;
32 buf.st_rdev = makedev(statxbuf->stx_rdev_major, statxbuf->stx_rdev_minor);
33 buf.st_nlink = statxbuf->stx_nlink;
34- msg = pseudo_client_op(OP_STAT, 0, -1, dirfd, pathname, &buf);
35+ msg = pseudo_client_op(OP_STAT, 0, -1, dirfd, path, &buf);
36 if (msg && msg->result == RESULT_SUCCEED) {
37- pseudo_debug(PDBGF_FILE, "statx(path %s), flags %o, stat rc %d, stat uid %o\n", pathname, flags, rc, statxbuf->stx_uid);
38+ pseudo_debug(PDBGF_FILE, "statx(path %s), flags %o, stat rc %d, stat uid %o\n", path, flags, rc, statxbuf->stx_uid);
39 statxbuf->stx_uid = msg->uid;
40 statxbuf->stx_gid = msg->gid;
41 statxbuf->stx_mode = msg->mode;
42 statxbuf->stx_rdev_major = major(msg->rdev);
43 statxbuf->stx_rdev_minor = minor(msg->rdev);
44 } else {
45- pseudo_debug(PDBGF_FILE, "statx(path %s) failed, flags %o, stat rc %d, stat uid %o\n", pathname, flags, rc, statxbuf->stx_uid);
46+ pseudo_debug(PDBGF_FILE, "statx(path %s) failed, flags %o, stat rc %d, stat uid %o\n", path, flags, rc, statxbuf->stx_uid);
47 }
48 errno = save_errno;
49 /* return rc;
50Index: git/ports/linux/statx/wrapfuncs.in
51===================================================================
52--- git.orig/ports/linux/statx/wrapfuncs.in
53+++ git/ports/linux/statx/wrapfuncs.in
54@@ -1 +1 @@
55-int statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf);
56+int statx(int dirfd, const char *path, int flags, unsigned int mask, struct statx *statxbuf);