From d8b3f53f5e1fe13d2468feff94f4a1f8e53ba53a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 14 Apr 2020 16:10:49 +0200 Subject: [PATCH] ltq-adsl(-fw): Makefile clean-up and fixes This fixes a few minor issues (partially cosmetic) in ltq-adsl and ltq-adsl-fw Makefiles: - fix PKG_SOURCE_URL and switch to https - remove non-existant FW_NAME variable - fix package name for config inclusion - fix config symbol for debugging Fixes: 1d0a9d0c0470 ("move ltq-adsl") Cc: John Crispin Signed-off-by: Adrian Schmutzler --- package/kernel/lantiq/ltq-adsl-fw/Makefile | 6 +++--- package/kernel/lantiq/ltq-adsl/Config.in | 6 +++--- package/kernel/lantiq/ltq-adsl/Makefile | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/kernel/lantiq/ltq-adsl-fw/Makefile b/package/kernel/lantiq/ltq-adsl-fw/Makefile index 5775d0cf50..66f91a991e 100644 --- a/package/kernel/lantiq/ltq-adsl-fw/Makefile +++ b/package/kernel/lantiq/ltq-adsl-fw/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/ltq-dsl-fw-$(PKG_VERSION) PKG_SOURCE:=ltq-dsl-fw-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/ +PKG_SOURCE_URL:=https://sources.openwrt.org/ PKG_HASH:=28676d41c4b76e5bf7a2c5eae106a61fb96b93eabc0cb71120575fff9997269f PKG_MAINTAINER:=John Crispin @@ -45,8 +45,8 @@ endef define Package/kmod-ltq-adsl-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/lib/firmware/ - $(CP) $(PKG_BUILD_DIR)/$(FW_NAME)/ltq-dsl-fw-$(ANNEX)-$(SOC).bin $(1)/lib/firmware/ - ln -s /lib/firmware/$(FW_NAME)/ltq-dsl-fw-$(ANNEX)-$(SOC).bin $(1)/lib/firmware/adsl.bin + $(CP) $(PKG_BUILD_DIR)/ltq-dsl-fw-$(ANNEX)-$(SOC).bin $(1)/lib/firmware/ + ln -s /lib/firmware/ltq-dsl-fw-$(ANNEX)-$(SOC).bin $(1)/lib/firmware/adsl.bin endef $(eval $(call BuildPackage,kmod-ltq-adsl-danube-fw-a)) diff --git a/package/kernel/lantiq/ltq-adsl/Config.in b/package/kernel/lantiq/ltq-adsl/Config.in index 6d9caf4419..8ae65d373a 100644 --- a/package/kernel/lantiq/ltq-adsl/Config.in +++ b/package/kernel/lantiq/ltq-adsl/Config.in @@ -1,5 +1,5 @@ -config LANTIQ_DSL_DEBUG +config LANTIQ_ADSL_DEBUG bool "verbose debugging" - depends on PACKAGE_kmod-ltq-dsl + depends on PACKAGE_kmod-ltq-adsl help - Say Y, if you need ltq-dsl to display debug messages. + Say Y, if you need ltq-adsl to display debug messages. diff --git a/package/kernel/lantiq/ltq-adsl/Makefile b/package/kernel/lantiq/ltq-adsl/Makefile index e6817efffc..1a9128fc58 100644 --- a/package/kernel/lantiq/ltq-adsl/Makefile +++ b/package/kernel/lantiq/ltq-adsl/Makefile @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-adsl PKG_VERSION:=3.24.4.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=drv_dsl_cpe_api_danube-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/ltq-dsl-$(BUILD_VARIANT)/drv_dsl_cpe_api-$(PKG_VERSION) -PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/ +PKG_SOURCE_URL:=https://mirror2.openwrt.org/sources/ PKG_HASH:=eb2ed59715d3bf4e8a1460bbbe2f1660039e0a9f9d72afb1b2b16590094eb33c PKG_MAINTAINER:=John Crispin @@ -38,7 +38,7 @@ KernelPackage/ltq-adsl-danube=$(call KernelPackage/ltq-adsl-template,danube,(TAR KernelPackage/ltq-adsl-ar9=$(call KernelPackage/ltq-adsl-template,ar9,TARGET_lantiq_xway) KernelPackage/ltq-adsl-ase=$(call KernelPackage/ltq-adsl-template,ase,TARGET_lantiq_ase) -define KernelPackage/ltq-dsl/config +define KernelPackage/ltq-adsl/config source "$(SOURCE)/Config.in" endef @@ -75,7 +75,7 @@ CONFIGURE_ARGS += --enable-add-drv-cflags="-DMODULE -DCONFIG_$(CONFIG_TAG_$(BUIL CONFIGURE_ARGS += --enable-danube -ifeq ($(CONFIG_LANTIQ_DSL_DEBUG),y) +ifeq ($(CONFIG_LANTIQ_ADSL_DEBUG),y) CONFIGURE_ARGS += \ --enable-debug=yes \ --enable-debug-prints=yes