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 | 31 |
1 files changed, 31 insertions, 0 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 new file mode 100644 index 0000000000..12f85b7fc9 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | |||
@@ -0,0 +1,31 @@ | |||
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: Pending | ||
18 | |||
19 | Signed-off-by: Morgan Little <morgan.little@windriver.com> | ||
20 | |||
21 | --- a/lua/Makefile.am.orig | ||
22 | +++ b/lua/Makefile.am | ||
23 | @@ -320,7 +320,7 @@ | ||
24 | # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. | ||
25 | # XXX CVS has lua/luac sub-directories in the Attic that collide with the | ||
26 | # XXX lua/luac executable names when using cvs update. | ||
27 | -install-exec-hook: install-pkgbinPROGRAMS | ||
28 | +install-data-hook: | ||
29 | mkdir -p $(DESTDIR)$(pkgbindir) | ||
30 | $(__RM) -f $(DESTDIR)$(pkgbindir)/lua | ||
31 | $(__LN) $(DESTDIR)$(pkgbindir)/rpmlua $(DESTDIR)$(pkgbindir)/lua | ||