Differential D47068
net/wifi-firmware-kmod: stop building kmods on main Authored by bz on Oct 11 2024, 8:45 PM.
Details In feb 2024 a feature to firmware(9) was introduced to be able to load Sponsored by: The FreeBSD Foundation
Diff Detail
Event Timeline
Comment Actions Bjoern, I built the wifi ports on a CURRENT system built after the February changes using poudriere bulk -t -C -i -j 15amd64 -f ~/wifi_ports.txt. Based on your changes, I expected the files to be installed under /boot/firmware. However this is what I see. $ make -VOSVERSION 1500021 $ pkg info pkg-1.21.3 Package manager wifi-firmware-ath10k-kmod-qca6174_hw21-20240513 Firmware modules for the ath10k (qca6174_hw21) WiFi NIC driver wifi-firmware-ath10k-kmod-qca6174_hw30-20240513 Firmware modules for the ath10k (qca6174_hw30) WiFi NIC driver wifi-firmware-ath10k-kmod-qca9377_hw10-20240513 Firmware modules for the ath10k (qca9377_hw10) WiFi NIC driver wifi-firmware-ath10k-kmod-qca9887_hw10-20240513 Firmware modules for the ath10k (qca9887_hw10) WiFi NIC driver wifi-firmware-ath10k-kmod-qca9888_hw20-20240513 Firmware modules for the ath10k (qca9888_hw20) WiFi NIC driver wifi-firmware-ath10k-kmod-qca988x_hw20-20240513 Firmware modules for the ath10k (qca988x_hw20) WiFi NIC driver wifi-firmware-ath10k-kmod-qca9984_hw10-20240513 Firmware modules for the ath10k (qca9984_hw10) WiFi NIC driver wifi-firmware-ath10k-kmod-qca99x0_hw20-20240513 Firmware modules for the ath10k (qca99x0_hw20) WiFi NIC driver wifi-firmware-ath11k-kmod-qca6390_hw20-20240513 Firmware modules for the ath11k (qca6390_hw20) WiFi NIC driver wifi-firmware-ath11k-kmod-qcn9074_hw10-20240513 Firmware modules for the ath11k (qcn9074_hw10) WiFi NIC driver wifi-firmware-ath11k-kmod-wcn6855_hw20-20240513 Firmware modules for the ath11k (wcn6855_hw20) WiFi NIC driver wifi-firmware-ath12k-kmod-wcn7850_hw20-20240513 Firmware modules for the ath12k (wcn7850_hw20) WiFi NIC driver wifi-firmware-iwlwifi-kmod-22000-20240513 Firmware modules for the iwlwifi (22000) WiFi NIC driver wifi-firmware-iwlwifi-kmod-7000-20240513 Firmware modules for the iwlwifi (7000) WiFi NIC driver wifi-firmware-iwlwifi-kmod-8000-20240513 Firmware modules for the iwlwifi (8000) WiFi NIC driver $ ls -lah /boot/firmware total 9 drwxr-xr-x 2 root wheel 2B Jul 18 13:36 . drwxr-xr-x 14 root wheel 71B Jul 25 10:51 .. $ pkg info -l wifi-firmware-iwlwifi-kmod-22000-20240513 wifi-firmware-iwlwifi-kmod-22000-20240513: /boot/modules/iwlwifi_QuZ_a0_hr_b0_77_ucode.ko /boot/modules/iwlwifi_QuZ_a0_jf_b0_77_ucode.ko /boot/modules/iwlwifi_Qu_b0_hr_b0_77_ucode.ko /boot/modules/iwlwifi_Qu_b0_jf_b0_77_ucode.ko /boot/modules/iwlwifi_Qu_c0_hr_b0_77_ucode.ko /boot/modules/iwlwifi_cc_a0_77_ucode.ko /usr/local/share/licenses/wifi-firmware-iwlwifi-kmod-22000-20240513/LICENSE /usr/local/share/licenses/wifi-firmware-iwlwifi-kmod-22000-20240513/catalog.mk /usr/local/share/licenses/wifi-firmware-iwlwifi-kmod-22000-20240513/primary /usr/local/share/licenses/wifi-firmware-iwlwifi-kmod-22000-20240513/whence Also, if I build the ports individually with, e.g., poudriere testport -i -j 15amd64 net/wifi-firmware-iwlwifi-kmod it fails with a plist error. ====> Running Q/A tests (stage-qa) ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: /boot/modules/iwlwifi_3160_17_ucode.ko Error: Missing: /boot/modules/iwlwifi_3168_29_ucode.ko Error: Missing: /boot/modules/iwlwifi_7260_17_ucode.ko Error: Missing: /boot/modules/iwlwifi_7265D_29_ucode.ko Error: Missing: /boot/modules/iwlwifi_7265_17_ucode.ko Error: Missing: /boot/modules/iwlwifi_8000C_36_ucode.ko Error: Missing: /boot/modules/iwlwifi_8265_36_ucode.ko Error: Missing: /boot/modules/iwlwifi_9000_pu_b0_jf_b0_46_ucode.ko Error: Missing: /boot/modules/iwlwifi_9260_th_b0_jf_b0_46_ucode.ko Error: Missing: /boot/modules/iwlwifi_QuZ_a0_hr_b0_77_ucode.ko Error: Missing: /boot/modules/iwlwifi_QuZ_a0_jf_b0_77_ucode.ko Error: Missing: /boot/modules/iwlwifi_Qu_b0_hr_b0_77_ucode.ko Error: Missing: /boot/modules/iwlwifi_Qu_b0_jf_b0_77_ucode.ko Error: Missing: /boot/modules/iwlwifi_Qu_c0_hr_b0_77_ucode.ko Error: Missing: /boot/modules/iwlwifi_cc_a0_77_ucode.ko Error: Missing: /boot/modules/iwlwifi_gl_c0_fm_c0_83_ucode.ko Error: Missing: /boot/modules/iwlwifi_gl_c0_fm_c0_pnvm.ko Error: Missing: /boot/modules/iwlwifi_ma_b0_gf4_a0_89_ucode.ko Error: Missing: /boot/modules/iwlwifi_ma_b0_gf4_a0_pnvm.ko Error: Missing: /boot/modules/iwlwifi_ma_b0_gf_a0_89_ucode.ko Error: Missing: /boot/modules/iwlwifi_ma_b0_gf_a0_pnvm.ko Error: Missing: /boot/modules/iwlwifi_ma_b0_hr_b0_83_ucode.ko ===> Error: Plist issues found. *** Error code 1 Stop. make: stopped making "check-plist" in /usr/ports/net/wifi-firmware-iwlwifi-kmod I'll try to investigate the issue, but it may take me a day or two. Comment Actions This one is without the port update (one of the other reviews): % pkg info -l wifi-firmware-rtw89-kmod-20240513
wifi-firmware-rtw89-kmod-20240513:
/boot/firmware/rtw89/rtw8851b_fw.bin
/boot/firmware/rtw89/rtw8852a_fw.bin
/boot/firmware/rtw89/rtw8852b_fw-1.bin
/boot/firmware/rtw89/rtw8852c_fw.bin
/boot/firmware/rtw89/rtw8922a_fw.bin
/usr/local/share/licenses/wifi-firmware-rtw89-kmod-20240513/LICENSE
/usr/local/share/licenses/wifi-firmware-rtw89-kmod-20240513/catalog.mk
/usr/local/share/licenses/wifi-firmware-rtw89-kmod-20240513/primary
/usr/local/share/licenses/wifi-firmware-rtw89-kmod-20240513/whence
% ls -l /boot/firmware/
total 4
drwxr-xr-x 2 root wheel 512 Oct 11 20:38 rtw89
% ls -l /boot/firmware/rtw89/
total 6944
-r--r--r-- 1 root wheel 1162024 Oct 11 20:34 rtw8851b_fw.bin
-r--r--r-- 1 root wheel 1423232 Oct 11 20:34 rtw8852a_fw.bin
-r--r--r-- 1 root wheel 1242808 Oct 11 20:34 rtw8852b_fw-1.bin
-r--r--r-- 1 root wheel 1532656 Oct 11 20:34 rtw8852c_fw.bin
-r--r--r-- 1 root wheel 1537690 Oct 11 20:34 rtw8922a_fw.bin
...
Is that with the other change on top already or just with this one?
Can pourdiere still be used without ZFS? I think I should setup myself with such a system somehow as it seems to yield different results to calling make in the ports tree Comment Actions Just this one. I wasn't aware that this review depended on another. I'll stack them and test again later.
There is a NO_ZFS=yes knob for poudriere.conf. I've only used poudriere with ZFS, so cannot comment on how well it works. Comment Actions They should all build by itself one after the other. The update depends on this one to be applied; I should open a stack.
I'll go and have a look. Comment Actions This now seems to build on amd64 14.1-R and main under poudriere for me. Problems solved:
Comment Actions Also added OSVERSION checks for the next __FreeBSD_version bump in stable/14 to catch the direct firmware file loading there too. Comment Actions Fix PLIST for the plain firmware file case. Also remove the SSP_UNSAFE= again as that was also caused by the Need to disect the results still but pouder with -t was happy again. Comment Actions Change the 14-branch __FreeBSD_verison naumber to check to one actually used (and documented)
| ||||||||||||||||||||