From a2e7adad277cb8f71febaccf734a1df727d2ce8a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 29 Sep 2012 19:19:16 -0500 Subject: rpm: Fix file contention issue There is an issue that is caused when doing the install step of rpm on systems with high parallelization where two jobs of make will fight for the same file while installing the sub-directory lua. This is caused by the same makefile rule being called twice in a way that both could be trying to install at the same time. This fix renames the linking rule so it will always be run after the needed files are added and removed it's dependency so the required rule would only run once. This was tested heavily using ppss to run mutliple installs in parallel. This wouldn't happen in practise but it was tested will all the individual rules as well. (From OE-Core rev: d05c5da6b972db97d3eb66b659f5641368c9ebe4) Signed-off-by: Morgan Little Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools/rpm/rpm_5.4.9.bb') 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" -- cgit v1.2.3-54-g00ecf