diff options
| author | Mathias Kresin <dev@kresin.me> | 2018-01-06 18:38:35 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-01-10 08:08:53 +0100 |
| commit | 18f49449b0f5438ddf643e0473f35382e09ea4cb (patch) | |
| tree | ef52d66b7a373e3c12f659d4bddee54cc045acc0 /package/network/config | |
| parent | d3fd38637febad007bcc692bd79d5af08a17689d (diff) | |
| download | upstream-18f49449b0f5438ddf643e0473f35382e09ea4cb.tar.gz upstream-18f49449b0f5438ddf643e0473f35382e09ea4cb.tar.bz2 upstream-18f49449b0f5438ddf643e0473f35382e09ea4cb.zip | |
ltq-xdsl-app: drop script for renaming the netdev
Our netdevs are named dsl by default now, the rename via scripts isn't
required anymore.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/network/config')
4 files changed, 6 insertions, 22 deletions
diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index cf8eaf247d..4abff03555 100644 --- a/package/network/config/ltq-adsl-app/Makefile +++ b/package/network/config/ltq-adsl-app/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=dsl_cpe_control_danube PKG_VERSION:=3.24.4.4 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION) PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/ @@ -35,7 +35,7 @@ define Package/ltq-adsl-app CATEGORY:=Network TITLE:=Lantiq DSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ip + DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread MENU:=1 endef @@ -76,11 +76,10 @@ CONFIGURE_ARGS += \ TARGET_CFLAGS += -I$(LINUX_DIR)/include define Package/ltq-adsl-app/install - $(INSTALL_DIR) $(1)/etc/init.d $(1)/sbin $(1)/etc/hotplug.d/dsl $(1)/etc/hotplug.d/net + $(INSTALL_DIR) $(1)/etc/init.d $(1)/sbin $(1)/etc/hotplug.d/dsl $(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/ $(INSTALL_BIN) ./files/10_atm.sh $(1)/etc/hotplug.d/dsl $(INSTALL_BIN) ./files/10_ptm.sh $(1)/etc/hotplug.d/dsl - $(INSTALL_BIN) ./files/10-adsl_rename $(1)/etc/hotplug.d/net $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dsl_cpe_control $(1)/sbin endef diff --git a/package/network/config/ltq-adsl-app/files/10-adsl_rename b/package/network/config/ltq-adsl-app/files/10-adsl_rename deleted file mode 100644 index f81a90a5f8..0000000000 --- a/package/network/config/ltq-adsl-app/files/10-adsl_rename +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$ACTION" = add ]; then - [ "$DEVICENAME" = "nas0" ] || [ "$DEVICENAME" = "ptm0" ] || exit - - ip link set $DEVICENAME name dsl0 -fi diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index baf63f9d13..3481dae0fb 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-vdsl-app PKG_VERSION:=4.17.18.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BASE_NAME:=dsl_cpe_control PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources @@ -28,7 +28,7 @@ define Package/ltq-vdsl-app CATEGORY:=Network TITLE:=Lantiq VDSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +ip + DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt endef define Package/ltq-vdsl-app/description @@ -58,11 +58,10 @@ CONFIGURE_ARGS += \ #CONFIGURE_ARGS += --enable-model=debug define Package/ltq-vdsl-app/install - $(INSTALL_DIR) $(1)/etc/init.d $(1)/sbin $(1)/etc/hotplug.d/dsl $(1)/etc/hotplug.d/net + $(INSTALL_DIR) $(1)/etc/init.d $(1)/sbin $(1)/etc/hotplug.d/dsl $(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/ $(INSTALL_BIN) ./files/10_atm.sh $(1)/etc/hotplug.d/dsl $(INSTALL_BIN) ./files/10_ptm.sh $(1)/etc/hotplug.d/dsl - $(INSTALL_BIN) ./files/10-xdsl_rename $(1)/etc/hotplug.d/net $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dsl_cpe_control $(1)/sbin/vdsl_cpe_control $(INSTALL_BIN) ./files/dsl_cpe_pipe.sh $(1)/sbin/ diff --git a/package/network/config/ltq-vdsl-app/files/10-xdsl_rename b/package/network/config/ltq-vdsl-app/files/10-xdsl_rename deleted file mode 100644 index f81a90a5f8..0000000000 --- a/package/network/config/ltq-vdsl-app/files/10-xdsl_rename +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$ACTION" = add ]; then - [ "$DEVICENAME" = "nas0" ] || [ "$DEVICENAME" = "ptm0" ] || exit - - ip link set $DEVICENAME name dsl0 -fi |