diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch index 4020a31092..2a0069cafe 100644 --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch | |||
| @@ -28,11 +28,18 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
| 28 | lib/rpmscript.c | 11 ++++++++--- | 28 | lib/rpmscript.c | 11 ++++++++--- |
| 29 | 1 file changed, 8 insertions(+), 3 deletions(-) | 29 | 1 file changed, 8 insertions(+), 3 deletions(-) |
| 30 | 30 | ||
| 31 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c | ||
| 32 | index cc98c4885..f8bd3df04 100644 | ||
| 33 | --- a/lib/rpmscript.c | 31 | --- a/lib/rpmscript.c |
| 34 | +++ b/lib/rpmscript.c | 32 | +++ b/lib/rpmscript.c |
| 35 | @@ -394,8 +394,7 @@ exit: | 33 | @@ -17,7 +17,7 @@ |
| 34 | #include "rpmio/rpmio_internal.h" | ||
| 35 | |||
| 36 | #include "lib/rpmplugins.h" /* rpm plugins hooks */ | ||
| 37 | - | ||
| 38 | +#include "lib/rpmchroot.h" /* rpmChrootOut */ | ||
| 39 | #include "debug.h" | ||
| 40 | |||
| 41 | struct scriptNextFileFunc_s { | ||
| 42 | @@ -391,8 +391,7 @@ exit: | ||
| 36 | Fclose(out); /* XXX dup'd STDOUT_FILENO */ | 43 | Fclose(out); /* XXX dup'd STDOUT_FILENO */ |
| 37 | 44 | ||
| 38 | if (fn) { | 45 | if (fn) { |
| @@ -42,7 +49,7 @@ index cc98c4885..f8bd3df04 100644 | |||
| 42 | free(fn); | 49 | free(fn); |
| 43 | } | 50 | } |
| 44 | free(mline); | 51 | free(mline); |
| 45 | @@ -428,7 +427,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, | 52 | @@ -426,7 +425,13 @@ rpmRC rpmScriptRun(rpmScript script, int |
| 46 | 53 | ||
| 47 | if (rc != RPMRC_FAIL) { | 54 | if (rc != RPMRC_FAIL) { |
| 48 | if (script_type & RPMSCRIPTLET_EXEC) { | 55 | if (script_type & RPMSCRIPTLET_EXEC) { |
| @@ -57,6 +64,3 @@ index cc98c4885..f8bd3df04 100644 | |||
| 57 | } else { | 64 | } else { |
| 58 | rc = runLuaScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, &script->nextFileFunc); | 65 | rc = runLuaScript(plugins, prefixes, script->descr, lvl, scriptFd, &args, script->body, arg1, arg2, &script->nextFileFunc); |
| 59 | } | 66 | } |
| 60 | -- | ||
| 61 | 2.11.0 | ||
| 62 | |||
