nss: fix igs/crypto dependancies during build

This commit is contained in:
Qosmio 2022-11-17 01:09:27 -05:00
parent 141c96ca1e
commit b9ed89b3c1
7 changed files with 22 additions and 27 deletions

View File

@ -18,7 +18,7 @@ define KernelPackage/nss-ifb
CATEGORY:=Kernel modules
SUBMENU:=Network Devices
TITLE:=NSS IFB Interface
DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
DEPENDS:=+kmod-qca-nss-drv
FILES:=$(PKG_BUILD_DIR)/nss-ifb.ko
KCONFIG:=
endef

View File

@ -11,7 +11,7 @@ define Package/libnl-nss
SECTION:=Libs
CATEGORY:=Libraries
TITLE:=Framework to communicate between userspace applications and the kernel.
DEPENDS:=+libpthread +libnl +kmod-qca-nss-drv-netlink
DEPENDS:=+libpthread +libnl +@NSS_DRV_CRYPTO_ENABLE +kmod-qca-nss-drv-netlink
endef
define Package/libnl-nss/description

View File

@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=qca-nat46
PKG_MIRROR_HASH:=0627c7122ff7432aadb443e92e11a9ad7710add0ff512eebe17d7e3c041e0d2a
PKG_MIRROR_HASH:=2ff2080bf5ac003e36b1f0df4d444413e36496c4659bd7a46ae5e2b07b9634e7
PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
PKG_SOURCE_DATE:=2020-06-26
PKG_SOURCE_PROTO:=git

View File

@ -9,6 +9,7 @@ PKG_SOURCE_DATE:=2020-10-29
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=ef082a735fad96bd2f6f59b94d6ea81defc4796e
PKG_MIRROR_HASH:=9375f2bbdd17826b6ddebc77607ec73c98626570243a9831a1e34e1051eb436c
PKG_BUILD_DEPENDS:=qca-nss-drv
include $(INCLUDE_DIR)/package.mk
@ -55,7 +56,7 @@ define KernelPackage/qca-nss-drv-dtlsmgr
CATEGORY:=Kernel modules
SUBMENU:=Network Devices
TITLE:=Kernel driver for NSS (connection manager) - dtlsmgr
DEPENDS:=+@NSS_DRV_DTLS_ENABLEi \
DEPENDS:=+@NSS_DRV_DTLS_ENABLE \
+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
+PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi
FILES:=$(PKG_BUILD_DIR)/dtls/$(DTLSMGR_DIR)/qca-nss-dtlsmgr.ko
@ -195,8 +196,7 @@ define KernelPackage/qca-nss-drv-ipsecmgr
+@NSS_DRV_TSTAMP_ENABLE \
+@NSS_DRV_IPSEC_ENABLE \
+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
+PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi \
+kmod-qca-nss-ecm-standard
+PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi
ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
DEPENDS+=+kmod-qca-nss-drv-l2tpv2
endif
@ -270,7 +270,7 @@ define KernelPackage/qca-nss-drv-qdisc
CATEGORY:=Kernel modules
SUBMENU:=Network Devices
TITLE:=Qdisc for configuring shapers in NSS
DEPENDS:=+@NSS_DRV_SHAPER_ENABLE \
DEPENDS:=+@NSS_DRV_SHAPER_ENABLE +@NSS_DRV_IGS_ENABLE \
+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
FILES:=$(PKG_BUILD_DIR)/nss_qdisc/qca-nss-qdisc.ko
KCONFIG:=CONFIG_NET_CLS_ACT=y

View File

@ -1,4 +1,5 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=qca-nss-drv
PKG_RELEASE:=$(AUTORELEASE)
@ -11,9 +12,6 @@ PKG_MIRROR_HASH:=87ab6dab1c0a441b2df95b6c5d992f86a07c6ecd69a0d13eba35014fadaf98d
PKG_JOBS=-j4
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/package.mk
PKG_CONFIG_DEPENDS:= \
CONFIG_NSS_DRV_BRIDGE_ENABLE \
CONFIG_NSS_DRV_C2C_ENABLE \
@ -57,6 +55,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_NSS_DRV_VXLAN_ENABLE \
CONFIG_NSS_DRV_WIFI_ENABLE
include $(INCLUDE_DIR)/package.mk
define KernelPackage/qca-nss-drv
SECTION:=kernel
CATEGORY:=Kernel modules

