split linux-atm, br2684ctl, add br2684 init script

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

diff --git a/openwrt/package/linux-atm/Config.in b/openwrt/package/linux-atm/Config.in
index 8d75c9d..885c554 100644 (file)
--- a/openwrt/package/linux-atm/Config.in
+++ b/openwrt/package/linux-atm/Config.in
@@ -2,6 +2,16 @@ config BR2_PACKAGE_LINUX_ATM
        tristate "linux-atm - ATM Library/Utilities for Linux"
        default y if BR2_LINUX_2_4_AR7
        help
-         ATM Library/Utilities for linux
+         ATM Library for linux
+         
+         http://ftp.debian.org/debian/pool/main/l/linux-atm/
+
+config BR2_PACKAGE_BR2684CTL
+       tristate "br2684ctl - RFC2684 bridging utility"
+       default y if BR2_LINUX_2_4_AR7
+       depends BR2_PACKAGE_LINUX_ATM
+       help
+         Utility for setting up ATM RFC2684 bridging mode
+         Useful for PPPoE
          
          http://ftp.debian.org/debian/pool/main/l/linux-atm/

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index 4bad57a..ef91e28 100644 (file)
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -18,9 +18,11 @@ include $(TOPDIR)/package/rules.mk
 
 ifneq ($(BOARD),ar7)
 BR2_PACKAGE_LINUX_ATM:=m
+BR2_PACKAGE_BR2684CTL:=m
 endif
 
 $(eval $(call PKG_template,LINUX_ATM,linux-atm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BR2684CTL,br2684ctl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -60,11 +62,17 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_LINUX_ATM): 
        install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib
        cp $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib
-       install -d -m0755 $(IDIR_LINUX_ATM)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_LINUX_ATM)/usr/sbin/
        $(RSTRIP) $(IDIR_LINUX_ATM)/
        $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR)
 
+$(IPKG_BR2684CTL): 
+       install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/
+       install -d -m0755 $(IDIR_BR2684CTL)/etc/init.d
+       install -m0755 ./files/br2684.init $(IDIR_BR2684CTL)/etc/init.d/S30br2684
+       $(RSTRIP) $(IDIR_BR2684CTL)/
+       $(IPKG_BUILD) $(IDIR_BR2684CTL) $(PACKAGE_DIR)
+
 $(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/

diff --git a/openwrt/package/linux-atm/files/br2684.init b/openwrt/package/linux-atm/files/br2684.init
new file mode 100644 (file)
index 0000000..90ba365
--- /dev/null
+++ b/openwrt/package/linux-atm/files/br2684.init
@@ -0,0 +1,22 @@
+#!/bin/sh
+. /etc/functions.sh
+[ -e /etc/config/network ] && . /etc/config/network
+
+killall br2684ctl 2>&- >&-
+[ "$(nvram get pppoe_atm)" = 1 ] && {
+  VPI=$(nvram get atm_vpi)
+  VCI=$(nvram get atm_vci)
+  case "$(nvram get atm_encaps)" in
+    0|vc)
+      ENCAPS=0
+      ;;
+    1|llc)
+      ENCAPS=1
+      ;;
+    *)
+      ENCAPS=0
+      ;;
+  esac
+  insmod br2684
+  br2684ctl -c0 -e${ENCAPS} -a${VPI:-8}.${VCI:-35} &
+}

diff --git a/openwrt/package/linux-atm/ipkg/br2684ctl.control b/openwrt/package/linux-atm/ipkg/br2684ctl.control
new file mode 100644 (file)
index 0000000..6c87f66
--- /dev/null
+++ b/openwrt/package/linux-atm/ipkg/br2684ctl.control
@@ -0,0 +1,6 @@
+Package: br2684ctl
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <openwrt@nbd.name>
+Source: buildroot internal
+Description: Utility for configuring the ATM RFC2684 bridging

diff --git a/openwrt/package/linux-atm/ipkg/linux-atm.control b/openwrt/package/linux-atm/ipkg/linux-atm.control
index b465792..e683304 100644 (file)
--- a/openwrt/package/linux-atm/ipkg/linux-atm.control
+++ b/openwrt/package/linux-atm/ipkg/linux-atm.control
@@ -1,6 +1,6 @@
 Package: linux-atm
 Priority: optional
 Section: net
-Maintainer: nobody
+Maintainer: Felix Fietkau <openwrt@nbd.name>
 Source: buildroot internal
-Description: ATM library and utilities for linux
+Description: ATM library for linux