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)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/opkg/opkg/fix_installorder.patch b/meta/recipes-devtools/opkg/opkg/fix_installorder.patch
index e782ce738dfe0f179a23e9cf9b5a2a22a9057955..5e6c40d649a4a614eeb66cf338b3e81dd81a64c4 100644 (file)
--- a/meta/recipes-devtools/opkg/opkg/fix_installorder.patch
+++ b/meta/recipes-devtools/opkg/opkg/fix_installorder.patch
@@ -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)

diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 00591d168f250cb89bab948924fea53bd820d5b3..f5f540d78e99b2a1fffdc4b8c9a12a15a84e232a 100644 (file)
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -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}"