From 89a1c8c2e6393ed1f5f667036845b752d5277beb Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Fri, 2 Feb 2018 15:33:14 +0200 Subject: 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 Signed-off-by: Ross Burton --- ....c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch | 35 ---------------------- meta/recipes-extended/libsolv/libsolv_0.6.29.bb | 31 ------------------- meta/recipes-extended/libsolv/libsolv_0.6.31.bb | 30 +++++++++++++++++++ 3 files changed, 30 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch delete mode 100644 meta/recipes-extended/libsolv/libsolv_0.6.29.bb create mode 100644 meta/recipes-extended/libsolv/libsolv_0.6.31.bb (limited to 'meta/recipes-extended/libsolv') 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 -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 ---- - 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.29.bb deleted file mode 100644 index 78972e5fed..0000000000 --- a/meta/recipes-extended/libsolv/libsolv_0.6.29.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Library for solving packages and reading repositories" -HOMEPAGE = "https://github.com/openSUSE/libsolv" -BUGTRACKER = "https://github.com/openSUSE/libsolv/issues" -SECTION = "devel" -LICENSE = "BSD-3-Clause" -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" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPLEX_DEPS=ON" - -PACKAGES =+ "${PN}-tools ${PN}ext" - -FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}ext = "${libdir}/${PN}ext.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.31.bb b/meta/recipes-extended/libsolv/libsolv_0.6.31.bb new file mode 100644 index 0000000000..96c366b2c2 --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv_0.6.31.bb @@ -0,0 +1,30 @@ +SUMMARY = "Library for solving packages and reading repositories" +HOMEPAGE = "https://github.com/openSUSE/libsolv" +BUGTRACKER = "https://github.com/openSUSE/libsolv/issues" +SECTION = "devel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" + +DEPENDS = "expat zlib rpm" + +SRC_URI = "git://github.com/openSUSE/libsolv.git \ + " +SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ + file://0002-Fixes-to-internal-fopencookie-implementation.patch \ + " + +SRCREV = "bef46d75f6d2537060114eea0f3a892e958ad5e0" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPLEX_DEPS=ON" + +PACKAGES =+ "${PN}-tools ${PN}ext" + +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}ext = "${libdir}/${PN}ext.so.*" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg