Page MenuHomeFreeBSD

net/wifi-firmware-*: use metaport for "base" and switch to Makefile.inc
ClosedPublic

Authored by bz on May 8 2023, 9:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 8, 12:03 AM
Unknown Object (File)
Fri, Mar 8, 12:03 AM
Unknown Object (File)
Fri, Mar 8, 12:03 AM
Unknown Object (File)
Fri, Mar 8, 12:03 AM
Unknown Object (File)
Thu, Mar 7, 11:53 PM
Unknown Object (File)
Jan 13 2024, 8:31 AM
Unknown Object (File)
Jan 6 2024, 11:26 PM
Unknown Object (File)
Jan 3 2024, 5:03 AM

Details

Summary

Rename the wifi-firmware-base to wifi-firmware-kmod (similar to
gpu-firmware-mod). 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 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

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bz requested review of this revision.May 8 2023, 9:02 PM
This revision is now accepted and ready to land.May 12 2023, 6:39 AM

Looks good to me.

Thanks. Can I take this as Approved by: ehaupt as well?

I initially thought an entry in MOVED would be appropriate, but that's probably not the case, since net/wifi-firmware-base will never be installed.

One minor nit. portclippy/portfmt have a few suggestions.

jrm@ser /usr/ports/net/wifi-firmware-kmod [arcpatch-D40014|✔] % portclippy Makefile
# PORTNAME block
PORTNAME
PORTVERSION
CATEGORIES

# Maintainer block
MAINTAINER
COMMENT
WWW

# Dependencies
+RUN_DEPENDS

# USES block
USES

-RUN_DEPENDS
jrm@ser /usr/ports/net/wifi-firmware-kmod [arcpatch-D40014|✔] % portfmt -D Makefile
--- Makefile
+++ Makefile
@@ -8,8 +8,7 @@

 USES=          metaport

-RUN_DEPENDS=   \
-               wifi-firmware-ath10k-kmod>0:net/wifi-firmware-ath10k-kmod \
+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 \

Move RUN_DEPENDS before USES

This revision now requires review to proceed.May 12 2023, 10:44 AM
In D40014#912660, @jrm wrote:

One minor nit. portclippy/portfmt have a few suggestions.

Too many tools beyond portlint ;-)

> # Dependencies
> +RUN_DEPENDS
> 
> # USES block
> USES
> 
> -RUN_DEPENDS

Done.

> -RUN_DEPENDS=   \
> -               wifi-firmware-ath10k-kmod>0:net/wifi-firmware-ath10k-kmod \
> +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 \

This prevents the list to be automatically generated; you then still have to mangle the one line up which is a bit annoying.

This revision is now accepted and ready to land.May 12 2023, 10:54 AM

Can you "Approve" this change as well given I am not a ports committer?

MOVED entry is IMO not required since it was always set to IGNORE.

Portfmt/Portclippy suggestion from @jrm are good inputs:

portclippy Makefile
portfmt -D Makefile # to see what would be done
portfmt -i Makefile

Feel free to commit:

Approved by:       ehaupt
In D40014#912676, @bz wrote:

Can you "Approve" this change as well given I am not a ports committer?

Certainly. Thanks.

Thanks to you two!

I'll also install the extra port* tools and took a note about the suggested checks for the future!