Merge pull request #7 from coolsnowwolf/master
merge newest source from lean
This commit is contained in:
CN_SZTL
GitHub
commit
eaa0870504
@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
|
||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
||||
endif
|
||||
|
||||
LINUX_VERSION-4.9 = .177
|
||||
LINUX_VERSION-4.14 = .120
|
||||
LINUX_VERSION-4.19 = .44
|
||||
LINUX_VERSION-4.9 = .178
|
||||
LINUX_VERSION-4.14 = .121
|
||||
LINUX_VERSION-4.19 = .45
|
||||
|
||||
LINUX_KERNEL_HASH-4.9.177 = c73b1e3ebcc35b653f7b673ca151fc67b814bdb27269799fa7cda251827887ee
|
||||
LINUX_KERNEL_HASH-4.14.120 = ddb8e86cf65e6f53f782bc46f026823b6b3fc472aa1385b601f22dce2dbccb4c
|
||||
LINUX_KERNEL_HASH-4.19.44 = 707642e993775618a5afa039b1058fa49f1c0faada46e8cdcb976241bca6b288
|
||||
LINUX_KERNEL_HASH-4.9.178 = 13ffd8b0725d9ce9f9e927f4748ef640b049d7c69f21b28ca0d976cc23072566
|
||||
LINUX_KERNEL_HASH-4.14.121 = 2eecd6825a0998c8b6dd686cd4cd76e9f0d195bbace89f0b82495cc11ddb2884
|
||||
LINUX_KERNEL_HASH-4.19.45 = eb31e62fbb30aaeedb892cecdd8ac9746d42cbbef2ef2356f9ca8e13514b9d2b
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||
|
||||
@ -12,9 +12,9 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
|
||||
PKG_SOURCE_DATE:=2018-11-23
|
||||
PKG_SOURCE_VERSION:=d6673547adc3768ce674799fa35952351866c9d0
|
||||
PKG_MIRROR_HASH:=ee11e1f652e9268e21dfd7835d26993c682ed33f6ba474c283cb9ef04f71e626
|
||||
PKG_SOURCE_DATE:=2019-05-30
|
||||
PKG_SOURCE_VERSION:=ade00ca585a49c8478bf60eb24ce385676be37a4
|
||||
PKG_MIRROR_HASH:=1417727ae6fcda01017e1bec3ec66e3e78116f9343cfe0256e40af54c52f2acc
|
||||
CMAKE_INSTALL:=1
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
@ -45,6 +45,7 @@ define Package/procd
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox +libubus
|
||||
TITLE:=OpenWrt system process manager
|
||||
USERID:=:dialout=20 :audio=29
|
||||
endef
|
||||
|
||||
define Package/procd-ujail
|
||||
@ -57,7 +58,7 @@ endef
|
||||
define Package/procd-seccomp
|
||||
SECTION:=base
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=@arm||@armeb||@mips||@mipsel||@i386||@x86_64 @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json
|
||||
DEPENDS:=@arm||@armeb||@mips||@mipsel||@i386||@powerpc||@x86_64 @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json
|
||||
TITLE:=OpenWrt process seccomp helper + utrace
|
||||
endef
|
||||
|
||||
|
||||
@ -20,6 +20,10 @@
|
||||
[ "regex", "DEVNAME", "^snd" ],
|
||||
[ "makedev", "/dev/%DEVNAME%", "0660", "audio" ]
|
||||
],
|
||||
[ "if",
|
||||
[ "regex", "DEVNAME", "^tty" ],
|
||||
[ "makedev", "/dev/%DEVNAME%", "0660", "dialout" ]
|
||||
],
|
||||
[ "if",
|
||||
[ "has", "DEVNAME" ],
|
||||
[ "makedev", "/dev/%DEVNAME%", "0600" ]
|
||||
|
||||
@ -18,14 +18,21 @@
|
||||
# file: configuration files (array)
|
||||
# netdev: bound network device (detects ifindex changes)
|
||||
# limits: resource limits (passed to the process)
|
||||
# user info: array with 1 values $username
|
||||
# user: $username to run service as
|
||||
# group: $groupname to run service as
|
||||
# pidfile: file name to write pid into
|
||||
# stdout: boolean whether to redirect commands stdout to syslog (default: 0)
|
||||
# stderr: boolean whether to redirect commands stderr to syslog (default: 0)
|
||||
# facility: syslog facility used when logging to syslog (default: daemon)
|
||||
#
|
||||
# No space separation is done for arrays/tables - use one function argument per command line argument
|
||||
#
|
||||
# procd_close_instance():
|
||||
# Complete the instance being prepared
|
||||
#
|
||||
# procd_running(service, [instance]):
|
||||
# Checks if service/instance is currently running
|
||||
#
|
||||
# procd_kill(service, [instance]):
|
||||
# Kill a service instance (or all instances)
|
||||
#
|
||||
@ -41,6 +48,7 @@ _PROCD_SERVICE=
|
||||
procd_lock() {
|
||||
local basescript=$(readlink "$initscript")
|
||||
local service_name="$(basename ${basescript:-$initscript})"
|
||||
|
||||
}
|
||||
|
||||
_procd_call() {
|
||||
@ -240,7 +248,7 @@ _procd_set_param() {
|
||||
reload_signal)
|
||||
json_add_int "$type" $(kill -l "$1")
|
||||
;;
|
||||
pidfile|user|seccomp|capabilities)
|
||||
pidfile|user|group|seccomp|capabilities|facility)
|
||||
json_add_string "$type" "$1"
|
||||
;;
|
||||
stdout|stderr|no_new_privs)
|
||||
@ -389,6 +397,18 @@ _procd_add_instance() {
|
||||
_procd_close_instance
|
||||
}
|
||||
|
||||
procd_running() {
|
||||
local service="$1"
|
||||
local instance="${2:-instance1}"
|
||||
local running
|
||||
|
||||
json_init
|
||||
json_add_string name "$service"
|
||||
running=$(_procd_ubus_call list | jsonfilter -e "@.$service.instances.${instance}.running")
|
||||
|
||||
[ "$running" = "true" ]
|
||||
}
|
||||
|
||||
_procd_kill() {
|
||||
local service="$1"
|
||||
local instance="$2"
|
||||
@ -477,6 +497,23 @@ uci_validate_section()
|
||||
return $_error
|
||||
}
|
||||
|
||||
uci_load_validate() {
|
||||
local _package="$1"
|
||||
local _type="$2"
|
||||
local _name="$3"
|
||||
local _function="$4"
|
||||
local _option
|
||||
local _result
|
||||
shift; shift; shift; shift
|
||||
for _option in "$@"; do
|
||||
eval "local ${_option%%:*}"
|
||||
done
|
||||
uci_validate_section "$_package" "$_type" "$_name" "$@"
|
||||
_result=$?
|
||||
[ -n "$_function" ] || return $_result
|
||||
eval "$_function \"\$_name\" \"\$_result\""
|
||||
}
|
||||
|
||||
_procd_wrapper \
|
||||
procd_open_service \
|
||||
procd_close_service \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user