diff options
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/pseudo/files')
3 files changed, 99 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch b/yocto-poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch new file mode 100644 index 000000000..43504eaab --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch @@ -0,0 +1,44 @@ +From b5545c08e6c674c49aef14b47a56a3e92df4d2a7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 Feb 2016 07:36:34 +0000 +Subject: [pseudo][PATCH] configure: Prune PIE flags + +LDFLAGS are not taken from environment and CFLAGS is used for LDFLAGS +however when using security options -fpie and -pie options are coming +as part of ARCH_FLAGS and they get into LDFLAGS of shared objects as +well so we end up with conflicting options -shared -pie, which gold +rejects outright and bfd linker lets the one appearning last in cmdline +take effect. This create quite a unpleasant situation in OE when +security flags are enabled and gold or not-gold options are used +it errors out but errors are not same. + +Anyway, with this patch we filter pie options from ARCH_FLAGS +ouright and take control of generating PIC objects + +Helps with errors like + +| /mnt/oe/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/5.3.0/ld: pseudo_client.o: relocation R_X86_64_PC32 against symbol `pseudo_util_debug_flags' can not be used when making a shared object; recompile with -fPIC +| /mnt/oe/build/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/5.3.0/ld: final link failed: Bad value +| collect2: error: ld returned 1 exit status +| make: *** [lib/pseudo/lib64/libpseudo.so] Error 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index e5ef9ce..83b0890 100755 +--- a/configure ++++ b/configure +@@ -339,3 +339,5 @@ sed -e ' + s,@ARCH@,'"$opt_arch"',g + s,@BITS@,'"$opt_bits"',g + ' < Makefile.in > Makefile ++ ++sed -i -e 's/\-[f]*pie//g' Makefile +-- +1.8.3.1 + diff --git a/yocto-poky/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch b/yocto-poky/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch new file mode 100644 index 000000000..8b7f30c66 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pseudo/files/handle-remove-xattr.patch @@ -0,0 +1,36 @@ +From a24cf102967a4966bfabe36c3542fb65f35bf539 Mon Sep 17 00:00:00 2001 +From: Peter Seebach <peter.seebach@windriver.com> +Date: Wed, 23 Mar 2016 11:55:25 -0500 +Subject: actually handle remove_xattr correctly + +The path is required but wasn't being extracted from the client's message, +resulting in xattr removal never working. This does not fully address some +deeper problems with the xattr implementation, but at least the common +removal case works. + +Upstream-Status: Backport + +Index: pseudo-1.7.5/ChangeLog.txt +=================================================================== +--- pseudo-1.7.5.orig/ChangeLog.txt ++++ pseudo-1.7.5/ChangeLog.txt +@@ -1,3 +1,7 @@ ++2016-03-22: ++ * (seebs) extract path from message for remove_xattr so it ++ actually works. ++ + 2016-02-09: + * (seebs) 1.7.5 release + +Index: pseudo-1.7.5/pseudo.c +=================================================================== +--- pseudo-1.7.5.orig/pseudo.c ++++ pseudo-1.7.5/pseudo.c +@@ -543,6 +543,7 @@ pseudo_op(pseudo_msg_t *msg, const char + case OP_GET_XATTR: + case OP_LIST_XATTR: + case OP_REPLACE_XATTR: ++ case OP_REMOVE_XATTR: + case OP_SET_XATTR: + /* In a rename there are two paths, null separated in msg->path */ + initial_len = strlen(msg->path); diff --git a/yocto-poky/meta/recipes-devtools/pseudo/files/moreretries.patch b/yocto-poky/meta/recipes-devtools/pseudo/files/moreretries.patch new file mode 100644 index 000000000..c1e555236 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/pseudo/files/moreretries.patch @@ -0,0 +1,19 @@ +Increase the number of retries in pseudo due to occasional slow +server shutdowns. + +Upstream-Status: Pending +RP 2016/2/28 + +Index: pseudo-1.7.5/pseudo_client.c +=================================================================== +--- pseudo-1.7.5.orig/pseudo_client.c ++++ pseudo-1.7.5/pseudo_client.c +@@ -1214,7 +1214,7 @@ pseudo_client_setup(void) { + return 1; + } + +-#define PSEUDO_RETRIES 50 ++#define PSEUDO_RETRIES 250 + static pseudo_msg_t * + pseudo_client_request(pseudo_msg_t *msg, size_t len, const char *path) { + pseudo_msg_t *response = 0; |