summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch17
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.1.10.bb3
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 0000000000..db4f8b3a7a
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch
@@ -0,0 +1,17 @@
1We need to increase the number of dependency rescans as we have a large
2number of self-referencing dependencies within Poky. 100 seem reasonable.
3
4Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
5
6diff -ur rpm-5.1.10.orig/lib/depends.c rpm-5.1.10/lib/depends.c
7--- rpm-5.1.10.orig/lib/depends.c 2010-08-20 17:12:43.000000000 -0500
8+++ rpm-5.1.10/lib/depends.c 2010-09-02 13:37:21.966116309 -0500
9@@ -2310,7 +2310,7 @@
10 int numOrderList;
11 int npeer = 128; /* XXX more than deep enough for now. */
12 int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer)));
13- int nrescans = 10;
14+ int nrescans = 100;
15 int _printed = 0;
16 char deptypechar;
17 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 d4b5a91668..fc2e837b9a 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."
3HOMEPAGE = "http://rpm5.org/" 3HOMEPAGE = "http://rpm5.org/"
4LICENSE = "LGPL 2.1" 4LICENSE = "LGPL 2.1"
5DEPENDS = "zlib perl popt beecrypt python libpcre elfutils" 5DEPENDS = "zlib perl popt beecrypt python libpcre elfutils"
6PR = "r3" 6PR = "r4"
7 7
8SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/SNAPSHOT/${BPN}-${PV}.tar.gz \ 8SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.1/SNAPSHOT/${BPN}-${PV}.tar.gz \
9 file://hdraddorappend.patch \ 9 file://hdraddorappend.patch \
10 file://export-rpmbag-h.patch \ 10 file://export-rpmbag-h.patch \
11 file://rpm-nrescan.patch \
11 file://remove-compiled-tests.patch;apply=no \ 12 file://remove-compiled-tests.patch;apply=no \
12 file://perfile_rpmdeps.sh \ 13 file://perfile_rpmdeps.sh \
13 " 14 "