Browse Source

Merge pull request #11264 from neheb/rhgerg3343

avahi: convert to procd
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
1f26fad34a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 22 deletions
  1. +3
    -7
      libs/avahi/Makefile
  2. +10
    -15
      libs/avahi/files/avahi-daemon.init

+ 3
- 7
libs/avahi/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=avahi PKG_NAME:=avahi
PKG_VERSION:=0.7 PKG_VERSION:=0.7
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION) \ PKG_SOURCE_URL:=https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION) \
@ -17,6 +17,8 @@ PKG_SOURCE_URL:=https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSIO
PKG_HASH:=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 PKG_HASH:=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:avahi:avahi PKG_CPE_ID:=cpe:/a:avahi:avahi
PKG_BUILD_DEPENDS:=intltool/host PKG_BUILD_DEPENDS:=intltool/host
@ -26,12 +28,6 @@ PKG_REMOVE_FILES:=autogen.sh
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
ifeq ($(BUILD_VARIANT),dbus)
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION)
else
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION)
endif
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/avahi/Default define Package/avahi/Default


+ 10
- 15
libs/avahi/files/avahi-daemon.init View File

@ -2,22 +2,17 @@
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
START=61 START=61
BIN=avahi-daemon
DEFAULT=/etc/default/$BIN
OPTIONS="-D"
RUN_D=/var/run/$BIN
USE_PROCD=1
PROG=avahi-daemon
start() {
[ -f $DEFAULT ] && . $DEFAULT
mkdir -p $RUN_D
$BIN $OPTIONS
start_service() {
procd_open_instance
procd_set_param command "$PROG"
procd_append_param command -s
procd_set_param respawn
procd_close_instance
} }
stop() {
$BIN -k
reload_service() {
procd_send_signal "$PROG"
} }
reload() {
$BIN -r
}

Loading…
Cancel
Save