EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

procd: update to latest git revision

Browse Source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37206
This commit is contained in:
John Crispin 2013-07-08 16:35:19 +00:00
parent 09f23981f4
commit 9004e560fe
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/system/procd/Makefile
View File

@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=procd PKG_NAME:=procd
PKG_VERSION:=2013-07-04 PKG_VERSION:=2013-07-08
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=3283d681f9da65b500ad0cb3d4550cb840ed481a PKG_SOURCE_VERSION:=725e6bbbe403a950c0ddcd23cb521ffefa705c7d
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
@ -29,9 +29,10 @@ define Package/procd
endef endef
define Package/procd/install define Package/procd/install
$(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc $(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc/init.d
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{procd,askfirst,udevtrigger,logread} $(1)/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{procd,askfirst,udevtrigger,logread} $(1)/sbin/
$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
$(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/ $(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/
$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/ $(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
ln -s /sbin/procd $(1)/sbin/init ln -s /sbin/procd $(1)/sbin/init

53
package/system/procd/files/log.init Normal file
View File

@ -0,0 +1,53 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2013 OpenWrt.org
# start after and stop before networking
START=21
STOP=89
USE_PROCD=1
NAME=logread
PROG=/sbin/logread
PIDCOUNT=1
start_service_file()
{
local pid_file="/var/run/logread.${PIDCOUNT}.pid"
local log_file log_size
config_get log_file $1 log_file
config_get log_size $1 log_size
[ -z "${log_file}" ] && return
procd_open_instance
procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
[ -n "${log_size}" ] && procd_append_param command -S "$log_size"
procd_close_instance
PIDCOUNT="$(( ${PIDCOUNT} + 1))"
}
start_service_remote()
{
local pid_file="/var/run/logread.${PIDCOUNT}.pid"
local log_ip log_port
config_get log_ip $1 log_ip
config_get log_port $1 log_port
[ -z "${log_port}" -o -z "${log_ip}" ] && return
procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "$log_port" -p "$pid_file"
procd_close_instance
PIDCOUNT="$(( ${PIDCOUNT} + 1))"
}
start_service()
{
config_load system
config_foreach start_service_file system
config_foreach start_service_remote system
}