View File

@ -9,10 +9,10 @@ PKG_SOURCE_DATE:=2022-10-20
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=b0250489
PKG_MIRROR_HASH:=337514bb34d2594910a65be492b42c268a900143a52c3ee128e4a01dd55bacbd
PKG_JOBS=-j4
include $(INCLUDE_DIR)/package.mk
LOCAL_VARIANT=$(patsubst qca-nss-ecm-%,%,$(patsubst qca-nss-ecm-%,%,$(BUILD_VARIANT)))
include $(INCLUDE_DIR)/package.mk
ifeq ($(CONFIG_QCA_NSS_ECM_EXAMPLES_PCC),y)
ECM_MAKE_OPTS+=ECM_CLASSIFIER_PCC_ENABLE=y
@ -44,7 +44,7 @@ define KernelPackage/qca-nss-ecm/Default
CONFIG_NF_CONNTRACK_DSCPREMARK_EXT=y
MENU:=1
PROVIDES:=kmod-qca-nss-ecm
$(call AddDepends/qca-nss-ecm/Default,$(1))
$(call AddDepends/qca-nss-ecm/Default)
endef
define KernelPackage/qca-nss-ecm/Description/Default
@ -61,9 +61,10 @@ define AddDepends/qca-nss-ecm/Default
+@NSS_DRV_PPTP_ENABLE \
+@NSS_DRV_VIRT_IF_ENABLE \
+@NSS_DRV_WIFI_ENABLE \
+PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv \
+kmod-qca-nss-drv \
+PACKAGE_kmod-qca-mcs:kmod-qca-mcs \
+kmod-nf-conntrack \
+kmod-ppp +kmod-pppoe +kmod-pptp $(1)
+kmod-ppp +kmod-pppoe +kmod-pptp
endef
define KernelPackage/qca-nss-ecm/Default/install
@ -84,16 +85,10 @@ endif
endef
define KernelPackage/qca-nss-ecm-standard
$(call KernelPackage/qca-nss-ecm/Default)
ifneq ($(CONFIG_PACKAGE_kmod-pppol2tp),)
DEPENDS+=+PACKAGE_kmod-pppol2tp:kmod-pppol2tp
endif
ifneq ($(CONFIG_PACKAGE_kmod-qca-mcs),)
DEPENDS+=+kmod-qca-mcs
endif
ifneq ($(CONFIG_PACKAGE_kmod-qca-nat46),)
DEPENDS+=+kmod-qca-nat46
endif
$(call KernelPackage/qca-nss-ecm/Default)
DEPENDS+=+PACKAGE_kmod-qca-mcs:kmod-qca-mcs \
+PACKAGE_kmod-pppol2tp:kmod-pppol2tp \
+PACKAGE_kmod-qca-nat46:kmod-qca-nat46
VARIANT:=standard
endef

View File

@ -8,7 +8,7 @@ PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-gmac.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-04-20
PKG_SOURCE_VERSION:=171767947467662f2407d0cfff26dfb136c3fb4a
PKG_MIRROR_HASH:=b0d6a73aaa4e3617c547c4eed16ab9c0c5bc3cc5057209708ee6475c8733d82a
PKG_MIRROR_HASH:=b0d6a73aaa4e3617c547c4eed16ab9c0c5bc3cc5057209708ee6475c8733d82a
include $(INCLUDE_DIR)/package.mk
@ -16,7 +16,7 @@ define KernelPackage/qca-nss-gmac
SECTION:=kernel
CATEGORY:=Kernel modules
SUBMENU:=Network Devices
DEPENDS:=@TARGET_ipq806x||TARGET_ipq_ipq806x @!LINUX_3_18
DEPENDS:=@TARGET_ipq806x||TARGET_ipq_ipq806x
TITLE:=Kernel driver for NSS gmac
FILES:=$(PKG_BUILD_DIR)/ipq806x/qca-nss-gmac.ko
AUTOLOAD:=$(call AutoLoad,31,qca-nss-gmac,1)