Changeset 36001

Timestamp:

2013-03-13T19:11:07+01:00 (5 years ago)

Author:

blogic

Message:

[procd] update to latest git head

Signed-off-by: John Crispin <blogic@…>

Location:

trunk/package/procd

Files:

• Makefile (modified) (5 diffs)
• files/hotplug-preinit.json (added)
• files/hotplug.json (added)

trunk/package/procd/Makefile

@@ -2 +2 @@
 
 PKG_NAME:=procd
-PKG_VERSION:=2012-12-20
+PKG_VERSION:=2012-03-13
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
@@ -8 +8 @@
 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
@@ -14 +14 @@
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=
+
+PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
@@ -23 +25 @@
   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
@@ -34 +46 @@
         $(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
 endef
+endif
 
 $(eval $(call BuildPackage,procd))