From 33e2115fe449d1b9e97ce8c5be96f580442fd3d9 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 23 Aug 2022 15:18:49 +0200 Subject: [PATCH] ltq-vdsl-app: rename to ltq-vdsl-vr9-app This matches the scheme used by other target packages and will avoid confusion with any future version. Signed-off-by: Andre Heider --- package/kernel/lantiq/ltq-vdsl-vr9-mei/Makefile | 4 ++-- package/network/config/ltq-adsl-app/Makefile | 2 +- .../100-add-more-script-notifications.patch | 2 +- .../{ltq-vdsl-app => ltq-vdsl-vr9-app}/Makefile | 14 +++++++------- .../files/10_atm.sh | 0 .../files/10_ptm.sh | 0 .../files/dsl_control | 0 .../files/dsl_cpe_pipe.sh | 0 .../patches/100-compat.patch | 0 .../patches/101-musl.patch | 0 .../patches/200-autoboot.patch | 0 .../patches/201-sigterm.patch | 0 .../patches/300-ubus.patch | 0 .../src/src/dsl_cpe_ubus.c | 0 target/linux/lantiq/xrx200/target.mk | 2 +- 15 files changed, 12 insertions(+), 12 deletions(-) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/Makefile (86%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/files/10_atm.sh (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/files/10_ptm.sh (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/files/dsl_control (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/files/dsl_cpe_pipe.sh (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/patches/100-compat.patch (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/patches/101-musl.patch (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/patches/200-autoboot.patch (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/patches/201-sigterm.patch (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/patches/300-ubus.patch (100%) rename package/network/config/{ltq-vdsl-app => ltq-vdsl-vr9-app}/src/src/dsl_cpe_ubus.c (100%) diff --git a/package/kernel/lantiq/ltq-vdsl-vr9-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-vr9-mei/Makefile index 040c02f899..e9c5a681fd 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr9-mei/Makefile +++ b/package/kernel/lantiq/ltq-vdsl-vr9-mei/Makefile @@ -56,10 +56,10 @@ MAKE_FLAGS += \ $(KERNEL_MAKE_FLAGS) \ SHELL="$(BASH)" -# ltq-vdsl-app uses a header provided by the MEI driver which has some +# ltq-vdsl-vr9-app uses a header provided by the MEI driver which has some # conditionals. # Define the conditionals here to have the same view on both sides. If you -# change them, you need to change them for the ltq-vdsl-app as well +# change them, you need to change them for the ltq-vdsl-vr9-app as well MEI_DRV_CFLAGS = \ -DMEI_DRV_ATM_PTM_INTERFACE_ENABLE=1 \ -DMEI_SUPPORT_DEBUG_STREAMS=1 \ diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index 2e4792266c..3bc247dfb0 100644 --- a/package/network/config/ltq-adsl-app/Makefile +++ b/package/network/config/ltq-adsl-app/Makefile @@ -77,7 +77,7 @@ TARGET_CFLAGS += -I$(LINUX_DIR)/include define Build/Prepare $(call Build/Prepare/Default) - $(CP) ../ltq-vdsl-app/src/src/dsl_cpe_ubus.c $(PKG_BUILD_DIR)/src/ + $(CP) ../ltq-vdsl-vr9-app/src/src/dsl_cpe_ubus.c $(PKG_BUILD_DIR)/src/ endef define Package/ltq-adsl-app/install diff --git a/package/network/config/ltq-adsl-app/patches/100-add-more-script-notifications.patch b/package/network/config/ltq-adsl-app/patches/100-add-more-script-notifications.patch index 9d611c1caf..875b7ecbf5 100644 --- a/package/network/config/ltq-adsl-app/patches/100-add-more-script-notifications.patch +++ b/package/network/config/ltq-adsl-app/patches/100-add-more-script-notifications.patch @@ -3,7 +3,7 @@ From: Mathias Kresin Date: Mon, 16 Oct 2017 21:08:26 +0200 Subject: ltq-adsl-app: add more script notifications -Backport HANDSHAKE and TRAINING notification from ltq-vdsl-app. It +Backport HANDSHAKE and TRAINING notification from ltq-vdsl-vr9-app. It unifies the dsl led blinking pattern accross all subtargets and allows to get the current line status from the dsl led. diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-vr9-app/Makefile similarity index 86% rename from package/network/config/ltq-vdsl-app/Makefile rename to package/network/config/ltq-vdsl-vr9-app/Makefile index 8baf1e8263..c7991453c8 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-vr9-app/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_NAME:=ltq-vdsl-app +PKG_NAME:=ltq-vdsl-vr9-app PKG_VERSION:=4.17.18.6 PKG_RELEASE:=$(AUTORELEASE) PKG_BASE_NAME:=dsl_cpe_control @@ -24,7 +24,7 @@ PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk -define Package/ltq-vdsl-app +define Package/ltq-vdsl-vr9-app SECTION:=net CATEGORY:=Network TITLE:=Lantiq VDSL userland tool @@ -32,17 +32,17 @@ define Package/ltq-vdsl-app DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +ltq-dsl-base +libubox +libubus endef -define Package/ltq-vdsl-app/description +define Package/ltq-vdsl-vr9-app/description Userland tool needed to control Lantiq VDSL CPE endef -# ltq-vdsl-app uses a header provided by the MEI driver which has some +# ltq-vdsl-vr9-app uses a header provided by the MEI driver which has some # conditionals. # # Define them here with the default values they would get in the MEI driver, # have the same view on both sides. # -# If you change them, you need to change them for the ltq-vdsl-app as well +# If you change them, you need to change them for the ltq-vdsl-vr9-app as well VDSL_APP_CFLAGS = \ -DMAX_CLI_PIPES=1 \ -DMEI_SUPPORT_DEBUG_STREAMS=1 \ @@ -69,7 +69,7 @@ CONFIGURE_ARGS += \ #CONFIGURE_ARGS += --enable-model=typical #CONFIGURE_ARGS += --enable-model=debug -define Package/ltq-vdsl-app/install +define Package/ltq-vdsl-vr9-app/install $(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 @@ -79,4 +79,4 @@ define Package/ltq-vdsl-app/install $(INSTALL_BIN) ./files/dsl_cpe_pipe.sh $(1)/sbin/ endef -$(eval $(call BuildPackage,ltq-vdsl-app)) +$(eval $(call BuildPackage,ltq-vdsl-vr9-app)) diff --git a/package/network/config/ltq-vdsl-app/files/10_atm.sh b/package/network/config/ltq-vdsl-vr9-app/files/10_atm.sh similarity index 100% rename from package/network/config/ltq-vdsl-app/files/10_atm.sh rename to package/network/config/ltq-vdsl-vr9-app/files/10_atm.sh diff --git a/package/network/config/ltq-vdsl-app/files/10_ptm.sh b/package/network/config/ltq-vdsl-vr9-app/files/10_ptm.sh similarity index 100% rename from package/network/config/ltq-vdsl-app/files/10_ptm.sh rename to package/network/config/ltq-vdsl-vr9-app/files/10_ptm.sh diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-vr9-app/files/dsl_control similarity index 100% rename from package/network/config/ltq-vdsl-app/files/dsl_control rename to package/network/config/ltq-vdsl-vr9-app/files/dsl_control diff --git a/package/network/config/ltq-vdsl-app/files/dsl_cpe_pipe.sh b/package/network/config/ltq-vdsl-vr9-app/files/dsl_cpe_pipe.sh similarity index 100% rename from package/network/config/ltq-vdsl-app/files/dsl_cpe_pipe.sh rename to package/network/config/ltq-vdsl-vr9-app/files/dsl_cpe_pipe.sh diff --git a/package/network/config/ltq-vdsl-app/patches/100-compat.patch b/package/network/config/ltq-vdsl-vr9-app/patches/100-compat.patch similarity index 100% rename from package/network/config/ltq-vdsl-app/patches/100-compat.patch rename to package/network/config/ltq-vdsl-vr9-app/patches/100-compat.patch diff --git a/package/network/config/ltq-vdsl-app/patches/101-musl.patch b/package/network/config/ltq-vdsl-vr9-app/patches/101-musl.patch similarity index 100% rename from package/network/config/ltq-vdsl-app/patches/101-musl.patch rename to package/network/config/ltq-vdsl-vr9-app/patches/101-musl.patch diff --git a/package/network/config/ltq-vdsl-app/patches/200-autoboot.patch b/package/network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch similarity index 100% rename from package/network/config/ltq-vdsl-app/patches/200-autoboot.patch rename to package/network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch diff --git a/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch b/package/network/config/ltq-vdsl-vr9-app/patches/201-sigterm.patch similarity index 100% rename from package/network/config/ltq-vdsl-app/patches/201-sigterm.patch rename to package/network/config/ltq-vdsl-vr9-app/patches/201-sigterm.patch diff --git a/package/network/config/ltq-vdsl-app/patches/300-ubus.patch b/package/network/config/ltq-vdsl-vr9-app/patches/300-ubus.patch similarity index 100% rename from package/network/config/ltq-vdsl-app/patches/300-ubus.patch rename to package/network/config/ltq-vdsl-vr9-app/patches/300-ubus.patch diff --git a/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c b/package/network/config/ltq-vdsl-vr9-app/src/src/dsl_cpe_ubus.c similarity index 100% rename from package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c rename to package/network/config/ltq-vdsl-vr9-app/src/src/dsl_cpe_ubus.c diff --git a/target/linux/lantiq/xrx200/target.mk b/target/linux/lantiq/xrx200/target.mk index 8813de8d04..0f119edd6f 100644 --- a/target/linux/lantiq/xrx200/target.mk +++ b/target/linux/lantiq/xrx200/target.mk @@ -12,7 +12,7 @@ DEFAULT_PACKAGES+=kmod-leds-gpio \ kmod-ltq-atm-vr9 \ kmod-ltq-deu-vr9 \ kmod-ltq-ptm-vr9 \ - ltq-vdsl-app \ + ltq-vdsl-vr9-app \ dsl-vrx200-firmware-xdsl-a \ dsl-vrx200-firmware-xdsl-b-patch \ ppp-mod-pppoa -- 2.30.2