mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
libsolv: update to 0.7.4
Removed patch has been upstreammed. (From OE-Core rev: 450af6cf5c38da1cb44fd57ac1da3d2d3f037544) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ab2be4385e
commit
f3d8794b8a
-33
@@ -1,33 +0,0 @@
|
|||||||
From 19d7cc87adba92d31d5fafdf7db00920d24a96a6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
|
|
||||||
Date: Wed, 6 Feb 2019 13:24:04 -0600
|
|
||||||
Subject: [PATCH] solver_solve: only disfavor recommends if there are any
|
|
||||||
|
|
||||||
In a repo that have pkg 'a' and 'b' available, and 'b' is disfavored,
|
|
||||||
but 'a' doesn't recommend 'b', libsolv segfaults on
|
|
||||||
solver_addrecommendsrules, since solv->recommendsruleq is null. Only
|
|
||||||
call solver_addrecommendsrules if there are recommends rules.
|
|
||||||
|
|
||||||
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
|
|
||||||
|
|
||||||
Upstream-Status: Accepted
|
|
||||||
---
|
|
||||||
src/solver.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/solver.c b/src/solver.c
|
|
||||||
index a80090d19..ad78327a8 100644
|
|
||||||
--- a/src/solver.c
|
|
||||||
+++ b/src/solver.c
|
|
||||||
@@ -3920,7 +3920,7 @@ solver_solve(Solver *solv, Queue *job)
|
|
||||||
else
|
|
||||||
solv->yumobsrules = solv->yumobsrules_end = solv->nrules;
|
|
||||||
|
|
||||||
- if (solv->havedisfavored && solv->strongrecommends)
|
|
||||||
+ if (solv->havedisfavored && solv->strongrecommends && solv->recommendsruleq)
|
|
||||||
solver_addrecommendsrules(solv);
|
|
||||||
else
|
|
||||||
solv->recommendsrules = solv->recommendsrules_end = solv->nrules;
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
+2
-2
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
|
|||||||
DEPENDS = "expat zlib"
|
DEPENDS = "expat zlib"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/openSUSE/libsolv.git \
|
SRC_URI = "git://github.com/openSUSE/libsolv.git \
|
||||||
file://0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch \
|
|
||||||
file://0001-build-use-GNUInstallDirs.patch \
|
file://0001-build-use-GNUInstallDirs.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRCREV = "dc7d0f1c3113f2c8217563166906bef3eb5d1ee1"
|
SRCREV = "51fc3b1214aa9677e972712fa1ce6916e438751f"
|
||||||
|
|
||||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
|
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
Reference in New Issue
Block a user