Skip to content

Commit

Permalink
net/wifibox: Update to 1.4.1
Browse files Browse the repository at this point in the history 
Changes:	https://github.com/pgj/freebsd-wifibox-port/releases/tag/1.4.0
Changes:	https://github.com/pgj/freebsd-wifibox-port/releases/tag/1.4.1
  • Loading branch information
@pgj @wahjava
pgj authored and wahjava committed Mar 31, 2024
1 parent 934d874 commit ebd486f
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 155 deletions.
133 changes: 85 additions & 48 deletions net/wifibox-alpine/Makefile
View file
@@ -1,6 +1,5 @@
PORTNAME= wifibox-alpine
PORTVERSION= 20230926
PORTREVISION= 1
PORTVERSION= 20240328
CATEGORIES= net

MAINTAINER= pali.gabor@gmail.com
Expand Down Expand Up @@ -42,32 +41,33 @@ COMP_LZO_DESC= lzo
COMP_XZ_DESC= xz
COMP_ZSTD_DESC= zstd

UDS_PASSTHRU_DESC= Control socket pass-through
UDS_PASSTHRU_DESC= Control socket pass-through (wpa_supplicant/hostapd)
IPV6_DESC= IPv6 support
APP_HOSTAPD_DESC= Access Point (hostapd)
APP_WPA_SUPPLICANT_DESC= WPA Supplicant (wpa_supplicant)
XX_MDNS_DESC= mDNS Responder Daemon
XX_FORWARDING_DESC= User-space forwarding
XX_TCPDUMP_DESC= Packet analysis with tcpdump

KERN_LTS_DESC= Linux LTS (6.1.x)
KERN_EDGE_DESC= Linux edge (6.5.x)
KERN_LTS_DESC= Linux LTS (6.6.x)
KERN_EDGE_DESC= Linux edge (6.8.x)

UDS_PASSTHRU_RUN_DEPENDS= socat>0:net/socat

.if ${FLAVOR:U} == default
OPTIONS_GROUP+= FIRMWARE
OPTIONS_GROUP_FIRMWARE= FW_ATH10K FW_ATH11K FW_ATMEL FW_B43 FW_B43LEGACY FW_BRCM\
FW_IPW2100 FW_IPW2200 FW_IWL3945 FW_IWL4965 FW_IWLWIFI\
OPTIONS_GROUP_FIRMWARE= FW_ATH10K FW_ATH11K FW_ATH12K FW_ATMEL FW_B43 FW_B43LEGACY\
FW_BRCM FW_IPW2100 FW_IPW2200 FW_IWL3945 FW_IWL4965 FW_IWLWIFI\
FW_MEDIATEK FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_RTW89\
FW_TI
OPTIONS_GROUP_EXTRAS+= XX_DRIVER_WL

OPTIONS_DEFAULT+= FW_ATH10K FW_ATH11K FW_BRCM FW_IWLWIFI FW_MEDIATEK\
OPTIONS_DEFAULT+= FW_ATH10K FW_ATH11K FW_ATH12K FW_BRCM FW_IWLWIFI FW_MEDIATEK\
FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_RTW89

FW_ATH10K_DESC= Qualcomm Atheros 802.11ac
FW_ATH11K_DESC= Qualcomm Atheros 802.11ax
FW_ATH12K_DESC= Qualcomm Atheros 802.11be
FW_ATMEL_DESC= Atmel at76c50x 802.11b
FW_B43_DESC= Broadcom B43xx 802.11a/b/g/n
FW_B43LEGACY_DESC= Broadcom B43xx 802.11b (legacy)
Expand All @@ -93,10 +93,13 @@ _GITHUB_SITE= https://github.com/pgj/freebsd-wifibox-alpine/releases/download
USE_GITHUB= nodefault
GH_ACCOUNT= pgj
GH_PROJECT= freebsd-wifibox-alpine:scripts
GH_TAGNAME= 2646128d92561b62fe4ea863aee9cad4b5fa8eda:scripts
GH_TAGNAME= fe9b384e45c57b0cfafe5e5b3931ba163f4230fd:scripts

ALPINE_VERSION= 3.18.3
ALPINE_DATE= 2023.09.16
ALPINE_VERSION= 3.19.1
ALPINE_DATE= 2024.03.23

