summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-03-16 13:30:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:48 +0000
commit8b125fe5a8f7b51f123a9d2103780f723241fdb1 (patch)
tree178fa19048ef885f3d98ff181b5eadf1d9f0133f
parent2c11ccf93af2f789c33b87fc0a4ed748f7d6f262 (diff)
downloadpoky-8b125fe5a8f7b51f123a9d2103780f723241fdb1.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch39
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.4.bb1
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 5e5eafcd97..0000000000
--- a/meta/recipes-devtools/opkg/opkg/libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 41425d67d3589b1912416a17f740d6407c7834f2 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 8 Oct 2014 19:53:13 +0800
4Subject: [PATCH] libopkg/opkg_remove.c: avoid remove pkg repeatly with option
5 --force-removal-of-dependent-packages
6
7While remove pkg with '--force-removal-of-dependent-packages',
8pkg may be added to pkgs remove list multiple times, add status
9check to make sure pkg only be removed once.
10
11Upstream-Status: Backport
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
14---
15 libopkg/opkg_remove.c | 8 ++++++++
16 1 file changed, 8 insertions(+)
17
18diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
19index 34f9154..a225e41 100644
20--- a/libopkg/opkg_remove.c
21+++ b/libopkg/opkg_remove.c
22@@ -250,6 +250,14 @@ opkg_remove_pkg(pkg_t *pkg, int from_upgrade)
23 if ((parent_pkg = pkg->parent) == NULL)
24 return 0;
25
26+ /* While remove pkg with '--force-removal-of-dependent-packages',
27+ pkg may be added to remove list multiple times, add status
28+ check to make sure pkg only be removed once. */
29+ if (conf->force_removal_of_dependent_packages &&
30+ pkg->state_flag & SF_FILELIST_CHANGED &&
31+ pkg->state_status == SS_NOT_INSTALLED)
32+ return 0;
33+
34 /* only attempt to remove dependent installed packages if
35 * force_depends is not specified or the package is being
36 * replaced.
37--
381.9.1
39
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 447f3f6cc2..23a32e61cd 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"
12SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ 12SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
13 file://no-install-recommends.patch \ 13 file://no-install-recommends.patch \
14 file://add-exclude.patch \ 14 file://add-exclude.patch \
15 file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
16 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ 15 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
17 file://opkg-configure.service \ 16 file://opkg-configure.service \
18 file://opkg.conf \ 17 file://opkg.conf \