mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
opkg: fix remove pkg with --force-removal-of-dependent-packages failed
opkg remove perl --force-removal-of-dependent-packages ... Removing package perl-module-extutils-mm-dos from root... ... Removing package perl-module-extutils-mm-dos from root... You can force removal of packages with failed prerm scripts with the option: --force-remove No packages removed. Collected errors: * pkg_run_script: Internal error: perl-module-extutils-mm-dos has a NULL tmp_unpack_dir. * opkg_remove_pkg: not removing package "perl-module-extutils-mm-dos", prerm script failed ... 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. [YOCTO #6819] (From OE-Core rev: 476f864b1564265469b5c9074c1f262bce21f119) (From OE-Core rev: 4e2da43842c6bbf5abf7ae9c6601bf7a6f1114da) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5211fb73f0
commit
6af63cc898
+38
@@ -0,0 +1,38 @@
|
|||||||
|
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
|
||||||
@@ -4,6 +4,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
|
|||||||
file://no-install-recommends.patch \
|
file://no-install-recommends.patch \
|
||||||
file://add-exclude.patch \
|
file://add-exclude.patch \
|
||||||
file://opkg-configure.service \
|
file://opkg-configure.service \
|
||||||
|
file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/${BPN}-${PV}"
|
S = "${WORKDIR}/${BPN}-${PV}"
|
||||||
|
|||||||
Reference in New Issue
Block a user