Re: git: 80f50c9eb66d - main - net/wifi-firmware-*kmod: improve build logic, add flavors, update fw version

On Fri, 2024-05-24 at 17:41, Vladimir Druzenko <vvd@freebsd.org> wrote:

> 24.05.2024 01:20, Bjoern A. Zeeb пишет:
>> The branch main has been updated by bz:

>> URL: https://cgit.FreeBSD.org/ports/commit/?id=80f50c9eb66d88b6e69cd5159d1ff318dcb60b33

>> commit 80f50c9eb66d88b6e69cd5159d1ff318dcb60b33
>> Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
>> AuthorDate: 2024-04-25 13:46:04 +0000
>> Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
>> CommitDate: 2024-05-23 22:19:37 +0000

>>      net/wifi-firmware-*kmod: improve build logic, add flavors, update fw version
>>           - update framework to no longer depend on local distfiles for firmware(9)
>>        but generate the Makefile hierarchy in post-extract.  Keep a
>>        Makefile.inc.in in files for simplicity.
>>      - update extracting WHENCE parts using a local WHENCE.awk.in in files
>>        and a pattern to match the section(s).
>>      - use the already prepared FWSUBS sections for flavors and add the
>>        FWDRV as "default".  Generate the CONFLICTS_INSTALL conflict and
>>        PKGNAMESUFFIX entries.  Adjust paths and logic for flavors.
>>        Depend on the flavors rather the combined ("default flavor") packages
>>        by default if someone installs wifi-firmware-kmod.
>>        The wifi-firmware-${name}-kmod packages are still built for older
>>        versions of fwget shipping in releases.
>>      - add support for iwlwifi and ath12k firmware
>>      - update firmware to linux-firmware.git tag: 20240513 for all drivers.
>>           Sponsored by:   The FreeBSD Foundation
>>      Reviewed by:    jrm
>>      Differential Revision: https://reviews.freebsd.org/D44945
>> ---
>>   net/wifi-firmware-ath10k-kmod/Makefile       | 126 +++++++++++-----------
>>   net/wifi-firmware-ath10k-kmod/distinfo       | 150 +++++++++++++--------------
>>   net/wifi-firmware-ath11k-kmod/Makefile       | 119 ++++++---------------
>>   net/wifi-firmware-ath11k-kmod/distinfo       |  54 ++++++----
>>   net/wifi-firmware-ath12k-kmod/Makefile       |  35 +++++++
>>   net/wifi-firmware-ath12k-kmod/distinfo       |  13 +++
>>   net/wifi-firmware-ath12k-kmod/pkg-descr      |   3 +
>>   net/wifi-firmware-iwlwifi-kmod/Makefile      |  68 ++++++++++++
>>   net/wifi-firmware-iwlwifi-kmod/distinfo      |  49 +++++++++
>>   net/wifi-firmware-iwlwifi-kmod/pkg-descr     |   1 +
>>   net/wifi-firmware-kmod/Makefile              |  43 ++++++--
>>   net/wifi-firmware-kmod/Makefile.inc          |  96 +++++++++++------
>>   net/wifi-firmware-kmod/files/Makefile.inc.in |  26 +++++
>>   net/wifi-firmware-kmod/files/WHENCE.awk.in   |  24 +++++
>>   net/wifi-firmware-mt76-kmod/Makefile         |  57 ++++++++--
>>   net/wifi-firmware-mt76-kmod/distinfo         |  96 ++++++++++++-----
>>   net/wifi-firmware-mt76-kmod/pkg-descr        |   2 +
>>   net/wifi-firmware-rtw88-kmod/Makefile        |  28 +++--
>>   net/wifi-firmware-rtw88-kmod/distinfo        |  36 +++----
>>   net/wifi-firmware-rtw89-kmod/Makefile        |  31 ++++--
>>   net/wifi-firmware-rtw89-kmod/distinfo        |  28 ++---
>>   net/wifi-firmware-rtw89-kmod/pkg-descr       |  12 ++-
>>   22 files changed, 728 insertions(+), 369 deletions(-)
>> *** 464 LINES SKIPPED ***

> # make index
> make_index: /usr/ports/net/wifi-firmware-kmod: no entry for /usr/ports/net/wifi-firmware-ath12k-kmod

> # grep wifi-firmware-ath12k-kmod net/Makefile | wc -l
> 0

Hi,

Thanks for reporting.  Fixed in c5bbdddbac5e1cc8ee1e0ca1710c85914cec040a.

Joe