diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-09-29 19:19:16 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 11:40:49 +0100 |
commit | a2e7adad277cb8f71febaccf734a1df727d2ce8a (patch) | |
tree | f0f674db852b9b119a967c4b9aefbc306fec4d91 /meta/recipes-devtools/rpm/rpm_5.4.9.bb | |
parent | fc3b6656afdabfa50bcbd4028cc3d2a9881c551f (diff) | |
download | poky-a2e7adad277cb8f71febaccf734a1df727d2ce8a.tar.gz |
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 <morgan.little@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.9.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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" | |||
43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
44 | 44 | ||
45 | DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" | 45 | DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" |
46 | PR = "r49" | 46 | PR = "r50" |
47 | 47 | ||
48 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 48 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
49 | # in order to extract the distribution SRPM into a format we can extract... | 49 | # 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 | |||
77 | file://fstack-protector-configure-check.patch \ | 77 | file://fstack-protector-configure-check.patch \ |
78 | file://dbconvert.patch \ | 78 | file://dbconvert.patch \ |
79 | file://rpm-uuid-include.patch \ | 79 | file://rpm-uuid-include.patch \ |
80 | file://makefile-am-exec-hook.patch \ | ||
80 | " | 81 | " |
81 | 82 | ||
82 | SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" | 83 | SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |