[openwrt/openwrt] ltq-*dsl-app: dsl_control: remove unneeded check for lantiq_dsl.sh

LEDE Commits lede-commits at lists.infradead.org
Fri Jul 17 06:15:04 EDT 2020


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6299c1760a15633a3b41f08044efd9cadd051db0

commit 6299c1760a15633a3b41f08044efd9cadd051db0
Author: Martin Schiller <ms at dev.tdt.de>
AuthorDate: Fri Jul 17 05:58:19 2020 +0200

    ltq-*dsl-app: dsl_control: remove unneeded check for lantiq_dsl.sh
    
    This file is always present because it is part of the ltq-dsl-base
    package on which these packages depend.
    
    This check would not have been necessary in the past, because the script
    was part of the TARGET_LANTIQ on which these packages also depend.
    
    Signed-off-by: Martin Schiller <ms at dev.tdt.de>
---
 package/network/config/ltq-adsl-app/Makefile          | 2 +-
 package/network/config/ltq-adsl-app/files/dsl_control | 2 +-
 package/network/config/ltq-vdsl-app/Makefile          | 2 +-
 package/network/config/ltq-vdsl-app/files/dsl_control | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile
index 4317f3d712..eb7c10d51a 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:=7
+PKG_RELEASE:=8
 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/
diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control
index b6aa72c0e7..44f5fb8690 100644
--- a/package/network/config/ltq-adsl-app/files/dsl_control
+++ b/package/network/config/ltq-adsl-app/files/dsl_control
@@ -8,7 +8,7 @@ EXTRA_COMMANDS="dslstat lucistat"
 EXTRA_HELP="	dslstat Get DSL status information
 	lucistat Get status information in lua friendly format"
 
-[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+. /lib/functions/lantiq_dsl.sh
 
 annex_b=10_00_10_00_00_04_00_00
 annex_bdmt=10_00_00_00_00_00_00_00
diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile
index 92d6faf736..d12f194cd5 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:=3
+PKG_RELEASE:=4
 PKG_BASE_NAME:=dsl_cpe_control
 PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index dfaf06872d..9c5df4cccd 100644
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -8,7 +8,7 @@ EXTRA_COMMANDS="dslstat lucistat"
 EXTRA_HELP="	dslstat Get DSL status information
 	lucistat Get status information in lua friendly format"
 
-[ -f /lib/functions/lantiq_dsl.sh ] && . /lib/functions/lantiq_dsl.sh
+. /lib/functions/lantiq_dsl.sh
 
 #
 # ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE))



More information about the lede-commits mailing list