Author: nbd Date: 2015-12-04 18:42:51 +0100 (Fri, 04 Dec 2015) New Revision: 47764
Removed: trunk/target/linux/lantiq/base-files/etc/init.d/esi Modified: trunk/package/network/config/ltq-adsl-app/files/dsl_control trunk/package/network/config/ltq-vdsl-app/Makefile trunk/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper trunk/target/linux/lantiq/xrx200/target.mk trunk/target/linux/lantiq/xway/target.mk Log: lantiq: move esi calls to dsl_cpe_control scripts to fix ordering wrt. loading vr9 drivers Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/network/config/ltq-adsl-app/files/dsl_control =================================================================== --- trunk/package/network/config/ltq-adsl-app/files/dsl_control 2015-12-04 15:02:42 UTC (rev 47763) +++ trunk/package/network/config/ltq-adsl-app/files/dsl_control 2015-12-04 17:42:51 UTC (rev 47764) @@ -44,6 +44,8 @@ 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} Modified: trunk/package/network/config/ltq-vdsl-app/Makefile =================================================================== --- trunk/package/network/config/ltq-vdsl-app/Makefile 2015-12-04 15:02:42 UTC (rev 47763) +++ trunk/package/network/config/ltq-vdsl-app/Makefile 2015-12-04 17:42:51 UTC (rev 47764) @@ -26,7 +26,7 @@ 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 Modified: trunk/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper =================================================================== --- trunk/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper 2015-12-04 15:02:42 UTC (rev 47763) +++ trunk/package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper 2015-12-04 17:42:51 UTC (rev 47764) @@ -7,4 +7,5 @@ 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 "$@" Deleted: trunk/target/linux/lantiq/base-files/etc/init.d/esi =================================================================== --- trunk/target/linux/lantiq/base-files/etc/init.d/esi 2015-12-04 15:02:42 UTC (rev 47763) +++ trunk/target/linux/lantiq/base-files/etc/init.d/esi 2015-12-04 17:42:51 UTC (rev 47764) @@ -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 || : -} Modified: trunk/target/linux/lantiq/xrx200/target.mk =================================================================== --- trunk/target/linux/lantiq/xrx200/target.mk 2015-12-04 15:02:42 UTC (rev 47763) +++ trunk/target/linux/lantiq/xrx200/target.mk 2015-12-04 17:42:51 UTC (rev 47764) @@ -15,8 +15,7 @@ kmod-ltq-deu-vr9 \ ltq-vdsl-app \ ppp-mod-pppoa \ - swconfig \ - atm-esi + swconfig define Target/Description Lantiq XRX200 Modified: trunk/target/linux/lantiq/xway/target.mk =================================================================== --- trunk/target/linux/lantiq/xway/target.mk 2015-12-04 15:02:42 UTC (rev 47763) +++ trunk/target/linux/lantiq/xway/target.mk 2015-12-04 17:42:51 UTC (rev 47764) @@ -5,7 +5,7 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
