diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-12-04 17:42:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-12-04 17:42:51 +0000 |
| commit | 435e7fb2955833118880c4dc0bffb19a40651bbc (patch) | |
| tree | 8576ef73d208fa43b1ff56b68ea8b44965fdd114 | |
| parent | cc59f31e44d2f134dbb9510d0fca714452c560a5 (diff) | |
| download | upstream-435e7fb2955833118880c4dc0bffb19a40651bbc.tar.gz upstream-435e7fb2955833118880c4dc0bffb19a40651bbc.tar.bz2 upstream-435e7fb2955833118880c4dc0bffb19a40651bbc.zip | |
lantiq: move esi calls to dsl_cpe_control scripts to fix ordering wrt. loading vr9 drivers
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47764
| -rw-r--r-- | package/network/config/ltq-adsl-app/files/dsl_control | 2 | ||||
| -rw-r--r-- | package/network/config/ltq-vdsl-app/Makefile | 2 | ||||
| -rw-r--r-- | package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper | 1 | ||||
| -rwxr-xr-x | target/linux/lantiq/base-files/etc/init.d/esi | 7 | ||||
| -rw-r--r-- | target/linux/lantiq/xrx200/target.mk | 3 | ||||
| -rw-r--r-- | target/linux/lantiq/xway/target.mk | 2 |
6 files changed, 6 insertions, 11 deletions
diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control index cece347b85..0c7221c24f 100644 --- a/package/network/config/ltq-adsl-app/files/dsl_control +++ b/package/network/config/ltq-adsl-app/files/dsl_control @@ -44,6 +44,8 @@ start() { return 1 } + esi $(printf '%012X' $((1+0x$(tr -d : </sys/class/net/eth0/address)))) + service_start /sbin/dsl_cpe_control -i${xtu} \ -n /sbin/dsl_notify.sh \ -f ${firmware} diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index 51c2aff9a1..db4e0bbd4e 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -26,7 +26,7 @@ define Package/ltq-vdsl-app CATEGORY:=Network TITLE:=Lantiq VDSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt + DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +atm-esi endef define Package/ltq-vdsl-app/description diff --git a/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper b/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper index 8e7c1cb4b8..cc127f7779 100644 --- a/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper +++ b/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper @@ -7,4 +7,5 @@ for mod in $LOAD; do grep -q "$mod " /proc/modules || insmod "$mod" done +esi $(printf '%012X' $((1+0x$(tr -d : </sys/class/net/eth0/address)))) exec /sbin/vdsl_cpe_control "$@" diff --git a/target/linux/lantiq/base-files/etc/init.d/esi b/target/linux/lantiq/base-files/etc/init.d/esi deleted file mode 100755 index ca79070c9e..0000000000 --- a/target/linux/lantiq/base-files/etc/init.d/esi +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2013 OpenWrt.org - -START=19 -start() { - esi $(printf '%012X' $((1+0x$(tr -d : </sys/class/net/eth0/address)))) 2>/dev/console || : -} diff --git a/target/linux/lantiq/xrx200/target.mk b/target/linux/lantiq/xrx200/target.mk index a2350158ab..059b93e142 100644 --- a/target/linux/lantiq/xrx200/target.mk +++ b/target/linux/lantiq/xrx200/target.mk @@ -15,8 +15,7 @@ DEFAULT_PACKAGES+=kmod-leds-gpio \ kmod-ltq-deu-vr9 \ ltq-vdsl-app \ ppp-mod-pppoa \ - swconfig \ - atm-esi + swconfig define Target/Description Lantiq XRX200 diff --git a/target/linux/lantiq/xway/target.mk b/target/linux/lantiq/xway/target.mk index 9434cc93e7..b9d4a0ff5b 100644 --- a/target/linux/lantiq/xway/target.mk +++ b/target/linux/lantiq/xway/target.mk @@ -5,7 +5,7 @@ FEATURES:=squashfs atm mips16 nand ubifs ramdisk CPU_TYPE:=34kc CPU_SUBTYPE:=dsp -DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug atm-esi +DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug define Target/Description Lantiq XWAY |