diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-03-16 13:30:34 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 10:59:06 +0000 |
| commit | 85ab25f57c478fcf430f611fbf365348d2edf26b (patch) | |
| tree | a27cf133ae1c89ca22609d7c2230d8277e3e4233 /meta | |
| parent | 9a687f73a4422c788dad68d74d992dc68cb80b35 (diff) | |
| download | openembedded-core-contrib-85ab25f57c478fcf430f611fbf365348d2edf26b.tar.gz | |
opkg: drop already applied patch
This patch was part of the 0.2.4 release.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.2.4.bb | 1 |
2 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch b/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch deleted file mode 100644 index 5e5eafcd973..00000000000 --- a/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 41425d67d3589b1912416a17f740d6407c7834f2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 8 Oct 2014 19:53:13 +0800 -Subject: [PATCH] libopkg/opkg_remove.c: avoid remove pkg repeatly with option - --force-removal-of-dependent-packages - -While remove pkg with '--force-removal-of-dependent-packages', -pkg may be added to pkgs remove list multiple times, add status -check to make sure pkg only be removed once. - -Upstream-Status: Backport -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - libopkg/opkg_remove.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c -index 34f9154..a225e41 100644 ---- a/libopkg/opkg_remove.c -+++ b/libopkg/opkg_remove.c -@@ -250,6 +250,14 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade) - if ((parent_pkg = pkg->parent) == NULL) - return 0; - -+ /* While remove pkg with '--force-removal-of-dependent-packages', -+ pkg may be added to remove list multiple times, add status -+ check to make sure pkg only be removed once. */ -+ if (conf->force_removal_of_dependent_packages && -+ pkg->state_flag & SF_FILELIST_CHANGED && -+ pkg->state_status == SS_NOT_INSTALLED) -+ return 0; -+ - /* only attempt to remove dependent installed packages if - * force_depends is not specified or the package is being - * replaced. --- -1.9.1 - diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb index 447f3f6cc25..23a32e61cd4 100644 --- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb +++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb @@ -12,7 +12,6 @@ PE = "1" SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://no-install-recommends.patch \ file://add-exclude.patch \ - file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \ file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ file://opkg-configure.service \ file://opkg.conf \ |