LINUX_LTS_VERSION= 6.6.22-r1
LINUX_EDGE_VERSION= 6.8.1-r1

_ALPINE_VER= ${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@}
_ALPINE_SITE1= https://dl-cdn.alpinelinux.org/alpine/v${_ALPINE_VER}
Expand All @@ -111,7 +114,7 @@ _ALPINE_SITE2= ${_ALPINE_BASE}/alpine/v${_ALPINE_VER}
.endif

_LINUXFW_SITE= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/
_LINUXFW_TAG= 20230919
_LINUXFW_TAG= 20240312
_LINUXFW= linux-firmware-${_LINUXFW_TAG}

MASTER_SITES+= ${_ALPINE_SITE1}/releases/x86_64/:rootfs \
Expand All @@ -125,20 +128,22 @@ MASTER_SITES+= ${_ALPINE_SITE1}/releases/x86_64/:rootfs \
https://github.com/openwrt/mt76/archive/:mt76

_MINIROOTFS= alpine-minirootfs-${ALPINE_VERSION}-x86_64.tar.gz
_PACKAGES= baselayout-3.4.3-r1:wifibox \
busybox-1.36.1-r1:wifibox \
ifupdown-ng-0.12.1-r1:wifibox \
iptables-1.8.9-r1:wifibox \
_PACKAGES= baselayout-3.4.3-r3:wifibox \
busybox-1.36.1-r2:wifibox \
ifupdown-ng-0.12.1-r2:wifibox \
iptables-1.8.10-r0:wifibox \
iw-5.19-r1 \
libcap2-2.69-r0 \
libcap-utils-2.69-r0 \
libcrypto3-3.1.2-r0 \
libmnl-1.0.5-r1 \
libnftnl-1.2.5-r1 \
libnl3-3.7.0-r1 \
libssl3-3.1.2-r0 \
musl-1.2.4-r1 \
openrc-0.48-r0:wifibox
libcap2-2.69-r1 \
libcap-getcap-2.69-r1 \
libcap-setcap-2.69-r1 \
libcap-utils-2.69-r1 \
libcrypto3-3.1.4-r5 \
libmnl-1.0.5-r2 \
libnftnl-1.2.6-r0 \
libnl3-3.9.0-r1 \
libssl3-3.1.4-r5 \
musl-1.2.4_git20230717-r4 \
openrc-0.52.1-r0:wifibox

_BOOT_SERVICES= bootmisc defaults modules hostname hwclock networking sysctl \
syslog urandom
Expand All @@ -152,7 +157,7 @@ _IPW2100_FIRMWARE= ipw/ipw2100-1.3 \
ipw/ipw2100-1.3-i
_IPW2200_FIRMWARE= iwi/ipw2200-bss \
iwi/ipw2200-ibss
_MT76_FIRMWARE= c19b62fe6b68c3244e150248f250369504d3fd74
_MT76_FIRMWARE= 2135e201e7a9339e018d4e2d4a33c73266e674d7

_LINUX64_KMOD!= (kldstat -qn linux64 && echo "found") || echo ""

Expand Down Expand Up @@ -182,24 +187,24 @@ _BOOT_SERVICES+= ip6tables radvd

.if (${PORT_OPTIONS:MUDS_PASSTHRU} && empty(PORT_OPTIONS:MXX_FORWARDING)) \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= socat-1.7.4.4-r1:wifibox
_PACKAGES+= socat-1.8.0.0-r0:wifibox
.endif

.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= socat-with-udp-1.7.4.4-r1:wifibox
_PACKAGES+= socat-with-udp-1.8.0.0-r0:wifibox
.endif

.if ${PORT_OPTIONS:MUDS_PASSTHRU} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= uds_passthru-0.1.1-r2:wifibox
_PACKAGES+= uds_passthru-0.1.1-r3:wifibox
.endif

.if ${PORT_OPTIONS:MIPV6} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= radvd-2.19-r0:wifibox
_PACKAGES+= radvd-2.19-r1:wifibox
.endif

.if ${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= dhcpcd-10.0.2-r0:wifibox
_PACKAGES+= dhcpcd-10.0.6-r0:wifibox
.endif

.if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT}
Expand All @@ -212,8 +217,8 @@ _ETC_SRCS+= etc/optional/ipv6/wpa_supplicant
.endif

