diff options
Diffstat (limited to 'poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch')
| -rw-r--r-- | poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch index bf24d43eb..41cdf6ed7 100644 --- a/poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch +++ b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch @@ -1,25 +1,23 @@ -From ffb5301a8594140ad7a58bc0f2053be8ca2b2946 Mon Sep 17 00:00:00 2001 +From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 20 Jan 2017 13:32:06 +0200 -Subject: [PATCH 1/2] Do not reset the PATH environment variable before running +Subject: [PATCH] Do not reset the PATH environment variable before running scriptlets. We add lots of native stuff into it and scriptlets rely on that. -Also need to remove the xx test later in the function since the -value could now be used un-initialised. - Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- lib/rpmscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rpmscript.c b/lib/rpmscript.c -index 92f949fa2..7c1aa75a8 100644 +index 6a31e0d..2b0e438 100644 --- a/lib/rpmscript.c +++ b/lib/rpmscript.c -@@ -201,7 +201,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, +@@ -184,7 +184,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, if (ipath && ipath[5] != '%') path = ipath; @@ -28,13 +26,3 @@ index 92f949fa2..7c1aa75a8 100644 free(ipath); } -@@ -206,9 +206,7 @@ static void doScriptExec(ARGV_const_t ar - /* XXX Don't mtrace into children. */ - unsetenv("MALLOC_CHECK_"); - -- if (xx == 0) { - xx = execv(argv[0], argv); -- } - } - _exit(127); /* exit 127 for compatibility with bash(1) */ - } |
