diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2010-09-02 13:40:45 -0500 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-03 13:59:01 +0100 |
| commit | 7e36135a7e39e0ddb7298ffdec31b0f2be011788 (patch) | |
| tree | 0a4d0b84c17aea9dc5bf3853e7a6e7aba8f3d0d5 | |
| parent | a2116860eb4e694d81e4968c62fb9839ddca0696 (diff) | |
| download | openembedded-core-7e36135a7e39e0ddb7298ffdec31b0f2be011788.tar.gz openembedded-core-7e36135a7e39e0ddb7298ffdec31b0f2be011788.tar.bz2 openembedded-core-7e36135a7e39e0ddb7298ffdec31b0f2be011788.tar.xz openembedded-core-7e36135a7e39e0ddb7298ffdec31b0f2be011788.zip | |
rpm: Raise the number of potential rescans before aborting with a dep loop
Within Poky we have a large number of self-referencing packages. So we
need to raise the number of rescans before triggering a dependency loop
error. 100 seems like a reasonable number.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.1.10.bb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch b/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch new file mode 100644 index 000000000..db4f8b3a7 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch @@ -0,0 +1,17 @@ +We need to increase the number of dependency rescans as we have a large +number of self-referencing dependencies within Poky. 100 seem reasonable. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff -ur rpm-5.1.10.orig/lib/depends.c rpm-5.1.10/lib/depends.c +--- rpm-5.1.10.orig/lib/depends.c 2010-08-20 17:12:43.000000000 -0500 ++++ rpm-5.1.10/lib/depends.c 2010-09-02 13:37:21.966116309 -0500 +@@ -2310,7 +2310,7 @@ + int numOrderList; + int npeer = 128; /* XXX more than deep enough for now. */ + int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer))); +- int nrescans = 10; ++ int nrescans = 100; + int _printed = 0; + char deptypechar; + size_t tsbytes; diff --git a/meta/recipes-devtools/rpm/rpm_5.1.10.bb b/meta/recipes-devtools/rpm/rpm_5.1.10.bb index d4b5a9166..fc2e837b9 100644 --- a/meta/recipes-devtools/rpm/rpm_5.1.10.bb +++ b/meta/recipes-devtools/rpm/rpm_5.1.10.bb @@ -3,11 +3,12 @@ DESCRIPTION_rpm-build = "The RPM Package Manager rpmbuild and related commands." HOMEPAGE = "http://rpm5.org/" LICENSE = "LGPL 2.1" DEPENDS = "zlib perl popt beecrypt python libpcre elfutils" -PR = "r3" +PR = "r4" SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/SNAPSHOT/${BPN}-${PV}.tar.gz \ file://hdraddorappend.patch \ file://export-rpmbag-h.patch \ + file://rpm-nrescan.patch \ file://remove-compiled-tests.patch;apply=no \ file://perfile_rpmdeps.sh \ " |