X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fprocd%2FMakefile;h=b94cd2e78bab6b494d117d081d2c5a7c1383daff;hp=8cb1d30742d71c981ebc5754c101b2b614ee1d1a;hb=dad4462bf5b87c2ca279f788ea6b6cb6a86ddd04;hpb=e7436a23180eea12132ae059b71f7f557d2e0510

diff --git a/package/procd/Makefile b/package/procd/Makefile
index 8cb1d30742..b94cd2e78b 100644
--- a/package/procd/Makefile
+++ b/package/procd/Makefile
@@ -1,34 +1,33 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_VERSION:=2013-03-13
+PKG_VERSION:=2013-06-19
 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:=8158e9052afbf2ee47de645167b90b6e7fc7d86d
+PKG_SOURCE_VERSION:=c23413feeb5179911d623e6ffb84b36671652788
 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>
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
+
 define Package/procd
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+ubusd +ubus +libjson-script
+  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_EGLIBC:librt
   TITLE:=OpenWrt system process manager
 endef
 
-ifneq ($(CONFIG_PROCD_INIT),)
 define Package/procd/install
 	$(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc
 
@@ -37,14 +36,5 @@ define Package/procd/install
 	$(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
-
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/procd $(1)/sbin/
-	$(INSTALL_BIN) ./files/procd.init $(1)/etc/init.d/procd
-	$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
-endef
-endif
 
 $(eval $(call BuildPackage,procd))