Skip to content

Commit af54dc2

Browse files
committed
qca-mcs: drop ugly hack
1 parent 98e0222 commit af54dc2

2 files changed

Lines changed: 16 additions & 30 deletions

File tree

package/qca/nss/qca-mcs/patches/101-revert-to-old-build-logic.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
include $(TOPDIR)/rules.mk
2-
include $(INCLUDE_DIR)/kernel.mk
32

43
PKG_NAME:=qca-mcs
54
PKG_RELEASE:=1
65

7-
PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/qca-mcs
86
PKG_SOURCE_PROTO:=git
7+
PKG_SOURCE_DATE:=2021-10-28
8+
PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/qca-mcs
99
PKG_SOURCE_VERSION:=31f5cd4b83da5a7c0fdca240b4e72677e4523b6e
10-
PKG_MIRROR_HASH:=1b6997793b51cbeed9520d3183787aaf5ce283cf87ef6603c24cc342654dde61
10+
PKG_MIRROR_HASH:=3e2e25025dc2e771aafe7d8b12f26ac831d123b34bdd7b7e84bd39c1e933491d
1111

12+
include $(INCLUDE_DIR)/kernel.mk
1213
include $(INCLUDE_DIR)/package.mk
1314

1415
define KernelPackage/qca-mcs
1516
SECTION:=kernel
1617
CATEGORY:=Kernel modules
1718
SUBMENU:=Network Support
18-
URL:=http://www.qca.qualcomm.com
19-
MAINTAINER:=Qualcomm Atheros, Inc.
2019
TITLE:=QCA Multicast Snooping Support
21-
DEPENDS:=
22-
KCONFIG:=CONFIG_NETFILTER=y CONFIG_BRIDGE_NETFILTER=y
20+
DEPENDS:=@(TARGET_ipq806x||TARGET_ipq807x)
21+
KCONFIG:= \
22+
CONFIG_NETFILTER=y \
23+
CONFIG_BRIDGE_NETFILTER=y
2324
FILES:=$(PKG_BUILD_DIR)/qca-mcs.ko
24-
AUTOLOAD:=$(call AutoLoad,41,qca-mcs)
25+
AUTOLOAD:=$(call AutoLoad,52,qca-mcs)
2526
endef
2627

2728
define KernelPackage/qca-mcs/description
@@ -39,17 +40,15 @@ define Build/InstallDev
3940
endef
4041

4142
QCA_MC_SNOOPING_MAKE_OPTS:= \
42-
MC_SUPPORT_MLD=1
43+
$(KERNEL_MAKE_FLAGS) \
44+
CONFIG_SUPPORT_MLD=y \
45+
MDIR=$(PKG_BUILD_DIR) \
46+
KBUILDPATH=$(LINUX_DIR) \
47+
KERNELPATH=$(LINUX_SRC_DIR) \
48+
KERNELRELEASE=$(LINUX_RELEASE)
4349

4450
define Build/Compile
45-
$(MAKE) $(PKG_JOBS) -C $(LINUX_DIR) \
46-
$(KERNEL_MAKE_FLAGS) \
47-
KBUILDPATH=$(LINUX_DIR) \
48-
$(PKG_MAKE_FLAGS) \
49-
M=$(PKG_BUILD_DIR) \
50-
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
51-
$(strip $(QCA_MC_SNOOPING_MAKE_OPTS)) \
52-
modules
51+
$(MAKE) -C $(LINUX_DIR) M=$(PKG_BUILD_DIR) $(strip $(QCA_MC_SNOOPING_MAKE_OPTS))
5352
endef
5453

5554
$(eval $(call KernelPackage,qca-mcs))

0 commit comments

Comments
 (0)