From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 8 Feb 2016 14:28:42 +0000 (+0000)
Subject: procd: honor CONFIG_TARGET_INIT_PATH
X-Git-Tag: reboot~469
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a8936bde1f21ce12ca85a0585eed0a2392180221;p=openwrt%2Fstaging%2Fnoltari.git

procd: honor CONFIG_TARGET_INIT_PATH

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 48677
---

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 180698d106..9cee5c2cf2 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_VERSION:=2016-02-04
+PKG_VERSION:=2016-02-08
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(OPENWRT_GIT)/project/procd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e08f52e4f5fb1f20c09e7c69a616b76dc4710d6b
+PKG_SOURCE_VERSION:=57fe34225206c572b5e049826505f738191e4db5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -24,12 +24,19 @@ PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
-PKG_CONFIG_DEPENDS:= CONFIG_KERNEL_SECCOMP CONFIG_NAND_SUPPORT CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP \
+	CONFIG_NAND_SUPPORT CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \
 	CONFIG_KERNEL_NAMESPACES CONFIG_PACKAGE_procd-ujail CONFIG_PACKAGE_procd-seccomp
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+ifeq ($(DUMP),)
+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) echo $(CONFIG_TARGET_INIT_PATH) | md5s)
+endif
+
+CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)"
 TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
 
 define Package/procd