summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2017-10-02 07:25:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:23:57 +0000
commit59cbf692992befd605935ce0880ba77078e3cfd1 (patch)
tree8e1724985478f28f53337b6213fd73f7ce2b846b /meta
parent02f64e5db85abea708dc6c384acc8b37f1521f23 (diff)
downloadpoky-59cbf692992befd605935ce0880ba77078e3cfd1.tar.gz
libsolv: fix a kernel-devsrc installation issue
We encountered a problem when installing kernel-devsrc package on a intel-x86 target, as follows: $ dnf install kernel-devsrc | Installing : kernel-devsrc-1.0-r0.0.intel_corei7_64 1/1 | failed loading RPMDB | The downloaded packages were saved in cache until the next successful transaction. | You can remove cached packages by executing 'dnf clean packages'. It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE in libsolv per test. (From OE-Core rev: 2987ec994705abb7dd18738ba1719aef9d72049a) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch35
-rw-r--r--meta/recipes-extended/libsolv/libsolv_0.6.28.bb3
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch b/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch
new file mode 100644
index 0000000000..4a4e5cba25
--- /dev/null
+++ b/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch
@@ -0,0 +1,35 @@
1From 1c4c935cb73ac1ccb9693df1a51ba218a22e8ca8 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Sat, 30 Sep 2017 11:15:16 +0800
4Subject: [PATCH] repo_rpmdb.c: increase MAX_HDR_CNT and MAX_HDR_DSIZE
5
6Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/230]
7
8We encountered 'corrupt rpm' issues when installing extreme big RPM
9packages like the kernel-devsrc package of Yocto project.
10
11It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE per test.
12
13Signed-off-by: Ming Liu <liu.ming50@gmail.com>
14---
15 ext/repo_rpmdb.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
19index c7000a9..7000835 100644
20--- a/ext/repo_rpmdb.c
21+++ b/ext/repo_rpmdb.c
22@@ -170,8 +170,8 @@
23 #define MAX_SIG_CNT 0x100000
24 #define MAX_SIG_DSIZE 0x100000
25
26-#define MAX_HDR_CNT 0x100000
27-#define MAX_HDR_DSIZE 0x2000000
28+#define MAX_HDR_CNT 0x200000
29+#define MAX_HDR_DSIZE 0x4000000
30
31 typedef struct rpmhead {
32 int cnt;
33--
342.7.4
35
diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.28.bb b/meta/recipes-extended/libsolv/libsolv_0.6.28.bb
index 3a48f22b5f..6c8f7fc73b 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.6.28.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.6.28.bb
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
8DEPENDS = "expat zlib rpm" 8DEPENDS = "expat zlib rpm"
9 9
10SRC_URI = "git://github.com/openSUSE/libsolv.git \ 10SRC_URI = "git://github.com/openSUSE/libsolv.git \
11 " 11 file://0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch \
12 "
12SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ 13SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \
13 file://0002-Fixes-to-internal-fopencookie-implementation.patch \ 14 file://0002-Fixes-to-internal-fopencookie-implementation.patch \
14 " 15 "