.if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= pcsc-lite-libs-1.9.9-r3 \
wpa_supplicant-2.10-r5:wifibox
_PACKAGES+= pcsc-lite-libs-2.0.0-r2 \
wpa_supplicant-2.10-r7:wifibox
.endif

.if ${PORT_OPTIONS:MAPP_HOSTAPD}
Expand All @@ -226,7 +231,7 @@ _ETC_SRCS+= etc/optional/ipv6/hostapd
.endif

.if ${PORT_OPTIONS:MAPP_HOSTAPD} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= hostapd-2.10-r3:wifibox
_PACKAGES+= hostapd-2.10-r4:wifibox
.endif

.if ${PORT_OPTIONS:MXX_MDNS}
Expand All @@ -235,8 +240,8 @@ _ETC_SRCS+= etc/optional/mdns
.endif

.if ${PORT_OPTIONS:MXX_MDNS} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= mbedtls-2.28.4-r0 \
mDNSResponder-1790.80.10-r1:wifibox
_PACKAGES+= mbedtls-2.28.7-r0 \
mDNSResponder-2200.80.16-r0:wifibox
.endif

.if ${PORT_OPTIONS:MXX_FORWARDING}
Expand All @@ -245,7 +250,7 @@ _ETC_SRCS+= etc/optional/forwarding
.endif

.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= forwarding-0.1.0-r2:wifibox
_PACKAGES+= forwarding-0.1.0-r3:wifibox
.endif

.if ${PORT_OPTIONS:MXX_TCPDUMP} || make(makesum) || make(fetch-url-list-int)
Expand All @@ -254,11 +259,11 @@ _PACKAGES+= libpcap-1.10.4-r1 \
.endif

.if ${PORT_OPTIONS:MKERN_LTS} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= linux-lts-6.1.54-r0:wifibox
_PACKAGES+= linux-lts-${LINUX_LTS_VERSION}:wifibox
.endif

.if ${PORT_OPTIONS:MKERN_EDGE} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= linux-edge-6.5.4-r0:wifibox
_PACKAGES+= linux-edge-${LINUX_EDGE_VERSION}:wifibox
.endif

.if ${PORT_OPTIONS:MXX_MDNS} || ${PORT_OPTIONS:MXX_FORWARDING}
Expand All @@ -276,6 +281,7 @@ DISTFILES+= ${_MINIROOTFS}:rootfs

LFW_ATH10K_FILES= ath10k
LFW_ATH11K_FILES= ath11k
LFW_ATH12K_FILES= ath12k
LFW_BRCM_FILES= brcm
LFW_IWL3945_FILES= iwlwifi-3945-*.ucode
LFW_IWL4965_FILES= iwlwifi-4965-*.ucode
Expand All @@ -294,36 +300,63 @@ LINUX_FIRMWARE+= ${L${fw_opt}_FILES}
.endif
.endfor

RTL8821CE_VERSION= 20240120
RTW88_VERSION= 20240316
RTW89_VERSION= 20240310
BROADCOM_WL_VERSION= 6.30.223.271

_LINUX_LTS_MAJOR= ${LINUX_LTS_VERSION:C/^([0-9]*)\..*/\1/}
_LINUX_LTS_MINOR= ${LINUX_LTS_VERSION:C/^[0-9]*\.([0-9]*)\..*/\1/}
_LINUX_LTS_PATCH= ${LINUX_LTS_VERSION:C/^[0-9]*\.[0-9]*\.([0-9]*)-.*/\1/}
_LINUX_LTS_REVISION= ${LINUX_LTS_VERSION:C/^.*-r([0-9]*)/\1/}

_KERN_LTS_REL!= printf "%02d%02d%03d%02d" \
${_LINUX_LTS_MAJOR} \
${_LINUX_LTS_MINOR} \
${_LINUX_LTS_PATCH} \
${_LINUX_LTS_REVISION}

_LINUX_EDGE_MAJOR= ${LINUX_EDGE_VERSION:C/^([0-9]*)\..*/\1/}
_LINUX_EDGE_MINOR= ${LINUX_EDGE_VERSION:C/^[0-9]*\.([0-9]*)\..*/\1/}
_LINUX_EDGE_PATCH= ${LINUX_EDGE_VERSION:C/^[0-9]*\.[0-9]*\.([0-9]*)-.*/\1/}
_LINUX_EDGE_REVISION= ${LINUX_EDGE_VERSION:C/^.*-r([0-9]*)/\1/}

