From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 18 Jun 2006 18:26:00 +0000 (+0000)
Subject: rename br2684.init to br2684.hotplug, normalize Makefile.
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fdedeckeh.git;a=commitdiff_plain;h=adbb4c3e335459cffc016f328fdcac44be09ce9a

rename br2684.init to br2684.hotplug, normalize Makefile.

SVN-Revision: 3996
---

diff --git a/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile
index 5b75e19552..e37d5bdceb 100644
--- a/openwrt/package/linux-atm/Makefile
+++ b/openwrt/package/linux-atm/Makefile
@@ -17,18 +17,18 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(TOPDIR)/package/rules.mk
 
 define Package/linux-atm
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=Linux ATM Library
- DESCRIPTION:=Library for accessing the Linux ATM subsystem
+SECTION:=libs
+CATEGORY:=Libraries
+TITLE:=Linux ATM Library
+DESCRIPTION:=Library for accessing the Linux ATM subsystem
 endef
 
 define Package/br2684ctl
- SECTION:=net
- CATEGORY:=Network
- TITLE:=RFC2684 bridging
- DEPENDS:=+linux-atm
- DESCRIPTION:=ATM RFC2684 bridging utility
+SECTION:=net
+CATEGORY:=Network
+TITLE:=RFC2684 bridging
+DEPENDS:=+linux-atm
+DESCRIPTION:=ATM RFC2684 bridging utility
 endef
 
 define Build/Configure
@@ -51,22 +51,23 @@ define Package/linux-atm/install
 endef
 
 define Package/br2684ctl/install
+	install -d -m0755 $(1)/etc/hotplug.d/net
+	install -m0644 ./files/br2684.hotplug $(1)/etc/hotplug.d/net/30-br2684
 	install -d -m0755 $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(1)/usr/sbin/
-	install -d -m0755 $(1)/etc/hotplug.d/net
-	install -m0644 ./files/br2684.init $(1)/etc/hotplug.d/net/30-br2684
 endef
 
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/
+	$(CP)	$(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h \
+		$(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \
+		$(STAGING_DIR)/usr/lib/
 endef
 
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/atm{,d,sap}.h \
+	rm -rf	$(STAGING_DIR)/usr/include/atm{,d,sap}.h \
 		$(STAGING_DIR)/usr/lib/libatm.{a,so*}
 endef
 
diff --git a/openwrt/package/linux-atm/files/br2684.hotplug b/openwrt/package/linux-atm/files/br2684.hotplug
new file mode 100644
index 0000000000..242e7e5152
--- /dev/null
+++ b/openwrt/package/linux-atm/files/br2684.hotplug
@@ -0,0 +1,19 @@
+[ "${INTERFACE%%[0-9]*}" = "atm" ] && {
+	case "$ACTION" in
+		register)
+			[ "$pppoe_atm" = 1 ] && {
+				case "$atm_encaps" in
+					0|vc) ENCAPS=0 ;;
+					1|llc) ENCAPS=1 ;;
+					*) ENCAPS=0 ;;
+				esac
+				insmod br2684 2>&- >&-
+				br2684ctl -c0 -e${ENCAPS} -a${atm_vpi:-8}.${atm_vci:-35} &
+			}
+		;;
+		unregister)
+			killall br2684ctl 2>&- >&-
+			rmmod br2684
+		;;
+	esac
+}
diff --git a/openwrt/package/linux-atm/files/br2684.init b/openwrt/package/linux-atm/files/br2684.init
deleted file mode 100644
index 242e7e5152..0000000000
--- a/openwrt/package/linux-atm/files/br2684.init
+++ /dev/null
@@ -1,19 +0,0 @@
-[ "${INTERFACE%%[0-9]*}" = "atm" ] && {
-	case "$ACTION" in
-		register)
-			[ "$pppoe_atm" = 1 ] && {
-				case "$atm_encaps" in
-					0|vc) ENCAPS=0 ;;
-					1|llc) ENCAPS=1 ;;
-					*) ENCAPS=0 ;;
-				esac
-				insmod br2684 2>&- >&-
-				br2684ctl -c0 -e${ENCAPS} -a${atm_vpi:-8}.${atm_vci:-35} &
-			}
-		;;
-		unregister)
-			killall br2684ctl 2>&- >&-
-			rmmod br2684
-		;;
-	esac
-}