diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2012-10-21 18:40:40 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-23 12:27:14 +0100 |
| commit | 08a5ef44c7aa58ffcad0457e8dda3504f2c3192b (patch) | |
| tree | 7bb92f2dd795816d038657acc4a17572a4a79acd | |
| parent | 800b256390b22c3d3d8d6a69f6fb668376a5030b (diff) | |
| download | openembedded-core-08a5ef44c7aa58ffcad0457e8dda3504f2c3192b.tar.gz openembedded-core-08a5ef44c7aa58ffcad0457e8dda3504f2c3192b.tar.bz2 openembedded-core-08a5ef44c7aa58ffcad0457e8dda3504f2c3192b.zip | |
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]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ +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. + +Bug info: +https://bugzilla.yoctoproject.org/show_bug.cgi?id=2431 + +Upstream-Status: Pending +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> + +Index: trunk/libopkg/pkg_depends.c +=================================================================== +--- trunk.orig/libopkg/pkg_depends.c 2011-09-03 05:54:56.000000000 +0300 ++++ trunk/libopkg/pkg_depends.c 2012-10-20 22:23:03.783573202 +0300 +@@ -785,8 +785,7 @@ + for (i = 0; i < count; i++) { + depends = &pkg->depends[i]; + if (depends->type != PREDEPEND +- && depends->type != DEPEND +- && depends->type != RECOMMEND) ++ && depends->type != DEPEND) + continue; + for (j = 0; j < depends->possibility_count; j++) { + 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 \ file://0009-pkg_depends-fix-version-constraints.patch \ file://0010-pkg_depends-fix-version_constraints_satisfied.patch \ file://opkg-no-sync-offline.patch \ + file://don-t-add-recommends-pkgs-to-depended-upon-by.patch \ " S = "${WORKDIR}/trunk" |