aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Hoffmann <jan@3e8.eu>2022-04-25 21:43:50 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-07 21:36:58 +0200
commitea0744fbc699e030b2917f5fa2493068cab2b60f (patch)
tree9b69cea1075e073346bfba8b38b7dbb4838be291
parent290c13b7d70b0b396509bf20787ab75ccb057cb7 (diff)
downloadupstream-ea0744fbc699e030b2917f5fa2493068cab2b60f.tar.gz
upstream-ea0744fbc699e030b2917f5fa2493068cab2b60f.tar.bz2
upstream-ea0744fbc699e030b2917f5fa2493068cab2b60f.zip
ltq-atm/ltq-ptm: avoid unnecessary build dependencies
Right now, both ltq-adsl-mei and ltq-vdsl-mei are always built, even when they aren't necessary for the selected variant. This can cause the build to fail, for example ltq-vdsl-mei doesn't build successfully here on xway target due to the vectoring callback. Make these dependencies conditional on the specific package variants, so they are only built when actually needed. Signed-off-by: Jan Hoffmann <jan@3e8.eu> Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> (cherry picked from commit 2f484aeff5fe5ba3a832f98ca409adde3257e832)
-rw-r--r--package/kernel/lantiq/ltq-atm/Makefile13
-rw-r--r--package/kernel/lantiq/ltq-ptm/Makefile4
2 files changed, 11 insertions, 6 deletions
diff --git a/package/kernel/lantiq/ltq-atm/Makefile b/package/kernel/lantiq/ltq-atm/Makefile
index f675269ca3..b81f3bb293 100644
--- a/package/kernel/lantiq/ltq-atm/Makefile
+++ b/package/kernel/lantiq/ltq-atm/Makefile
@@ -22,13 +22,18 @@ define KernelPackage/ltq-atm-template
URL:=http://www.lantiq.com/
VARIANT:=$(1)
DEPENDS:=@$(2) +kmod-atm +br2684ctl
+ifeq ($(1),vr9)
+ DEPENDS+= +PACKAGE_kmod-ltq-atm-$(1):kmod-ltq-vdsl-vr9-mei
+else
+ DEPENDS+= +PACKAGE_kmod-ltq-atm-$(1):kmod-ltq-adsl-$(1)-mei
+endif
FILES:=$(PKG_BUILD_DIR)/ltq_atm_$(1).ko
endef
-KernelPackage/ltq-atm-danube=$(call KernelPackage/ltq-atm-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy) +kmod-ltq-adsl-danube-mei)
-KernelPackage/ltq-atm-ar9=$(call KernelPackage/ltq-atm-template,ar9,TARGET_lantiq_xway +kmod-ltq-adsl-ar9-mei)
-KernelPackage/ltq-atm-ase=$(call KernelPackage/ltq-atm-template,ase,TARGET_lantiq_ase +kmod-ltq-adsl-ase-mei)
-KernelPackage/ltq-atm-vr9=$(call KernelPackage/ltq-atm-template,vr9,TARGET_lantiq_xrx200 +kmod-ltq-vdsl-vr9-mei)
+KernelPackage/ltq-atm-danube=$(call KernelPackage/ltq-atm-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+KernelPackage/ltq-atm-ar9=$(call KernelPackage/ltq-atm-template,ar9,TARGET_lantiq_xway)
+KernelPackage/ltq-atm-ase=$(call KernelPackage/ltq-atm-template,ase,TARGET_lantiq_ase)
+KernelPackage/ltq-atm-vr9=$(call KernelPackage/ltq-atm-template,vr9,TARGET_lantiq_xrx200)
define Build/Configure
endef
diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile
index 33a23d6853..b726cb1560 100644
--- a/package/kernel/lantiq/ltq-ptm/Makefile
+++ b/package/kernel/lantiq/ltq-ptm/Makefile
@@ -24,9 +24,9 @@ define KernelPackage/ltq-ptm-template
VARIANT:=$(1)
DEPENDS:=@TARGET_lantiq_$(2)
ifeq ($(1),vr9)
- DEPENDS+= +kmod-ltq-vdsl-vr9-mei
+ DEPENDS+= +PACKAGE_kmod-ltq-ptm-$(1):kmod-ltq-vdsl-vr9-mei
else
- DEPENDS+= +kmod-ltq-adsl-$(1)-mei
+ DEPENDS+= +PACKAGE_kmod-ltq-ptm-$(1):kmod-ltq-adsl-$(1)-mei
endif
ifeq ($(1),ase)
DEPENDS+=@BROKEN