summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-05-31 09:42:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:15:00 +0100
commit9a773747c2af183554b35d45a3355418815bde98 (patch)
tree36246419dd9c91f6e91562eb9df45d2c8b34b5d7 /meta/recipes-devtools/rpm/files
parent5fa5b47716cbcf9092dc5fd0804128d3516049dd (diff)
downloadpoky-9a773747c2af183554b35d45a3355418815bde98.tar.gz
Revert "rpm: add a patch to help with Docker performance issues"
This reverts commit 6f1822e5f1eaafd8bc46e999de730c1fcca77f3a. This patch only solved a part of the problem. (From OE-Core rev: 78c4eb6ea4230a4f9199aa3fa7b84d2aea465b95) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch b/meta/recipes-devtools/rpm/files/0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch
deleted file mode 100644
index 4651409a65..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 982e47df7b82c5ffe3c414cf5641f08dba0f0e64 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 26 Jan 2018 16:32:04 +0200
4Subject: [PATCH] Revert "Set FD_CLOEXEC on opened files before exec from lua
5 script is called"
6
7This reverts commit 7a7c31f551ff167f8718aea6d5048f6288d60205.
8The reason is that when _SC_OPEN_MAX is much higher than the usual 1024
9(for example inside docker), the performance drops sharply.
10
11Upstream has been notified:
12https://bugzilla.redhat.com/show_bug.cgi?id=1537564
13
14Upstream-Status: Inappropriate [upstream needs to come up with a better fix]
15Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16---
17 luaext/lposix.c | 12 ------------
18 1 file changed, 12 deletions(-)
19
20diff --git a/luaext/lposix.c b/luaext/lposix.c
21index 0a7c26c71..c578c5a11 100644
22--- a/luaext/lposix.c
23+++ b/luaext/lposix.c
24@@ -335,22 +335,10 @@ static int Pexec(lua_State *L) /** exec(path,[args]) */
25 const char *path = luaL_checkstring(L, 1);
26 int i,n=lua_gettop(L);
27 char **argv;
28- int flag, fdno, open_max;
29
30 if (!have_forked)
31 return luaL_error(L, "exec not permitted in this context");
32
33- open_max = sysconf(_SC_OPEN_MAX);
34- if (open_max == -1) {
35- open_max = 1024;
36- }
37- for (fdno = 3; fdno < open_max; fdno++) {
38- flag = fcntl(fdno, F_GETFD);
39- if (flag == -1 || (flag & FD_CLOEXEC))
40- continue;
41- fcntl(fdno, F_SETFD, FD_CLOEXEC);
42- }
43-
44 argv = malloc((n+1)*sizeof(char*));
45 if (argv==NULL) return luaL_error(L,"not enough memory");
46 argv[0] = (char*)path;
47--
482.15.1
49