From da91ccda1cf80edc532d771691f43874111ade83 Mon Sep 17 00:00:00 2001 From: Rahul Thakur Date: Tue, 21 May 2024 12:58:07 +0530 Subject: [PATCH] ebtables-extensions, qosmngr: fix dependencies * fix dependencies for the ebtables-extensions and qosmngr packages * ebtables-extensions should not have dependency on ebtables-legacy * qosmngr should have dependency on ebtables-legacy for non-brcm targets * for brcm targets, ebtables from brcm sdk is used --- ebtables-extensions/Makefile | 4 ++-- qosmngr/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ebtables-extensions/Makefile b/ebtables-extensions/Makefile index 4879432fd..8767f3fdf 100644 --- a/ebtables-extensions/Makefile +++ b/ebtables-extensions/Makefile @@ -24,7 +24,7 @@ define KernelPackage/vlantranslation SUBMENU:=Other modules TITLE:=Kernel module for ebtables VLAN translation FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko - DEPENDS+=+kmod-ebtables +ebtables-legacy + DEPENDS+=+kmod-ebtables AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1) KCONFIG:= endef @@ -32,7 +32,7 @@ endef define KernelPackage/dscp2pbit SUBMENU:=Other modules TITLE:=Kernel module for DSCP-to-Pbit mapping - DEPENDS+=+kmod-ebtables +ebtables-legacy + DEPENDS+=+kmod-ebtables FILES:=$(PKG_BUILD_DIR)/src/ebt_dscp2pbit.ko AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1) KCONFIG:= diff --git a/qosmngr/Makefile b/qosmngr/Makefile index 4fcc30a41..15d53f4a5 100644 --- a/qosmngr/Makefile +++ b/qosmngr/Makefile @@ -29,7 +29,7 @@ define Package/qosmngr CATEGORY:=Utilities TITLE:=QoS Manager DEPENDS:=+libbbfdm-api +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full - DEPENDS+=+kmod-vlantranslation +kmod-dscp2pbit + DEPENDS+=+kmod-vlantranslation +kmod-dscp2pbit +!(TARGET_brcmbca):ebtables-legacy endef define Package/qosmngr/description