diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-12-12 23:08:05 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-06 17:34:46 +0100 |
| commit | 1b6e9b3f64344aa17bdb2dc7b89bb2765305dbe5 (patch) | |
| tree | c4b160f0d4225cd47367bc800523cf2303046426 | |
| parent | cdd9bee3704358b705e10773ec10d460f8eaac42 (diff) | |
| download | upstream-1b6e9b3f64344aa17bdb2dc7b89bb2765305dbe5.tar.gz upstream-1b6e9b3f64344aa17bdb2dc7b89bb2765305dbe5.tar.bz2 upstream-1b6e9b3f64344aa17bdb2dc7b89bb2765305dbe5.zip | |
opkg: add patch to avoid remove package repeatly with force
This patch was taken from the OpenWrt-devel mailing list:
https://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg59794.html
It is included already in OpenWrt master branch and OpenWrt 22.03
release as it was included in opkg-lede repository:
https://git.openwrt.org/?p=project/opkg-lede.git;a=commit;h=9c44557a776da993c2ab80cfac4dbd8d59807d01
However, it is not included in OpenWrt 21.02, where the same issue is
happening.
Fixes: CI for https://github.com/openwrt/packages/pull/20074
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
| -rw-r--r-- | package/system/opkg/Makefile | 2 | ||||
| -rw-r--r-- | package/system/opkg/patches/0001-opkg_remove-avoid-remove-pkg-repeatly-with-option-fo.patch | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 405c74ec80..38ce346b38 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=opkg -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git diff --git a/package/system/opkg/patches/0001-opkg_remove-avoid-remove-pkg-repeatly-with-option-fo.patch b/package/system/opkg/patches/0001-opkg_remove-avoid-remove-pkg-repeatly-with-option-fo.patch new file mode 100644 index 0000000000..06695e12c5 --- /dev/null +++ b/package/system/opkg/patches/0001-opkg_remove-avoid-remove-pkg-repeatly-with-option-fo.patch @@ -0,0 +1,36 @@ +From 1026cbe58f6ee78fd9e00e9f72a965727414e155 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 7 Sep 2021 18:42:45 -0400 +Subject: [PATCH] opkg_remove: 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. + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Paul Barker <paul@paulbarker.me.uk> +(Cherry picked from https://git.yoctoproject.org/cgit/cgit.cgi/opkg/commit/?id=e8996180833aa35d101fbeadec3d787ce0bbda5c) +(Fixes https://dev.archive.openwrt.org/ticket/18320 and openwrt/packages CI) +(cherry picked from commit 9c44557a776da993c2ab80cfac4dbd8d59807d01) +--- + libopkg/opkg_remove.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/libopkg/opkg_remove.c ++++ b/libopkg/opkg_remove.c +@@ -249,6 +249,14 @@ int opkg_remove_pkg(pkg_t * pkg, int fro + 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. |