mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpm: Raise the number of potential rescans before aborting with a dep loop

Browse Source 
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>
This commit is contained in:
Mark Hatle
2010-09-02 13:40:45 -05:00
committed by Richard Purdie
parent a2116860eb
commit 7e36135a7e
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch Normal file
View File

@@ -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;

3
meta/recipes-devtools/rpm/rpm_5.1.10.bb
View File

@@ -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 \
"