Skip to content

Commit

Permalink
net/wifi-firmware-*: use metaport for "base" and switch to Makefile.inc
Browse files Browse the repository at this point in the history
Rename the wifi-firmware-base to wifi-firmware-kmod (similar to
gpu-firmware-mod).  The former was never build so technically it
is no move.  Make the new subdir a metaport including all
wireless firmware.
Move the old Makefile to Makefile.inc and adjust the child ports
accordingly.

This solves two problems: (1) the base port is now buildable and (2)
there is a single port to depend on to add all the needed firmware
files to, e.g., put on a release media.

Suggested by:	amdmi3
PR:		270742
Reviewed by:	ehaupt, jrm
Approved by:	ehaupt, jrm
Differential Revision: https://reviews.freebsd.org/D40014
  • Loading branch information
Bjoern A. Zeeb authored and Bjoern A. Zeeb committed May 12, 2023
1 parent e0ba0f8 commit 6247964
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 12 deletions.
2 changes: 1 addition & 1 deletion net/Makefile
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions net/wifi-firmware-ath10k-kmod/Makefile
@@ -1,4 +1,4 @@
BASEDIR= ${.CURDIR}/../wifi-firmware-base
BASEDIR= ${.CURDIR}/../wifi-firmware-kmod

FWDRV= ath10k
FWSUBDIR= ath10k
Expand Down Expand Up @@ -85,4 +85,4 @@ DISTFILES_lic= \
${DISTFILES_QCA9984_hw10_lic} \
${DISTFILES_QCA99X0_hw20_lic}

.include "${BASEDIR}/Makefile"
.include "${BASEDIR}/Makefile.inc"
4 changes: 2 additions & 2 deletions net/wifi-firmware-ath11k-kmod/Makefile
@@ -1,4 +1,4 @@
BASEDIR= ${.CURDIR}/../wifi-firmware-base
BASEDIR= ${.CURDIR}/../wifi-firmware-kmod

FWDRV= ath11k
FWSUBDIR= ath11k
Expand Down Expand Up @@ -102,4 +102,4 @@ DISTFILES_lic= \
# ${DISTFILES_WCN6855_hw20_lic} \
# ${DISTFILES_WCN6750_hw10_lic}

.include "${BASEDIR}/Makefile"
.include "${BASEDIR}/Makefile.inc"
1 change: 0 additions & 1 deletion net/wifi-firmware-base/pkg-descr

This file was deleted.

18 changes: 18 additions & 0 deletions 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 <bsd.port.mk>
File renamed without changes.
1 change: 1 addition & 0 deletions net/wifi-firmware-kmod/pkg-descr
@@ -0,0 +1 @@
Meta port for the firmware modules for the WiFi NIC drivers.
4 changes: 2 additions & 2 deletions net/wifi-firmware-mt76-kmod/Makefile
@@ -1,4 +1,4 @@
BASEDIR= ${.CURDIR}/../wifi-firmware-base
BASEDIR= ${.CURDIR}/../wifi-firmware-kmod

FWDRV= mt76
FWSUBDIR= mediatek
Expand Down Expand Up @@ -28,4 +28,4 @@ DISTFILES_fw= \
${DISTFILES_mt7921}
DISTFILES_lic=

.include "${BASEDIR}/Makefile"
.include "${BASEDIR}/Makefile.inc"
4 changes: 2 additions & 2 deletions net/wifi-firmware-rtw88-kmod/Makefile
@@ -1,4 +1,4 @@
BASEDIR= ${.CURDIR}/../wifi-firmware-base
BASEDIR= ${.CURDIR}/../wifi-firmware-kmod

FWDRV= rtw88
FWSUBDIR= rtw88
Expand Down Expand Up @@ -31,4 +31,4 @@ DISTFILES_fw= \
DISTFILES_lic= \
${FWSUBDIR}/README${DISTURL_SUFFIX}

.include "${BASEDIR}/Makefile"
.include "${BASEDIR}/Makefile.inc"
4 changes: 2 additions & 2 deletions net/wifi-firmware-rtw89-kmod/Makefile
@@ -1,4 +1,4 @@
BASEDIR= ${.CURDIR}/../wifi-firmware-base
BASEDIR= ${.CURDIR}/../wifi-firmware-kmod

FWDRV= rtw89
FWSUBDIR= rtw89
Expand All @@ -25,4 +25,4 @@ DISTFILES_fw= \

DISTFILES_lic=

.include "${BASEDIR}/Makefile"
.include "${BASEDIR}/Makefile.inc"

0 comments on commit 6247964

Please sign in to comment.