From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 2 Nov 2020 20:46:03 +0000 (+0000)
Subject: opkg: fix dependency resolution
X-Git-Tag: v21.02.0-rc1~1198
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a2b1ff7fbd7aa910c2e29ae43d27fdddc58b177;p=openwrt%2Fstaging%2Fchunkeey.git

opkg: fix dependency resolution

The previous commit broke opkg in a way that it would no longer
include dependencies when installing a package, effectively leading
to broken images and unusable systems.
Fix that by making sure dependencies are still going to be checked.
Also reduce size of struct abstract_pkg as suggested by @jow- while at
it.

Fixes: 1445d333aa ("opkg: bump to git HEAD")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index d876ce7895..5893d76c74 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -14,9 +14,9 @@ PKG_FLAGS:=essential
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git
-PKG_SOURCE_DATE:=2020-10-30
-PKG_SOURCE_VERSION:=8769c75199b4668878176bde0e5faebf3bc61663
-PKG_MIRROR_HASH:=601af77e6855e30fd9b82184bf3cdbc9395fe46ad971a65c8ad5e1329e94c545
+PKG_SOURCE_DATE:=2020-11-02
+PKG_SOURCE_VERSION:=11ee06ea67ebe6a6f11323ad5a6d3c77071488cd
+PKG_MIRROR_HASH:=ea2ee68ea56910e4bf8a43da919665b58d301bbb0e523b0c525a36d0f221387f
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING