opkg: backport upstream fixes, code cleanups

[openwrt/staging/lynxis.git] / package / system / opkg / Makefile

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index 22a1c93ef4cb6f954c67ee8ad8c55b5b7346637b..4760e5d875fcd67e62fbccbac1dfd24eb83ee331 100644 (file)
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -12,12 +12,13 @@ include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=opkg
 PKG_RELEASE:=1
+PKG_FLAGS:=essential
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.lede-project.org/project/opkg-lede.git
-PKG_SOURCE_DATE:=2017-02-22
-PKG_SOURCE_VERSION:=271d485c10f2070573b25e740b93839945dbcd9d
-PKG_MIRROR_HASH:=f48fcbc9f509629aec30bca6aeaf78d831c9a041ac87468f7429d20361384ca9
+PKG_SOURCE_DATE:=2017-03-23
+PKG_SOURCE_VERSION:=1d0263bb40e3c099501fc1f2431907636230e7f2
+PKG_MIRROR_HASH:=1f527179e60b9404affa5f3c9c506d4249e085bf521f770819b8648273a1010c
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
@@ -25,7 +26,14 @@ PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
 PKG_FLAGS := nonshared
-PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES
+
+PKG_CONFIG_DEPENDS := \
+       CONFIG_SIGNED_PACKAGES \
+       CONFIG_TARGET_INIT_PATH \
+       CONFIG_PER_FEED_REPO \
+       CONFIG_PER_FEED_REPO_ADD_DISABLED \
+       CONFIG_PER_FEED_REPO_ADD_COMMENTED \
+       $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
 
 PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PARALLEL:=1
@@ -68,6 +76,7 @@ EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
 CMAKE_OPTIONS += \
        -DBUILD_TESTS=OFF \
        -DHOST_CPU=$(PKGARCH) \
+       -DPATH_SPEC="$(TARGET_INIT_PATH)" \
        -DVERSION="$(PKG_SOURCE_VERSION) ($(PKG_SOURCE_DATE))"
 
 CMAKE_HOST_OPTIONS += \