diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-05 13:18:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-08 10:50:18 +0100 |
commit | 9df3cdf42d8c1216682f497f0b166a43ef9f4184 (patch) | |
tree | 0d541abdea34c5e414898d5688a214bc63cfa5a7 /meta/recipes-devtools/pseudo/files | |
parent | a14d30f7de192b9a2bffc65f567483abff962f22 (diff) | |
download | poky-9df3cdf42d8c1216682f497f0b166a43ef9f4184.tar.gz |
pseudo: Upgrade to 1.8.1
* Drop patches where the changes exist upstream
* Fetch from git as no tarball is available for 1.8.1
* Move common code to pseudo.inc
* Update patchset in git recipe
(From OE-Core rev: 0c36984d4c501d12fa91cf7371511641585cc256)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/files')
-rw-r--r-- | meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/files/moreretries.patch | 12 |
2 files changed, 6 insertions, 42 deletions
diff --git a/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch b/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch deleted file mode 100644 index 8b7f30c664..0000000000 --- a/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
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/files/moreretries.patch b/meta/recipes-devtools/pseudo/files/moreretries.patch index c1e5552365..adea2665b0 100644 --- a/meta/recipes-devtools/pseudo/files/moreretries.patch +++ b/meta/recipes-devtools/pseudo/files/moreretries.patch | |||
@@ -4,15 +4,15 @@ server shutdowns. | |||
4 | Upstream-Status: Pending | 4 | Upstream-Status: Pending |
5 | RP 2016/2/28 | 5 | RP 2016/2/28 |
6 | 6 | ||
7 | Index: pseudo-1.7.5/pseudo_client.c | 7 | Index: git/pseudo_client.c |
8 | =================================================================== | 8 | =================================================================== |
9 | --- pseudo-1.7.5.orig/pseudo_client.c | 9 | --- git.orig/pseudo_client.c |
10 | +++ pseudo-1.7.5/pseudo_client.c | 10 | +++ git/pseudo_client.c |
11 | @@ -1214,7 +1214,7 @@ pseudo_client_setup(void) { | 11 | @@ -1282,7 +1282,7 @@ pseudo_client_setup(void) { |
12 | return 1; | 12 | } |
13 | } | 13 | } |
14 | 14 | ||
15 | -#define PSEUDO_RETRIES 50 | 15 | -#define PSEUDO_RETRIES 20 |
16 | +#define PSEUDO_RETRIES 250 | 16 | +#define PSEUDO_RETRIES 250 |
17 | static pseudo_msg_t * | 17 | static pseudo_msg_t * |
18 | pseudo_client_request(pseudo_msg_t *msg, size_t len, const char *path) { | 18 | pseudo_client_request(pseudo_msg_t *msg, size_t len, const char *path) { |