From 4d814c32da333cd04e34375e2598b533c3bb32d6 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 13 Mar 2014 07:42:59 +0000 Subject: [PATCH] 72ca3bfc401a4f1b695dcc86640dddee62716cea contained too many files Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39908 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/mdnsd/Makefile | 41 --------- package/network/services/mdnsd/files/relay.hotplug | 2 - package/network/services/mdnsd/files/relay.init | 101 --------------------- 3 files changed, 144 deletions(-) delete mode 100644 package/network/services/mdnsd/Makefile delete mode 100644 package/network/services/mdnsd/files/relay.hotplug delete mode 100644 package/network/services/mdnsd/files/relay.init diff --git a/package/network/services/mdnsd/Makefile b/package/network/services/mdnsd/Makefile deleted file mode 100644 index 3d68c790cd..0000000000 --- a/package/network/services/mdnsd/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=mdnsd -PKG_VERSION:=2014-01-19 -PKG_RELEASE=$(PKG_SOURCE_VERSION) - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=git://nbd.name/mdnsd.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=8f771a5bcfd7f99e2ab8c68f1932c9d7c6804e96 - -PKG_MAINTAINER:=John Crispin - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/mdnsd - SECTION:=net - CATEGORY:=Network - TITLE:=Multicast DNS Daemon - DEPENDS:=+libubox +libubus +libblobmsg-json -endef - -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include - -define Package/mdnsd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdnsd $(1)/usr/sbin/ -# $(INSTALL_DIR) $(1)/etc/init.d -# $(INSTALL_BIN) ./files/relay.init $(1)/etc/init.d/relayd -endef - -$(eval $(call BuildPackage,mdnsd)) diff --git a/package/network/services/mdnsd/files/relay.hotplug b/package/network/services/mdnsd/files/relay.hotplug deleted file mode 100644 index afffbfeab8..0000000000 --- a/package/network/services/mdnsd/files/relay.hotplug +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/etc/init.d/relayd enabled && /etc/init.d/relayd start diff --git a/package/network/services/mdnsd/files/relay.init b/package/network/services/mdnsd/files/relay.init deleted file mode 100644 index d73df6ab55..0000000000 --- a/package/network/services/mdnsd/files/relay.init +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (c) 2011-2012 OpenWrt.org - -START=80 - -USE_PROCD=1 -PROG=/usr/sbin/relayd - -resolve_ifname() { - grep -qs "^ *$1:" /proc/net/dev && { - procd_append_param command -I "$1" - append ifaces "$1" - } -} - -resolve_network() { - local ifn - fixup_interface "$1" - config_get ifn "$1" ifname - [ -z "$ifn" ] && return 1 - resolve_ifname "$ifn" -} - -start_relay() { - local cfg="$1" - - local args="" - local ifaces="" - - config_get proto "$cfg" proto - [[ "$proto" == relay ]] || return 0 - - SERVICE_DAEMONIZE=1 - SERVICE_WRITE_PID=1 - SERVICE_PID_FILE="/var/run/relay-$cfg.pid" - [ -f "$SERVICE_PID_FILE" ] && { - if grep -q relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then - return 0 - else - rm -f "$SERVICE_PID_FILE" - fi - } - - procd_open_instance - procd_set_param command "$PROG" - - local net networks - config_get networks "$cfg" network - for net in $networks; do - resolve_network "$net" || { - return 1 - } - done - - local ifn ifnames - config_get ifnames "$cfg" ifname - for ifn in $ifnames; do - resolve_ifname "$ifn" - done - - local ipaddr - config_get ipaddr "$cfg" ipaddr - [ -n "$ipaddr" ] && procd_append_param command -L "$ipaddr" - - local gateway - config_get gateway "$cfg" gateway - [ -n "$gateway" ] && procd_append_param command -G "$gateway" - - local expiry # = 30 - config_get expiry "$cfg" expiry - [ -n "$expiry" ] && procd_append_param command "$expiry" - - local retry # = 5 - config_get retry "$cfg" retry - [ -n "$retry" ] && procd_append_param command -p "$retry" - - local table # = 16800 - config_get table "$cfg" table - [ -n "$table" ] && procd_append_param command -T "$table" - - local fwd_bcast # = 1 - config_get_bool fwd_bcast "$cfg" forward_bcast 1 - [ $fwd_bcast -eq 1 ] && procd_append_param command "-B" - - local fwd_dhcp # = 1 - config_get_bool fwd_dhcp "$cfg" forward_dhcp 1 - [ $fwd_dhcp -eq 1 ] && procd_append_param command "-D" - - procd_close_instance -} - -service_triggers() -{ - procd_add_reload_trigger "network" -} - -start_service() { - include /lib/network - config_load network - config_foreach start_relay interface -} -- 2.11.0