From 5e13161b702fa513b7b7e9158e152faabcd360d1 Mon Sep 17 00:00:00 2001 From: Erik Karlsson Date: Tue, 11 Feb 2025 10:26:44 +0100 Subject: [PATCH] Fix out-of-tree Broadcom kernel module build The inclusion of bcm-kernel-toolchain.mk cannot be conditional since CONFIG_TARGET_brcmbca is not defined when package metadata is being generated. Instead make it optional in case broadcom feed is absent. --- ebtables-extensions/Makefile | 4 +--- gryphon-led-module/Makefile | 3 +-- ipt-trigger/Makefile | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ebtables-extensions/Makefile b/ebtables-extensions/Makefile index b3c572bc3..fadfd01b9 100644 --- a/ebtables-extensions/Makefile +++ b/ebtables-extensions/Makefile @@ -189,9 +189,7 @@ define KernelPackage/ebt-mldsnooping/description Kernel module to enable MLD snooping for ebtables endef -ifeq ($(CONFIG_TARGET_brcmbca),y) - include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk -endif +-include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk define Build/Prepare diff --git a/gryphon-led-module/Makefile b/gryphon-led-module/Makefile index edd137c95..373a8bbd7 100644 --- a/gryphon-led-module/Makefile +++ b/gryphon-led-module/Makefile @@ -28,7 +28,6 @@ define KernelPackage/$(PKG_NAME) FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME)) - DEPENDS:= +(TARGET_brcmbca):bcm963xx-bsp PKG_LICENSE:=GPLv2 PKG_LICENSE_URL:= endef @@ -42,7 +41,7 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m MODULE_INCLUDE=-I$(PKG_BUILD_DIR) # support compilation against BCM SDK kernel -include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk +-include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk define Build/Prepare mkdir -p $(PKG_BUILD_DIR)/kdevlinks/ diff --git a/ipt-trigger/Makefile b/ipt-trigger/Makefile index ea3adaa70..1ddd424d7 100644 --- a/ipt-trigger/Makefile +++ b/ipt-trigger/Makefile @@ -46,9 +46,7 @@ define KernelPackage/ip6t-trigger/description Kernel module to enable port trigger for ip6tables endef -ifeq ($(CONFIG_TARGET_brcmbca),y) - include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk -endif +-include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk ifeq ($(LOCAL_DEV),1) define Build/Prepare