diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/fix_installorder.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg_svn.bb | 2 |
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 9dd10b28e1..6a7e6dbb4b 100644 --- a/meta/recipes-devtools/opkg/opkg/fix_installorder.patch +++ b/meta/recipes-devtools/opkg/opkg/fix_installorder.patch | |||
@@ -147,7 +147,7 @@ Index: trunk/libopkg/pkg_depends.c | |||
147 | + dependence_to_satisfy, 0); | 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 || satisfying_pkg->state_want == SW_UNKNOWN)) |
151 | + pkg_vec_insert(satisfiers, satisfying_pkg); | 151 | + pkg_vec_insert(satisfiers, satisfying_pkg); |
152 | + } | 152 | + } |
153 | + | 153 | + |
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index a0667ac6fe..4146b7e018 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb | |||
@@ -14,4 +14,4 @@ S = "${WORKDIR}/trunk" | |||
14 | SRCREV = "633" | 14 | SRCREV = "633" |
15 | PV = "0.1.8+svnr${SRCPV}" | 15 | PV = "0.1.8+svnr${SRCPV}" |
16 | 16 | ||
17 | PR = "${INC_PR}.1" | 17 | PR = "${INC_PR}.2" |