From 06c9170a7c3742598d915486c40724c64bf988ea Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 15 Dec 2012 02:00:39 +0000 Subject: [PATCH] move ltq-adsl-tool SVN-Revision: 34694 --- .../lantiq/ltq-adsl-app}/Config.in | 0 .../lantiq/ltq-adsl-app}/Makefile | 19 +++++++++---------- .../lantiq/ltq-adsl-app}/files/dsl_control | 2 +- .../lantiq/ltq-adsl-app}/files/dsl_notify.sh | 0 4 files changed, 10 insertions(+), 11 deletions(-) rename package/{network/config/ltq-dsl-app => platform/lantiq/ltq-adsl-app}/Config.in (100%) rename package/{network/config/ltq-dsl-app => platform/lantiq/ltq-adsl-app}/Makefile (81%) rename package/{network/config/ltq-dsl-app => platform/lantiq/ltq-adsl-app}/files/dsl_control (99%) rename package/{network/config/ltq-dsl-app => platform/lantiq/ltq-adsl-app}/files/dsl_notify.sh (100%) diff --git a/package/network/config/ltq-dsl-app/Config.in b/package/platform/lantiq/ltq-adsl-app/Config.in similarity index 100% rename from package/network/config/ltq-dsl-app/Config.in rename to package/platform/lantiq/ltq-adsl-app/Config.in diff --git a/package/network/config/ltq-dsl-app/Makefile b/package/platform/lantiq/ltq-adsl-app/Makefile similarity index 81% rename from package/network/config/ltq-dsl-app/Makefile rename to package/platform/lantiq/ltq-adsl-app/Makefile index 37a72ee336..92445e5580 100644 --- a/package/network/config/ltq-dsl-app/Makefile +++ b/package/platform/lantiq/ltq-adsl-app/Makefile @@ -23,25 +23,24 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_LTQ_DSL_ENABLE_SOAP \ CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING -include $(INCLUDE_DIR)/package.mk +PKG_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-adsl-danube TARGET_lantiq_ase:kmod-ltq-adsl-ase -PKG_BUILD_DEPENDS:=TARGET_lantiq_danube:kmod-ltq-dsl-danube TARGET_lantiq_ar9:kmod-ltq-dsl-ar9 \ - TARGET_lantiq_vr9:kmod-ltq-dsl-vr9 TARGET_lantiq_ase:kmod-ltq-dsl-ase +include $(INCLUDE_DIR)/package.mk -define Package/ltq-dsl-app +define Package/ltq-adsl-app SECTION:=net CATEGORY:=Network TITLE:=Lantiq DSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@TARGET_lantiq&&!(TARGET_lantiq_falcon||TARGET_lantiq_falcon_stable) +libpthread + DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_ase) +libpthread MENU:=1 endef -define Package/ltq-dsl-app/description +define Package/ltq-adsl-app/description Infineon DSL CPE API for Amazon SE, Danube and Vinax. endef -define Package/ltq-dsl-app/config +define Package/ltq-adsl-app/config source "$(SOURCE)/Config.in" endef @@ -54,7 +53,7 @@ CONFIGURE_ARGS += \ --with-lines-per-device="$(LTQ_DSL_LINES_PER_DEVICE)" \ --with-channels-per-line="$(LTQ_DSL_CHANNELS_PER_LINE)" \ --enable-danube \ - --enable-driver-include="-I$(STAGING_DIR)/usr/include" \ + --enable-driver-include="-I$(STAGING_DIR)/usr/include/adsl/" \ --enable-debug-prints \ --enable-add-appl-cflags="-DMAX_CLI_PIPES=2" \ --enable-cli-support \ @@ -87,7 +86,7 @@ endif TARGET_CFLAGS += -I$(LINUX_DIR)/include -define Package/ltq-dsl-app/install +define Package/ltq-adsl-app/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/ @@ -96,4 +95,4 @@ define Package/ltq-dsl-app/install $(INSTALL_BIN) ./files/dsl_notify.sh $(1)/sbin endef -$(eval $(call BuildPackage,ltq-dsl-app)) +$(eval $(call BuildPackage,ltq-adsl-app)) diff --git a/package/network/config/ltq-dsl-app/files/dsl_control b/package/platform/lantiq/ltq-adsl-app/files/dsl_control similarity index 99% rename from package/network/config/ltq-dsl-app/files/dsl_control rename to package/platform/lantiq/ltq-adsl-app/files/dsl_control index 79961aaed7..c3c712db8a 100644 --- a/package/network/config/ltq-dsl-app/files/dsl_control +++ b/package/platform/lantiq/ltq-adsl-app/files/dsl_control @@ -297,7 +297,7 @@ start() { # start CPE dsl daemon in the background service_start /sbin/dsl_cpe_control -i${xtu} \ -n /sbin/dsl_notify.sh \ - -f /lib/firmware/dsl-fw-${fwannex}.bin + -f /lib/firmware/ModemHWE.bin } # diff --git a/package/network/config/ltq-dsl-app/files/dsl_notify.sh b/package/platform/lantiq/ltq-adsl-app/files/dsl_notify.sh similarity index 100% rename from package/network/config/ltq-dsl-app/files/dsl_notify.sh rename to package/platform/lantiq/ltq-adsl-app/files/dsl_notify.sh -- 2.25.1