From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 2 Nov 2020 23:22:26 +0000 (+0000)
Subject: opkg: fix yet another dependency resolution bug
X-Git-Tag: v21.02.0-rc1~1197
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f5c5a8abd2704e3e1c8a3c28c7eb1236436eb475;p=openwrt%2Fopenwrt.git

opkg: fix yet another dependency resolution bug

The previous fix of a fix caused yet another problem leading to
`opkg show-upgradable` ending up in an infinite loop.
Fix that.

Fixes: 4a2b1ff7fb ("opkg: fix dependency resolution")
Reported-by: Huangbin Zhan <zhanhb88@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index 5893d76c74..ece90aa139 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -9,14 +9,14 @@ 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
 PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git
 PKG_SOURCE_DATE:=2020-11-02
-PKG_SOURCE_VERSION:=11ee06ea67ebe6a6f11323ad5a6d3c77071488cd
-PKG_MIRROR_HASH:=ea2ee68ea56910e4bf8a43da919665b58d301bbb0e523b0c525a36d0f221387f
+PKG_SOURCE_VERSION:=383748952eb927737de89a5791599a0ca8f96c4d
+PKG_MIRROR_HASH:=54538b90e66a738d94ab6236173d36621f72a0214ca155201586906b27cf07fe
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING