summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-13 23:40:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-14 09:50:31 +0100
commit25af7f6ed1d8e416a26716d63d99020a87e114ea (patch)
tree336f005d8bc350924eb78f1fa713bf0f92ed447e
parent0d67446b35b944507f67392b2726b988e58511d9 (diff)
downloadpoky-25af7f6ed1d8e416a26716d63d99020a87e114ea.tar.gz
opkg: Fix package dependency issue for preinsts
When processing dependencies, we need to look for both the SW_INSTALL and SW_UNKNOWN states. If we don't do this, dependencies can be missed and preinst scripts can run before dependencies are all installed. This leads to package installation errors for packages like dbus-1 and associated user permission errors. (From OE-Core rev: 119ef2789484222b94559675a09adc399f3b6bf0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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"
14SRCREV = "633" 14SRCREV = "633"
15PV = "0.1.8+svnr${SRCPV}" 15PV = "0.1.8+svnr${SRCPV}"
16 16
17PR = "${INC_PR}.1" 17PR = "${INC_PR}.2"