diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2018-02-02 15:33:14 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 10:54:39 +0000 |
| commit | 89a1c8c2e6393ed1f5f667036845b752d5277beb (patch) | |
| tree | 2eb554035a07db9a79352efd952b266a83ebbe7a | |
| parent | 29c4b19e640b544c9c351aec4292a3f65b619998 (diff) | |
| download | openembedded-core-89a1c8c2e6393ed1f5f667036845b752d5277beb.tar.gz | |
libsolv: upgrade to version 0.6.31
Remove upstreamed patch:
0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-extended/libsolv/libsolv_0.6.31.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.6.29.bb) | 3 |
2 files changed, 1 insertions, 37 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 deleted file mode 100644 index 4a4e5cba25..0000000000 --- a/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1c4c935cb73ac1ccb9693df1a51ba218a22e8ca8 Mon Sep 17 00:00:00 2001 -From: Ming Liu <liu.ming50@gmail.com> -Date: Sat, 30 Sep 2017 11:15:16 +0800 -Subject: [PATCH] repo_rpmdb.c: increase MAX_HDR_CNT and MAX_HDR_DSIZE - -Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/230] - -We encountered 'corrupt rpm' issues when installing extreme big RPM -packages like the kernel-devsrc package of Yocto project. - -It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE per test. - -Signed-off-by: Ming Liu <liu.ming50@gmail.com> ---- - ext/repo_rpmdb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c -index c7000a9..7000835 100644 ---- a/ext/repo_rpmdb.c -+++ b/ext/repo_rpmdb.c -@@ -170,8 +170,8 @@ - #define MAX_SIG_CNT 0x100000 - #define MAX_SIG_DSIZE 0x100000 - --#define MAX_HDR_CNT 0x100000 --#define MAX_HDR_DSIZE 0x2000000 -+#define MAX_HDR_CNT 0x200000 -+#define MAX_HDR_DSIZE 0x4000000 - - typedef struct rpmhead { - int cnt; --- -2.7.4 - diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.29.bb b/meta/recipes-extended/libsolv/libsolv_0.6.31.bb index 78972e5fed..96c366b2c2 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.6.29.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.6.31.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib rpm" SRC_URI = "git://github.com/openSUSE/libsolv.git \ - file://0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch \ " SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ file://0002-Fixes-to-internal-fopencookie-implementation.patch \ " -SRCREV = "765be095eaeaef1b1d2a84f6a0e00d5abf677ae9" +SRCREV = "bef46d75f6d2537060114eea0f3a892e958ad5e0" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |