aboutsummaryrefslogtreecommitdiffstats
path: root/package/procd/Makefile
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-03-13 18:11:07 +0000
committerJohn Crispin <blogic@openwrt.org>2013-03-13 18:11:07 +0000
commit1ce7b5d12def555c10776b822a44c4419150b386 (patch)
tree0fa39987acd10ea570cfd4455583be2dfcc54742 /package/procd/Makefile
parentdcb02ff0806c752b039ceaac7990fdac0e96e909 (diff)
downloadupstream-1ce7b5d12def555c10776b822a44c4419150b386.tar.gz
upstream-1ce7b5d12def555c10776b822a44c4419150b386.tar.bz2
upstream-1ce7b5d12def555c10776b822a44c4419150b386.zip
[procd] update to latest git head
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36001 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/procd/Makefile')
-rw-r--r--package/procd/Makefile19
1 files changed, 16 insertions, 3 deletions
diff --git a/package/procd/Makefile b/package/procd/Makefile
index 0330905577..25b0271b37 100644
--- a/package/procd/Makefile
+++ b/package/procd/Makefile
@@ -1,19 +1,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=procd
-PKG_VERSION:=2012-12-20
+PKG_VERSION:=2012-03-13
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d343dd9e9a64d4ae7d225ea29169e97fa8d116a1
+PKG_SOURCE_VERSION:=8158e9052afbf2ee47de645167b90b6e7fc7d86d
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1
PKG_LICENSE:=GPLv2
PKG_LICENSE_FILES:=
+PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT
+
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
include $(INCLUDE_DIR)/package.mk
@@ -22,10 +24,20 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/procd
SECTION:=base
CATEGORY:=Base system
- DEPENDS:=+ubusd +ubus
+ DEPENDS:=+ubusd +ubus +libjson_script
TITLE:=OpenWrt system process manager
endef
+ifneq ($(CONFIG_PROCD_INIT),)
+define Package/procd/install
+ $(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc
+
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{procd,askfirst,udevtrigger,logread} $(1)/sbin/
+ $(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/
+ $(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
+ ln -s /sbin/procd $(1)/sbin/init
+endef
+else
define Package/procd/install
$(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc/init.d
@@ -33,5 +45,6 @@ define Package/procd/install
$(INSTALL_BIN) ./files/procd.init $(1)/etc/init.d/procd
$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
endef
+endif
$(eval $(call BuildPackage,procd))