net/wifi-firmware-*: build framework and license hack cleanup
ClosedPublic
Actions

Authored by bz on Jul 25 2024, 12:09 PM.

Details

Reviewers

Commits

R11:8f79c11c7171: net/wifi-firmware-*: build framework and license hack cleanup

Summary

Cleanup the extra layer of "flavour" that came into the build framework
when flavours were introduced at a time when it was not planned.
Make linters some more happy. [1]

Remove the special license hack to install additional files.
If DISABLE_LICENSES is set we still installed files making builds fail [2].
One would hope to always install the lincese files but simply disable
any checking by the framework.
Introduce a new way using LICENSE_COMB=multi to install the default
license file, the extra WHENCE and any possible extra firmware license
files. Technically this is an abuse of the system too but at least it
should work and not break non default options.

Based on: D45369 by jrm [1]
Reported by: pi [2]
Sponsored by: The FreeBSD Foundation

Test Plan

None yet; someone with a clean ports build setup should probably try this out.

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 58820
Build 55707: arc lint + arc unit

Event Timeline

bz requested review of this revision.Jul 25 2024, 12:09 PM

bz created this revision.

Harbormaster completed remote builds in B58820: Diff 141363.Jul 25 2024, 12:09 PM

bz mentioned this in D45369: net/wifi-firmware-kmod: [WIP] Attempt to simplify wifi-firmware ports.Jul 25 2024, 12:10 PM

bz added inline comments.

net/wifi-firmware-kmod/Makefile.inc
44	Add extra firmware license files.

jrm added inline comments.Aug 15 2024, 6:03 PM

net/wifi-firmware-kmod/Makefile.inc
46	I did a quick test, and I got build failures. https://pkg.ftfl.ca/build.html?mastername=15amd64-default&build=2024-08-01_13h38m25s Removing this line fixed the build.

bz marked an inline comment as done.Aug 16 2024, 10:55 AM

bz added inline comments.

net/wifi-firmware-kmod/Makefile.inc
46	It seems that the :range of FOO= and FOO= 1 both evaluate to 1. So if there is no license it still tries to add one if the variable is defined; if the variable was not defined at all there likely was an error. Can you try the update which comes in a few minutes?

Try to fix the ;range check in case the variable is not defined or defined
without value; in the latter case :range seems to still evaluate to 1.

FLAVORS=a b c d

DISTFILES_a_lic=        1 2 3
DISTFILES_b_lic=
DISTFILES_c_lic=        7

all:
.for FLAVOR in ${FLAVORS}
.if "${DISTFILES_${FLAVOR}_lic}"
        @echo "FLAVOR '${FLAVOR}' : " ${DISTFILES_${FLAVOR}_lic:range}

.for _n in ${DISTFILES_${FLAVOR}_lic:range}
        @echo "  ${_n}"
.endfor
.endif
.endfor

Harbormaster completed remote builds in B59039: Diff 142125.Aug 16 2024, 10:56 AM

Build succeeds.

This revision is now accepted and ready to land.Aug 22 2024, 8:02 PM

Closed by commit R11:8f79c11c7171: net/wifi-firmware-*: build framework and license hack cleanup (authored by bz). · Explain WhyAug 27 2024, 5:42 PM

This revision was automatically updated to reflect the committed changes.

bz added a commit: R11:8f79c11c7171: net/wifi-firmware-*: build framework and license hack cleanup.