summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-10-21 18:40:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-23 12:28:32 +0100
commite702a1abfff62780ee28b7487564d4b8243cc084 (patch)
tree0882947a431d8d233ec4d8ef06931e270521ebd2 /meta
parent2df8db417d9c2813145ffb27d5f5ad19fb6a505d (diff)
downloadpoky-e702a1abfff62780ee28b7487564d4b8243cc084.tar.gz
opkg: Add patch to fix removing packages with recommends
While removing a package with opkg, the process shouldn't be blocked if another package RECOMMENDS the package wanted to be removed. This is because, while generating the dependencies, opkg adds dependencies to depended_upon_by even if dependency's type is RECOMMEND. The fix is to skip dependencies of type RECOMMEND while constructing depended_upon_by. [YOCTO: #2431] (From OE-Core rev: 08a5ef44c7aa58ffcad0457e8dda3504f2c3192b) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/opkg/opkg/don-t-add-recommends-pkgs-to-depended-upon-by.patch26
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb1
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/don-t-add-recommends-pkgs-to-depended-upon-by.patch b/meta/recipes-devtools/opkg/opkg/don-t-add-recommends-pkgs-to-depended-upon-by.patch
new file mode 100644
index 0000000000..e581dc009c
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/don-t-add-recommends-pkgs-to-depended-upon-by.patch
@@ -0,0 +1,26 @@
1While removing a package with opkg, the process shouldn't be blocked if
2another package RECOMMENDS the package wanted to be removed. This is
3because, while generating the dependencies, opkg adds dependencies to
4depended_upon_by even if dependency's type is RECOMMEND. The fix is to
5skip dependencies of type RECOMMEND while constructing depended_upon_by.
6
7Bug info:
8https://bugzilla.yoctoproject.org/show_bug.cgi?id=2431
9
10Upstream-Status: Pending
11Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
12
13Index: trunk/libopkg/pkg_depends.c
14===================================================================
15--- trunk.orig/libopkg/pkg_depends.c 2011-09-03 05:54:56.000000000 +0300
16+++ trunk/libopkg/pkg_depends.c 2012-10-20 22:23:03.783573202 +0300
17@@ -785,8 +785,7 @@
18 for (i = 0; i < count; i++) {
19 depends = &pkg->depends[i];
20 if (depends->type != PREDEPEND
21- && depends->type != DEPEND
22- && depends->type != RECOMMEND)
23+ && depends->type != DEPEND)
24 continue;
25 for (j = 0; j < depends->possibility_count; j++) {
26 ab_depend = depends->possibilities[j]->pkg;
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 4e83cfb3c0..3a90677648 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -12,6 +12,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
12 file://0009-pkg_depends-fix-version-constraints.patch \ 12 file://0009-pkg_depends-fix-version-constraints.patch \
13 file://0010-pkg_depends-fix-version_constraints_satisfied.patch \ 13 file://0010-pkg_depends-fix-version_constraints_satisfied.patch \
14 file://opkg-no-sync-offline.patch \ 14 file://opkg-no-sync-offline.patch \
15 file://don-t-add-recommends-pkgs-to-depended-upon-by.patch \
15" 16"
16 17
17S = "${WORKDIR}/trunk" 18S = "${WORKDIR}/trunk"