opkg: gracefully handle missing $PATH, fix build warnings

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

diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index 4fccef28bd9935d59f3650ffec960b8df7d25b2e..3bd2a034e9d7d73448571bf650af3f918566ee47 100644 (file)
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -16,9 +16,9 @@ PKG_FLAGS:=essential
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.lede-project.org/project/opkg-lede.git
-PKG_SOURCE_DATE:=2017-03-01
-PKG_SOURCE_VERSION:=19070b6c1a9718bf7ceaa61c48f328cabf1d5ca7
-PKG_MIRROR_HASH:=7fa506c752db01fff47522141e8349603485368ae955315fc41754aec9ecee13
+PKG_SOURCE_DATE:=2017-03-15
+PKG_SOURCE_VERSION:=cfe46c7d5787df0bd643d44e8f985107b562300e
+PKG_MIRROR_HASH:=abc0c125c856318a457add3d2c5ec668464ed962ccfc688ea1cbd5047b435f23
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
@@ -26,7 +26,7 @@ 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
 
 PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PARALLEL:=1
@@ -69,6 +69,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 += \