summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-11-24 11:28:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:07 +0000
commit80f9d337615639fe852ddcb96ce9de929958d945 (patch)
tree436d32937153e6dee41faaa89f0365cac7b2eec8
parentfd1b82e0bd13cfc9f35c60505b97d4cb990afff2 (diff)
downloadpoky-80f9d337615639fe852ddcb96ce9de929958d945.tar.gz
pseudo: include fix for xattr corruption
pseudo_1.8.1.bb gets the backported patch and pseudo_git.bb gets updated to include the commit. (From OE-Core rev: 4e98f3a6e6f61d9d9037ac828b9c4869f7e11458) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pseudo/files/More-correctly-fix-xattrs.patch37
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.8.1.bb1
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb2
3 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-devtools/pseudo/files/More-correctly-fix-xattrs.patch b/meta/recipes-devtools/pseudo/files/More-correctly-fix-xattrs.patch
new file mode 100644
index 0000000000..3d178f9b4f
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/More-correctly-fix-xattrs.patch
@@ -0,0 +1,37 @@
1From 45eca34c754d416a38bee90fb2d3c110a0b6cc5f Mon Sep 17 00:00:00 2001
2From: Seebs <seebs@seebs.net>
3Date: Thu, 3 Nov 2016 11:36:12 -0500
4Subject: [PATCH] More-correctly fix xattrs
5
6Fix provided by Patrick Ohly <patrick.ohly@intel.com>. This resolves
7the actual cause of the path length mismatches, and explains why
8I couldn't quite explain why the previous one had only sometimes
9worked, also why it showed up on directories but not plain files.
10
11Signed-off-by: Seebs <seebs@seebs.net>
12
13Fixes [YOCTO #10623]
14
15Upstream-Status: Backport [commit 45eca34c754d416a38bee90fb2d3c110a0b6cc5f]
16
17Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
18---
19 pseudo_client.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/pseudo_client.c b/pseudo_client.c
23index 6a08df3..b1a00fa 100644
24--- a/pseudo_client.c
25+++ b/pseudo_client.c
26@@ -1676,7 +1676,7 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path
27 * empty path for that.
28 */
29 if (path_extra_1) {
30- size_t full_len = path_extra_1len + 1 + pathlen;
31+ size_t full_len = path_extra_1len + 1 + pathlen - strip_slash;
32 size_t partial_len = pathlen - 1 - strip_slash;
33 if (path_extra_2) {
34 full_len += path_extra_2len + 1;
35--
362.1.4
37
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb
index fb70034b4c..90b53c0c16 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.8.1.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/pseudo/${BPN}-${PV}.tar.bz
10 file://0001-Quiet-diagnostics-during-startup-for-pseudo-d.patch \ 10 file://0001-Quiet-diagnostics-during-startup-for-pseudo-d.patch \
11 file://0002-Use-correct-file-descriptor.patch \ 11 file://0002-Use-correct-file-descriptor.patch \
12 file://0003-Fix-renameat-parallel-to-previous-fix-to-rename.patch \ 12 file://0003-Fix-renameat-parallel-to-previous-fix-to-rename.patch \
13 file://More-correctly-fix-xattrs.patch \
13 " 14 "
14 15
15SRC_URI[md5sum] = "ee38e4fb62ff88ad067b1a5a3825bac7" 16SRC_URI[md5sum] = "ee38e4fb62ff88ad067b1a5a3825bac7"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 8110b1a193..ac923bbb75 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,6 +1,6 @@
1require pseudo.inc 1require pseudo.inc
2 2
3SRCREV = "befc6dbd6469d428c9e0830dbe51bdf7ac39d9ae" 3SRCREV = "45eca34c754d416a38bee90fb2d3c110a0b6cc5f"
4PV = "1.8.1+git${SRCPV}" 4PV = "1.8.1+git${SRCPV}"
5 5
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"