diff options
Diffstat (limited to 'meta/recipes-devtools/rpm')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
2 files changed, 33 insertions, 1 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 @@ +rpm: Resolve parallel install issue when installing lua + +When lua is being installed on some systems that are being run with high levels +of parallelization there are cases where install-data-am and install-exec-hook +are processed at the same or a very short time apart. This causes +install-pkgbinPROGRAMS, which is a dependency of both, to be run at around the +same time This sometimes causes file contention and will sometimes be in a state +where install-exec-hook is looking for a file that is being installed or both +install-pkgbinPROGRAMS being run are installing the same file and fail because +it cannon create a new file. + +This patch allows install-exec-hook to be called by install-data-am instead of +install-exec-am. It also removed the dependency in install-data-hook on +install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once +so there whould be any file contention. + +Upstream-Status: Pending + +Signed-off-by: Morgan Little <morgan.little@windriver.com> + +--- a/lua/Makefile.am.orig ++++ b/lua/Makefile.am +@@ -320,7 +320,7 @@ + # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. + # XXX CVS has lua/luac sub-directories in the Attic that collide with the + # XXX lua/luac executable names when using cvs update. +-install-exec-hook: install-pkgbinPROGRAMS ++install-data-hook: + mkdir -p $(DESTDIR)$(pkgbindir) + $(__RM) -f $(DESTDIR)$(pkgbindir)/lua + $(__LN) $(DESTDIR)$(pkgbindir)/rpmlua $(DESTDIR)$(pkgbindir)/lua diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 2a4c8d831c..41943652b0 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" -PR = "r49" +PR = "r50" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -77,6 +77,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex file://fstack-protector-configure-check.patch \ file://dbconvert.patch \ file://rpm-uuid-include.patch \ + file://makefile-am-exec-hook.patch \ " SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |