Fix dhcp-forwarder build, move init-script to ./files/

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

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 7fc50c1..872489f 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -74,7 +74,7 @@ package-$(BR2_PACKAGE_USBUTILS) += usbutils
 package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_ZLIB) += zlib
-package-$(BR2_PACKAGE_DHCPFWD) += dhcp-forwarder
+package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(BR2_PACKAGE_LIBGD) += libgd
 package-$(BR2_PACKAGE_LIBNET) += libnet
 package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql

diff --git a/openwrt/package/dhcp-forwarder/Config.in b/openwrt/package/dhcp-forwarder/Config.in
index 34ff1c0..7cddf97 100644 (file)
--- a/openwrt/package/dhcp-forwarder/Config.in
+++ b/openwrt/package/dhcp-forwarder/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_DHCP_FORWARDER
-       tristate "dhcp-forwarder (a DHCP relay agent)"
+       tristate "dhcp-forwarder - a DHCP relay agent"
        default m if CONFIG_DEVEL
        help
          A DHCP relay agent

diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile
index 7b9f238..7da1928 100644 (file)
--- a/openwrt/package/dhcp-forwarder/Makefile
+++ b/openwrt/package/dhcp-forwarder/Makefile
@@ -56,10 +56,10 @@ $(PKG_BUILD_DIR)/.built:
        touch $(PKG_BUILD_DIR)/.built
        
 $(IPKG_DHCP_FORWARDER):
-       install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d
-       install -m0755 ./ipkg/$(PKG_NAME).init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
        install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc
        install -m0644 $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(IDIR_DHCP_FORWARDER)/etc/
+       install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d
+       install -m0755 ./files/dhcp-fwd.init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
        install -m0755 -d $(IDIR_DHCP_FORWARDER)/usr/bin
        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/
        $(RSTRIP) $(IDIR_DHCP_FORWARDER)

diff --git a/openwrt/package/dhcp-forwarder/files/dhcp-fwd.init b/openwrt/package/dhcp-forwarder/files/dhcp-fwd.init
new file mode 100644 (file)
index 0000000..6ad3858
--- /dev/null
+++ b/openwrt/package/dhcp-forwarder/files/dhcp-fwd.init
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+LOG_D=/var/log
+RUN_D=/var/run
+PID_F=$RUN_D/dhcpd-fwd.pid
+
+case $1 in
+ start)
+  [ -d $LOG_D ] || mkdir -p $LOG_D
+  [ -d $RUN_D ] || mkdir -p $RUN_D
+  dhcp-fwd
+  ;;
+ stop)
+  [ -f $PID_F ] && kill $(cat $PID_F)
+  ;;
+ *)
+  echo "usage: $0 (start|stop)"
+  exit 1
+esac
+
+exit $?

diff --git a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init
deleted file mode 100644 (file)
index 6ad3858..0000000
--- a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-LOG_D=/var/log
-RUN_D=/var/run
-PID_F=$RUN_D/dhcpd-fwd.pid
-
-case $1 in
- start)
-  [ -d $LOG_D ] || mkdir -p $LOG_D
-  [ -d $RUN_D ] || mkdir -p $RUN_D
-  dhcp-fwd
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F)
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
-
-exit $?