diff options
Diffstat (limited to 'external/poky/meta/recipes-devtools/pseudo/files')
5 files changed, 140 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch b/external/poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch new file mode 100644 index 00000000..43504eaa --- /dev/null +++ b/external/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/external/poky/meta/recipes-devtools/pseudo/files/fallback-group b/external/poky/meta/recipes-devtools/pseudo/files/fallback-group new file mode 100644 index 00000000..bb3dbca6 --- /dev/null +++ b/external/poky/meta/recipes-devtools/pseudo/files/fallback-group @@ -0,0 +1,3 @@ +root:*:0: +mail:*:8: +nobody:*:99: diff --git a/external/poky/meta/recipes-devtools/pseudo/files/fallback-passwd b/external/poky/meta/recipes-devtools/pseudo/files/fallback-passwd new file mode 100644 index 00000000..08611baa --- /dev/null +++ b/external/poky/meta/recipes-devtools/pseudo/files/fallback-passwd @@ -0,0 +1,3 @@ +root::0:0:root:/home/root:/bin/sh +pseudopasswd:*:1:1:this-is-the-pseudo-passwd:/nonexistent:/bin/sh +nobody:*:65534:65534:nobody:/nonexistent:/bin/sh diff --git a/external/poky/meta/recipes-devtools/pseudo/files/moreretries.patch b/external/poky/meta/recipes-devtools/pseudo/files/moreretries.patch new file mode 100644 index 00000000..adea2665 --- /dev/null +++ b/external/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: git/pseudo_client.c +=================================================================== +--- git.orig/pseudo_client.c ++++ git/pseudo_client.c +@@ -1282,7 +1282,7 @@ pseudo_client_setup(void) { + } + } + +-#define PSEUDO_RETRIES 20 ++#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; diff --git a/external/poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch b/external/poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch new file mode 100644 index 00000000..bda7e4b2 --- /dev/null +++ b/external/poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch @@ -0,0 +1,71 @@ +From b0b25fbc041a148d1de09f5a6503cd95973ec77c Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Tue, 25 Apr 2017 15:25:54 +0100 +Subject: [PATCH 3/3] pseudo: Handle too many files deadlock + +Currently if we max out the maximum number of files, pseudo can deadlock, unable to +accept new connections yet unable to move forward and unblock the other processes +waiting either. + +Rather than hang, when this happens, close out inactive connections, allowing us +to accept the new ones. The disconnected clients will simply reconnect. There is +a small risk of data loss here sadly but its better than hanging. + +RP +2017/4/25 + +Upstream-Status: Submitted [Peter is aware of the issue] + +--- + pseudo_server.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/pseudo_server.c b/pseudo_server.c +index dac3258..15a3e8f 100644 +--- a/pseudo_server.c ++++ b/pseudo_server.c +@@ -802,6 +802,7 @@ pseudo_server_loop(void) { + struct sigaction eat_usr2 = { + .sa_handler = set_do_list_clients + }; ++ int hitmaxfiles; + + clients = malloc(16 * sizeof(*clients)); + +@@ -820,6 +821,7 @@ pseudo_server_loop(void) { + active_clients = 1; + max_clients = 16; + highest_client = 0; ++ hitmaxfiles = 0; + + pseudo_debug(PDBGF_SERVER, "server loop started.\n"); + if (listen_fd < 0) { +@@ -878,10 +880,15 @@ pseudo_server_loop(void) { + } else { + serve_client(i); + } ++ } else if (hitmaxfiles) { ++ /* Only close one per loop iteration in the interests of caution */ ++ close_client(i); ++ hitmaxfiles = 0; + } + if (die_forcefully) + break; + } ++ hitmaxfiles = 0; + if (!die_forcefully && + (FD_ISSET(clients[0].fd, &events) || + FD_ISSET(clients[0].fd, &reads))) { +@@ -903,6 +910,9 @@ pseudo_server_loop(void) { + */ + pseudo_server_timeout = DEFAULT_PSEUDO_SERVER_TIMEOUT; + die_peacefully = 0; ++ } else if (errno == EMFILE) { ++ hitmaxfiles = 1; ++ pseudo_debug(PDBGF_SERVER, "Hit max open files, dropping a client.\n"); + } + } + pseudo_debug(PDBGF_SERVER, "server loop complete [%d clients left]\n", active_clients); +-- +2.15.1 + |