mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
opkg: Fix installation order in feeds with mutiple providers of packages
If two packages were available of differing priority, this would confuse opkg and it was ignoring the dependency in the new dependency ordering code. This changes it not to ignore these cases by setting the badly named 'quiet' parameter accordingly. (From OE-Core rev: c38693f78c968ab5f4bb557c20d1c8c55393ed6b) (From OE-Core rev: 4c75318b75c4776cc469cc2c6511596bc7befbb4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -144,7 +144,7 @@ Index: trunk/libopkg/pkg_depends.c
|
||||
+ pkg_t *satisfying_pkg =
|
||||
+ pkg_hash_fetch_best_installation_candidate(satisfying_apkg,
|
||||
+ pkg_installed_and_constraint_satisfied,
|
||||
+ dependence_to_satisfy, 1);
|
||||
+ dependence_to_satisfy, 0);
|
||||
+ /* Being that I can't test constraing in pkg_hash, I will test it here */
|
||||
+ if (satisfying_pkg != NULL && satisfying_pkg != pkg) {
|
||||
+ if (pkg_constraint_satisfied(satisfying_pkg, dependence_to_satisfy) && satisfying_pkg->state_want == SW_INSTALL)
|
||||
|
||||
@@ -21,7 +21,7 @@ S = "${WORKDIR}/trunk"
|
||||
|
||||
SRCREV = "633"
|
||||
PV = "0.1.8+svnr${SRCPV}"
|
||||
PR = "r4"
|
||||
PR = "r5"
|
||||
|
||||
PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user