From 8b125fe5a8f7b51f123a9d2103780f723241fdb1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 16 Mar 2015 13:30:34 +0000 Subject: opkg: drop already applied patch This patch was part of the 0.2.4 release. (From OE-Core rev: 85ab25f57c478fcf430f611fbf365348d2edf26b) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- ...g_remove.c-avoid-remove-pkg-repeatly-with.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch (limited to 'meta/recipes-devtools/opkg/opkg') 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 5e5eafcd97..0000000000 --- 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 -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 - ---- - 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 - -- cgit v1.2.3-54-g00ecf