diff options
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/don-t-add-recommends-pkgs-to-depended-upon-by.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_svn.bb | 1 |
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 @@ | |||
| 1 | While removing a package with opkg, the process shouldn't be blocked if | ||
| 2 | another package RECOMMENDS the package wanted to be removed. This is | ||
| 3 | because, while generating the dependencies, opkg adds dependencies to | ||
| 4 | depended_upon_by even if dependency's type is RECOMMEND. The fix is to | ||
| 5 | skip dependencies of type RECOMMEND while constructing depended_upon_by. | ||
| 6 | |||
| 7 | Bug info: | ||
| 8 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=2431 | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
| 12 | |||
| 13 | Index: 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 | ||
| 17 | S = "${WORKDIR}/trunk" | 18 | S = "${WORKDIR}/trunk" |
