diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch deleted file mode 100644 index 5d936db5a3..0000000000 --- a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | rpm: Resolve parallel install issue when installing lua | ||
2 | |||
3 | When lua is being installed on some systems that are being run with high levels | ||
4 | of parallelization there are cases where install-data-am and install-exec-hook | ||
5 | are processed at the same or a very short time apart. This causes | ||
6 | install-pkgbinPROGRAMS, which is a dependency of both, to be run at around the | ||
7 | same time This sometimes causes file contention and will sometimes be in a state | ||
8 | where install-exec-hook is looking for a file that is being installed or both | ||
9 | install-pkgbinPROGRAMS being run are installing the same file and fail because | ||
10 | it cannon create a new file. | ||
11 | |||
12 | This patch allows install-exec-hook to be called by install-data-am instead of | ||
13 | install-exec-am. It also removed the dependency in install-data-hook on | ||
14 | install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once | ||
15 | so there whould be any file contention. | ||
16 | |||
17 | Upstream-Status: Submitted [RPM5 maintainer] | ||
18 | |||
19 | Signed-off-by: Morgan Little <morgan.little@windriver.com> | ||
20 | |||
21 | Index: rpm-5.4.14/lua/Makefile.am | ||
22 | =================================================================== | ||
23 | --- rpm-5.4.14.orig/lua/Makefile.am | ||
24 | +++ rpm-5.4.14/lua/Makefile.am | ||
25 | @@ -326,7 +326,7 @@ clean-local: | ||
26 | # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. | ||
27 | # XXX CVS has lua/luac sub-directories in the Attic that collide with the | ||
28 | # XXX lua/luac executable names when using cvs update. | ||
29 | -install-exec-hook: install-pkgbinPROGRAMS | ||
30 | +install-data-hook: | ||
31 | mkdir -p $(DESTDIR)$(pkgbindir) | ||
32 | $(__RM) -f $(DESTDIR)$(pkgbindir)/lua | ||
33 | $(__LN) $(DESTDIR)$(pkgbindir)/rpmlua $(DESTDIR)$(pkgbindir)/lua | ||