summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-02-18 19:01:08 -0600
committerSaul Wold <sgw@linux.intel.com>2011-02-18 20:51:30 -0800
commit0a8f4f45b66ad5d51dea91a406a17555252dfe42 (patch)
tree8f470259f85c1d9fbd6d15448f85e599c8fa897e /meta
parent9f0f7c43900e36610411b1d7901adf3d8f109f70 (diff)
downloadpoky-0a8f4f45b66ad5d51dea91a406a17555252dfe42.tar.gz
rpm: Increase the number of solvedb's allowed
Increase the number of allowed solvedb's to 20 from the original 5. We also add an additional error message to RPM incase the 20 is ever exceeded. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch29
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb3
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch b/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
new file mode 100644
index 0000000000..5c1819c367
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
@@ -0,0 +1,29 @@
1Increase the maximum number of solver databases!
2
3Previously the max was set to 5, up this to 20... this should be more
4then enough for now.. also add an RPM_ERROR message in case we exceed the
5new maximum.
6
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8
9diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c
10--- rpm-5.4.0.orig/rpmio/rpmbag.c 2010-10-17 21:43:55.000000000 -0500
11+++ rpm-5.4.0/rpmio/rpmbag.c 2011-02-18 18:46:00.246892502 -0600
12@@ -16,7 +16,7 @@
13 /*@unchecked@*/
14 int _rpmbag_debug = 0;
15
16-static size_t _maxnsdbp = 5;
17+static size_t _maxnsdbp = 20;
18
19 static void rpmbagFini(void * _bag)
20 /*@globals fileSystem @*/
21@@ -70,6 +70,8 @@
22 sdbp[i] = xcalloc(1, sizeof(*sdbp[i]));
23 sdbp[i]->dbmode = dbmode;
24 sdbp[i]->_db = _db;
25+ } else if (bag && bag->sdbp && bag->nsdbp >= _maxnsdbp) {
26+ rpmlog(RPMLOG_ERR, _("Attempted to open more then %d solver databases. Increase _maxnsdbp in rpmio/rpmbag.c\n"), _maxnsdbp);
27 }
28
29 return 0;
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 45dd4e1ee2..ac9df6fa82 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1"
43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" 43LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
44 44
45DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt" 45DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt"
46PR = "r12" 46PR = "r13"
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...
@@ -55,6 +55,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
55 file://rpm-platform.patch \ 55 file://rpm-platform.patch \
56 file://rpm-showrc.patch \ 56 file://rpm-showrc.patch \
57 file://rpm-nofsync.patch \ 57 file://rpm-nofsync.patch \
58 file://rpm-solvedb.patch \
58 " 59 "
59 60
60# file://hdraddorappend.patch \ 61# file://hdraddorappend.patch \