procd: ubox: update to latest git head

move log service from procd to ubox
some debloating on procd
the preinit part of procd is now also a seperate binary

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38822 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 4 insertions, 63 deletions

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 5c51f54752..6cce8045d0 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_VERSION:=2013-11-13
+PKG_VERSION:=2013-11-15
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f9d31edb8938341b9217ee4c14eb58111414eb97
+PKG_SOURCE_VERSION:=93d71ca996eb50b951169414cf541bf0fe4f647e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -30,15 +30,12 @@ define Package/procd
 endef
 
 define Package/procd/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/lib/functions $(1)/etc/init.d $(1)/lib
+	$(INSTALL_DIR) $(1)/sbin  $(1)/etc $(1)/lib/functions
 
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{procd,askfirst,udevtrigger,logread,validate_data} $(1)/sbin/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/{init,procd,askfirst,udevtrigger} $(1)/sbin/
 	$(INSTALL_BIN) ./files/reload_config $(1)/sbin/
-	$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
 	$(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/
 	$(INSTALL_DATA) ./files/procd.sh $(1)/lib/functions/
-	ln -s /sbin/procd $(1)/sbin/init
 endef
 
 $(eval $(call BuildPackage,procd))
diff --git a/package/system/procd/files/log.init b/package/system/procd/files/log.init
deleted file mode 100644
index cd7d9965a0..0000000000
--- a/package/system/procd/files/log.init
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013 OpenWrt.org
-
-# start after and stop before networking
-START=21
-STOP=89
-
-USE_PROCD=1
-PROG=/sbin/logread
-
-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
-}
-
-start_service_remote()
-{
-	local pid_file="/var/run/logread.${PIDCOUNT}.pid"
-	local log_ip log_port log_proto
-
-	config_get log_ip $1 log_ip
-	config_get log_port $1 log_port
-	config_get log_proto $1 log_proto udp
-	config_get log_prefix $1 log_prefix
-
-	[ -z "${log_ip}" ] && return
-
-	procd_open_instance
-	procd_set_param command "$PROG" -f -r "$log_ip" "${log_port:-514}" -p "$pid_file"
-	[ "${log_proto}" != "udp" ] || procd_append_param command -u
-	[ -z "${log_prefix}" ] || procd_append_param command -P ${log_prefix}
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "system" "/etc/init.d/log" "start"
-}
-
-start_service()
-{
-	config_load system
-	config_foreach start_service_file system
-	config_foreach start_service_remote system
-}