diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-03-24 15:58:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-26 07:34:58 +0000 |
commit | 1341c1744be50bcd05272f5db06fe27c5d6a8aba (patch) | |
tree | 392cc248ac8653758127449f28a481936067781d /meta | |
parent | 07f0af3d333b139e958a12d0d0cf52616002f71c (diff) | |
download | poky-1341c1744be50bcd05272f5db06fe27c5d6a8aba.tar.gz |
pseudo: backport a patch to fix xattr removal
xattr removal doesn't work in pseudo 1.7.5, backport a patch from
pseudo master to fix this.
[YOCTO #9324]
(From OE-Core rev: e4f6156ffdc840e99b546369493aaf37c4856b3b)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.7.5.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch b/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch new file mode 100644 index 0000000000..8b7f30c664 --- /dev/null +++ b/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From a24cf102967a4966bfabe36c3542fb65f35bf539 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Seebach <peter.seebach@windriver.com> | ||
3 | Date: Wed, 23 Mar 2016 11:55:25 -0500 | ||
4 | Subject: actually handle remove_xattr correctly | ||
5 | |||
6 | The path is required but wasn't being extracted from the client's message, | ||
7 | resulting in xattr removal never working. This does not fully address some | ||
8 | deeper problems with the xattr implementation, but at least the common | ||
9 | removal case works. | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Index: pseudo-1.7.5/ChangeLog.txt | ||
14 | =================================================================== | ||
15 | --- pseudo-1.7.5.orig/ChangeLog.txt | ||
16 | +++ pseudo-1.7.5/ChangeLog.txt | ||
17 | @@ -1,3 +1,7 @@ | ||
18 | +2016-03-22: | ||
19 | + * (seebs) extract path from message for remove_xattr so it | ||
20 | + actually works. | ||
21 | + | ||
22 | 2016-02-09: | ||
23 | * (seebs) 1.7.5 release | ||
24 | |||
25 | Index: pseudo-1.7.5/pseudo.c | ||
26 | =================================================================== | ||
27 | --- pseudo-1.7.5.orig/pseudo.c | ||
28 | +++ pseudo-1.7.5/pseudo.c | ||
29 | @@ -543,6 +543,7 @@ pseudo_op(pseudo_msg_t *msg, const char | ||
30 | case OP_GET_XATTR: | ||
31 | case OP_LIST_XATTR: | ||
32 | case OP_REPLACE_XATTR: | ||
33 | + case OP_REMOVE_XATTR: | ||
34 | case OP_SET_XATTR: | ||
35 | /* In a rename there are two paths, null separated in msg->path */ | ||
36 | initial_len = strlen(msg->path); | ||
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb b/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb index 7af4d65065..d90e64445d 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.7.5.bb | |||
@@ -6,6 +6,7 @@ SRC_URI = " \ | |||
6 | file://fallback-passwd \ | 6 | file://fallback-passwd \ |
7 | file://fallback-group \ | 7 | file://fallback-group \ |
8 | file://moreretries.patch \ | 8 | file://moreretries.patch \ |
9 | file://handle-remove-xattr.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d" | 12 | SRC_URI[md5sum] = "c10209938f03128d0c193f041ff3596d" |