summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-12-30 18:38:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:16 +0000
commitbbddf83f65f490c88130d794c53ff9e4c45d0693 (patch)
treebec599b6bbb2c0022f922c97601cb621e4b3f3b9 /meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch
parent27d56eeebd8197e359aae0a7ccac74cb55ff794d (diff)
downloadpoky-bbddf83f65f490c88130d794c53ff9e4c45d0693.tar.gz
rpm: remove 5.x recipe
(From OE-Core rev: d0365f35303db3595688a6e5290677e02a72c54e) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch33
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 @@
1rpm: Resolve parallel install issue when installing lua
2
3When lua is being installed on some systems that are being run with high levels
4of parallelization there are cases where install-data-am and install-exec-hook
5are processed at the same or a very short time apart. This causes
6install-pkgbinPROGRAMS, which is a dependency of both, to be run at around the
7same time This sometimes causes file contention and will sometimes be in a state
8where install-exec-hook is looking for a file that is being installed or both
9install-pkgbinPROGRAMS being run are installing the same file and fail because
10it cannon create a new file.
11
12This patch allows install-exec-hook to be called by install-data-am instead of
13install-exec-am. It also removed the dependency in install-data-hook on
14install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once
15so there whould be any file contention.
16
17Upstream-Status: Submitted [RPM5 maintainer]
18
19Signed-off-by: Morgan Little <morgan.little@windriver.com>
20
21Index: 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