_KERN_EDGE_REL!= printf "%02d%02d%03d%02d" \
${_LINUX_EDGE_MAJOR} \
${_LINUX_EDGE_MINOR} \
${_LINUX_EDGE_PATCH} \
${_LINUX_EDGE_REVISION}

.if ${PORT_OPTIONS:MFW_RTW88} && ${PORT_OPTIONS:MKERN_LTS} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= rtl8821ce-20230915-r1:wifibox \
rtw88-20230913-r1:wifibox
_PACKAGES+= rtl8821ce-${RTL8821CE_VERSION}-r${_KERN_LTS_REL}00:wifibox \
rtw88-${RTW88_VERSION}-r${_KERN_LTS_REL}00:wifibox
.endif

.if ${PORT_OPTIONS:MFW_RTW88} && ${PORT_OPTIONS:MKERN_EDGE} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= rtl8821ce-edge-20230915-r1:wifibox \
rtw88-edge-20230913-r1:wifibox
_PACKAGES+= rtl8821ce-edge-${RTL8821CE_VERSION}-r${_KERN_EDGE_REL}00:wifibox \
rtw88-edge-${RTW88_VERSION}-r${_KERN_EDGE_REL}00:wifibox
.endif

.if ${PORT_OPTIONS:MFW_RTW89} && ${PORT_OPTIONS:MKERN_LTS} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= rtw89-20230913-r1:wifibox
_PACKAGES+= rtw89-${RTW89_VERSION}-r${_KERN_LTS_REL}00:wifibox
.endif

.if ${PORT_OPTIONS:MFW_RTW89} && ${PORT_OPTIONS:MKERN_EDGE} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= rtw89-edge-20230913-r1:wifibox
_PACKAGES+= rtw89-edge-${RTW89_VERSION}-r${_KERN_EDGE_REL}00:wifibox
.endif

.if ${PORT_OPTIONS:MXX_DRIVER_WL} && ${PORT_OPTIONS:MKERN_LTS} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= broadcom-wl-6.30.223.271-r13:wifibox
_PACKAGES+= broadcom-wl-${BROADCOM_WL_VERSION}-r${_KERN_LTS_REL}00:wifibox
.endif

.if ${PORT_OPTIONS:MXX_DRIVER_WL} && ${PORT_OPTIONS:MKERN_EDGE} \
|| make(makesum) || make(fetch-url-list-int)
_PACKAGES+= broadcom-wl-edge-6.30.223.271-r13:wifibox
_PACKAGES+= broadcom-wl-edge-${BROADCOM_WL_VERSION}-r${_KERN_EDGE_REL}00:wifibox
.endif

.if !empty(LINUX_FIRMWARE)
Expand Down Expand Up @@ -415,6 +448,11 @@ pre-build:
-C ${_FIRMWAREDIR} --strip-components 1 \
*/${fw_files}
.endfor
.if ${PORT_OPTIONS:MFW_BRCM}
$(FIND) ${_FIRMWAREDIR}/${LFW_BRCM_FILES} -name 'brcmfmac*-pcie.bin' -type f \
| ${SED} -E 's!(.*)-pcie.bin!ln -s $$(basename \1-pcie.bin) \1-pcie.bin.FreeBSD-BHYVE.bin!' \
| ${SH}
.endif
.if ${PORT_OPTIONS:MFW_MEDIATEK}
${TAR} -xf ${_DISTDIR}/${_MT76_FIRMWARE}.zip \
-C ${_FIRMWAREDIR} --strip-components 2 \
Expand All @@ -431,7 +469,6 @@ post-install:

WRKSRC= ${WRKSRC_scripts}
MAKE_ARGS+= VERSION=${PORTVERSION} \
MANDIR="${STAGEDIR}${PREFIX}/share/man" \
MINIROOTFS=${_DISTDIR}/${_MINIROOTFS} \
PACKAGES="${_APK_FILES}" \
BOOT_SERVICES="${_BOOT_SERVICES}" \
Expand Down

0 comments on commit ebd486f

Please sign in to comment.