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 | 8 |
1 files changed, 4 insertions, 4 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 e4251a1a73..fc6d7e0d29 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 34c0d3263f3e0b366a2320e0823f46673f7ba928 Mon Sep 17 00:00:00 2001 | 1 | From 3603cf181b69ab1e0077dcd8a124e669dcb9dd9c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 17 Jan 2017 14:07:17 +0200 | 3 | Date: Tue, 17 Jan 2017 14:07:17 +0200 |
4 | Subject: [PATCH] When cross-installing, execute package scriptlets without | 4 | Subject: [PATCH] When cross-installing, execute package scriptlets without |
@@ -29,10 +29,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
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 | 31 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c |
32 | index 3f6313278..57689bb68 100644 | 32 | index 097c9055a..060fd8124 100644 |
33 | --- a/lib/rpmscript.c | 33 | --- a/lib/rpmscript.c |
34 | +++ b/lib/rpmscript.c | 34 | +++ b/lib/rpmscript.c |
35 | @@ -448,8 +448,7 @@ exit: | 35 | @@ -447,8 +447,7 @@ exit: |
36 | Fclose(out); /* XXX dup'd STDOUT_FILENO */ | 36 | Fclose(out); /* XXX dup'd STDOUT_FILENO */ |
37 | 37 | ||
38 | if (fn) { | 38 | if (fn) { |
@@ -42,7 +42,7 @@ index 3f6313278..57689bb68 100644 | |||
42 | free(fn); | 42 | free(fn); |
43 | } | 43 | } |
44 | free(mline); | 44 | free(mline); |
45 | @@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, | 45 | @@ -482,7 +481,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, |
46 | 46 | ||
47 | if (rc != RPMRC_FAIL) { | 47 | if (rc != RPMRC_FAIL) { |
48 | if (script_type & RPMSCRIPTLET_EXEC) { | 48 | if (script_type & RPMSCRIPTLET_EXEC) { |