diff --git a/net/Makefile b/net/Makefile --- a/net/Makefile +++ b/net/Makefile @@ -1584,7 +1584,7 @@ SUBDIR += widentd SUBDIR += wifi-firmware-ath10k-kmod SUBDIR += wifi-firmware-ath11k-kmod - SUBDIR += wifi-firmware-base + SUBDIR += wifi-firmware-kmod SUBDIR += wifi-firmware-mt76-kmod SUBDIR += wifi-firmware-rtw88-kmod SUBDIR += wifi-firmware-rtw89-kmod diff --git a/net/wifi-firmware-ath10k-kmod/Makefile b/net/wifi-firmware-ath10k-kmod/Makefile --- a/net/wifi-firmware-ath10k-kmod/Makefile +++ b/net/wifi-firmware-ath10k-kmod/Makefile @@ -1,4 +1,4 @@ -BASEDIR= ${.CURDIR}/../wifi-firmware-base +BASEDIR= ${.CURDIR}/../wifi-firmware-kmod FWDRV= ath10k FWSUBDIR= ath10k @@ -85,4 +85,4 @@ ${DISTFILES_QCA9984_hw10_lic} \ ${DISTFILES_QCA99X0_hw20_lic} -.include "${BASEDIR}/Makefile" +.include "${BASEDIR}/Makefile.inc" diff --git a/net/wifi-firmware-ath11k-kmod/Makefile b/net/wifi-firmware-ath11k-kmod/Makefile --- a/net/wifi-firmware-ath11k-kmod/Makefile +++ b/net/wifi-firmware-ath11k-kmod/Makefile @@ -1,4 +1,4 @@ -BASEDIR= ${.CURDIR}/../wifi-firmware-base +BASEDIR= ${.CURDIR}/../wifi-firmware-kmod FWDRV= ath11k FWSUBDIR= ath11k @@ -102,4 +102,4 @@ # ${DISTFILES_WCN6855_hw20_lic} \ # ${DISTFILES_WCN6750_hw10_lic} -.include "${BASEDIR}/Makefile" +.include "${BASEDIR}/Makefile.inc" diff --git a/net/wifi-firmware-base/pkg-descr b/net/wifi-firmware-base/pkg-descr deleted file mode 100644 --- a/net/wifi-firmware-base/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -WiFi firmware build master port. diff --git a/net/wifi-firmware-kmod/Makefile b/net/wifi-firmware-kmod/Makefile new file mode 100644 --- /dev/null +++ b/net/wifi-firmware-kmod/Makefile @@ -0,0 +1,18 @@ +PORTNAME= wifi-firmware-kmod +PORTVERSION= 20230508 +CATEGORIES= net + +MAINTAINER= bz@FreeBSD.org +COMMENT= Firmware modules for WiFi NIC drivers +WWW= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/ + +RUN_DEPENDS= \ + wifi-firmware-ath10k-kmod>0:net/wifi-firmware-ath10k-kmod \ + wifi-firmware-ath11k-kmod>0:net/wifi-firmware-ath11k-kmod \ + wifi-firmware-mt76-kmod>0:net/wifi-firmware-mt76-kmod \ + wifi-firmware-rtw88-kmod>0:net/wifi-firmware-rtw88-kmod \ + wifi-firmware-rtw89-kmod>0:net/wifi-firmware-rtw89-kmod + +USES= metaport + +.include diff --git a/net/wifi-firmware-base/Makefile b/net/wifi-firmware-kmod/Makefile.inc rename from net/wifi-firmware-base/Makefile rename to net/wifi-firmware-kmod/Makefile.inc diff --git a/net/wifi-firmware-kmod/pkg-descr b/net/wifi-firmware-kmod/pkg-descr new file mode 100644 --- /dev/null +++ b/net/wifi-firmware-kmod/pkg-descr @@ -0,0 +1 @@ +Meta port for the firmware modules for the WiFi NIC drivers. diff --git a/net/wifi-firmware-mt76-kmod/Makefile b/net/wifi-firmware-mt76-kmod/Makefile --- a/net/wifi-firmware-mt76-kmod/Makefile +++ b/net/wifi-firmware-mt76-kmod/Makefile @@ -1,4 +1,4 @@ -BASEDIR= ${.CURDIR}/../wifi-firmware-base +BASEDIR= ${.CURDIR}/../wifi-firmware-kmod FWDRV= mt76 FWSUBDIR= mediatek @@ -28,4 +28,4 @@ ${DISTFILES_mt7921} DISTFILES_lic= -.include "${BASEDIR}/Makefile" +.include "${BASEDIR}/Makefile.inc" diff --git a/net/wifi-firmware-rtw88-kmod/Makefile b/net/wifi-firmware-rtw88-kmod/Makefile --- a/net/wifi-firmware-rtw88-kmod/Makefile +++ b/net/wifi-firmware-rtw88-kmod/Makefile @@ -1,4 +1,4 @@ -BASEDIR= ${.CURDIR}/../wifi-firmware-base +BASEDIR= ${.CURDIR}/../wifi-firmware-kmod FWDRV= rtw88 FWSUBDIR= rtw88 @@ -31,4 +31,4 @@ DISTFILES_lic= \ ${FWSUBDIR}/README${DISTURL_SUFFIX} -.include "${BASEDIR}/Makefile" +.include "${BASEDIR}/Makefile.inc" diff --git a/net/wifi-firmware-rtw89-kmod/Makefile b/net/wifi-firmware-rtw89-kmod/Makefile --- a/net/wifi-firmware-rtw89-kmod/Makefile +++ b/net/wifi-firmware-rtw89-kmod/Makefile @@ -1,4 +1,4 @@ -BASEDIR= ${.CURDIR}/../wifi-firmware-base +BASEDIR= ${.CURDIR}/../wifi-firmware-kmod FWDRV= rtw89 FWSUBDIR= rtw89 @@ -25,4 +25,4 @@ DISTFILES_lic= -.include "${BASEDIR}/Makefile" +.include "${BASEDIR}/Makefile.inc"