summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg/fix_installorder.patch2
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/fix_installorder.patch b/meta/recipes-devtools/opkg/opkg/fix_installorder.patch
index e782ce738d..5e6c40d649 100644
--- 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
144+ pkg_t *satisfying_pkg = 144+ pkg_t *satisfying_pkg =
145+ pkg_hash_fetch_best_installation_candidate(satisfying_apkg, 145+ pkg_hash_fetch_best_installation_candidate(satisfying_apkg,
146+ pkg_installed_and_constraint_satisfied, 146+ pkg_installed_and_constraint_satisfied,
147+ dependence_to_satisfy, 1); 147+ dependence_to_satisfy, 0);
148+ /* Being that I can't test constraing in pkg_hash, I will test it here */ 148+ /* Being that I can't test constraing in pkg_hash, I will test it here */
149+ if (satisfying_pkg != NULL && satisfying_pkg != pkg) { 149+ if (satisfying_pkg != NULL && satisfying_pkg != pkg) {
150+ if (pkg_constraint_satisfied(satisfying_pkg, dependence_to_satisfy) && satisfying_pkg->state_want == SW_INSTALL) 150+ 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 00591d168f..f5f540d78e 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/trunk"
21 21
22SRCREV = "633" 22SRCREV = "633"
23PV = "0.1.8+svnr${SRCPV}" 23PV = "0.1.8+svnr${SRCPV}"
24PR = "r4" 24PR = "r5"
25 25
26PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" 26PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
27 27