From nobody Fri Mar 14 19:31:50 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZDvd315LTz5qf3L; Fri, 14 Mar 2025 19:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZDvd25gNrz46xh; Fri, 14 Mar 2025 19:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741980710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tBhJPute/PIkF1jBY6YGGsCk63JgISNt4uB+qAdJO5U=; b=BAVCjLoBsvDgKb2vXy2GKmPz5L40vaPdg33yx2es3bUu2IlfxS75JcpmVzVlPhboatiKJi iXX6GeyjxO6le4l3pdSwZfRmE0Uuy51PKXplk2hZ1XtrTlHQISazglKWgbbiXD0qWcfn5H tKS31lklEVW+Q/gKmnqrOhjtnvWcwJtBOCT7hzbA68crcHOx/WlNUEfmrKEUUreE5h2XSK kwf9fMHUr3GL5xI7gfmwwRFioGTOKYkbtXUtr1TPDhw7q6S+L3G01X2h8YfhF1DaWVmVMv mYD2T4MB0gzdEJ7GAHFo/o/1G9qjdmIqYJnseaCq4X/DWE9U/IYxnyOH3bSKBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741980710; a=rsa-sha256; cv=none; b=OWLGKjyds49PB+WMC5WbCuETrxPIK0U5gt//LgEqsHMFUz85/FKJjuMzIgR4a63DYvLPuT Q0RNghTUco2GoObCK76yTmzE6fh967gATkMAnImXuB2GYiB8e0k62uAy2hRSnmRtiLxFFN CL5P32DFAHTqaV6L/jdSm/C/pVB+OYxU3IWRaxI01GeadDPCtZiKJOhBVjpZcUD0JazXRj 8pnzbyI5LzdpHmNYS9fK28D8AYQ82zvBuyu0ibBT+un3CVWY06A5W/447KJPHPI7+RbMss xXzZW6cbmMCvtKuwgE4iV6a4bLt5g9uQwfy839o09IhGQyPuEnxEo2Lqd3Nmig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741980710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tBhJPute/PIkF1jBY6YGGsCk63JgISNt4uB+qAdJO5U=; b=heLPC9s63T0sUFVqd27OFXJsZe7ZYMPgD2fk1t90HS5pw8tVqGn/Q49EoKjVMxs5KQp2HE HmTfKjjVvwdVWmiszztPkoOtedoRFWShCwbQlcv697scfCg9UueJJg3z14aBRAxGF/UYDD EPlXhijq/f5TVGq+mDEW4S48zcotvaMe04DhN2YMRMUh35zUhDBkU2x2ecTZFT1/tAupAH A5DRa8kSOTw0dxEvNTTzifhU7061Q8tk9GjfVSratMNEOBCdRdc5KNoLbl+Zk2E9RugkNo FLtMXQWwRnmDgbuX57p7NzKR+99HRG9Q6xBW51yd6L4bc2wDlbycP0QBbiMzSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZDvd251ZzzxHj; Fri, 14 Mar 2025 19:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52EJVoKb047028; Fri, 14 Mar 2025 19:31:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EJVopM047025; Fri, 14 Mar 2025 19:31:50 GMT (envelope-from git) Date: Fri, 14 Mar 2025 19:31:50 GMT Message-Id: <202503141931.52EJVopM047025@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jesper Schmitz Mouridsen Subject: git: bc12fec03491 - main - net/wifi-firmware-mtw-kmod: Rename to net/wifi-firmware-mt7601u-kmod List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jsm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc12fec03491d256f161fc3dccdd02e6df845753 Auto-Submitted: auto-generated The branch main has been updated by jsm: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc12fec03491d256f161fc3dccdd02e6df845753 commit bc12fec03491d256f161fc3dccdd02e6df845753 Author: Jesper Schmitz Mouridsen AuthorDate: 2025-03-14 19:21:39 +0000 Commit: Jesper Schmitz Mouridsen CommitDate: 2025-03-14 19:31:24 +0000 net/wifi-firmware-mtw-kmod: Rename to net/wifi-firmware-mt7601u-kmod Fixes also the flavor part, so that the specific pkg includes the binary firmware Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D48944 --- MOVED | 1 + net/Makefile | 2 +- net/wifi-firmware-kmod/Makefile | 5 ++++- net/wifi-firmware-kmod/Makefile.inc | 2 +- net/wifi-firmware-mt7601u-kmod/Makefile | 17 +++++++++++++++++ net/wifi-firmware-mt7601u-kmod/distinfo | 7 +++++++ .../pkg-descr | 0 net/wifi-firmware-mtw-kmod/Makefile | 17 ----------------- net/wifi-firmware-mtw-kmod/distinfo | 7 ------- 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/MOVED b/MOVED index 6d1116130698..dbdd71430eca 100644 --- a/MOVED +++ b/MOVED @@ -4206,3 +4206,4 @@ sysutils/tracker-miners||2025-03-05|Retired upstream sysutils/tracker||2025-03-05|Replaced long ago by tracker3 and now tinysparql net-im/talkatu||2025-03-10|Has expired: Upstream has switched to mercurial and upstream development has stopped textproc/py-towncrier23|textproc/py-towncrier|2025-03-14|Remove obsoleted port. Use textproc/py-towncrier instead +net/wifi-firmware-mtw-kmod|net/wifi-firmware-mt7601u-kmod|2025-03-14|Fixed to match firmware name diff --git a/net/Makefile b/net/Makefile index b12fa701a943..de43dfad4e1b 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1670,7 +1670,7 @@ SUBDIR += wifi-firmware-iwlwifi-kmod SUBDIR += wifi-firmware-kmod SUBDIR += wifi-firmware-mt76-kmod - SUBDIR += wifi-firmware-mtw-kmod + SUBDIR += wifi-firmware-mt7601u-kmod SUBDIR += wifi-firmware-rtw88-kmod SUBDIR += wifi-firmware-rtw89-kmod SUBDIR += wifibox diff --git a/net/wifi-firmware-kmod/Makefile b/net/wifi-firmware-kmod/Makefile index 2557dd66ad13..67a9ef2e3fbe 100644 --- a/net/wifi-firmware-kmod/Makefile +++ b/net/wifi-firmware-kmod/Makefile @@ -27,7 +27,10 @@ RUN_DEPENDS= \ wifi-firmware-rtw89-kmod-rtw8852a>0:net/wifi-firmware-rtw89-kmod@rtw8852a \ wifi-firmware-rtw89-kmod-rtw8852b>0:net/wifi-firmware-rtw89-kmod@rtw8852b \ wifi-firmware-rtw89-kmod-rtw8852c>0:net/wifi-firmware-rtw89-kmod@rtw8852c \ - wifi-firmware-rtw89-kmod-rtw8922a>0:net/wifi-firmware-rtw89-kmod@rtw8922a + wifi-firmware-rtw89-kmod-rtw8922a>0:net/wifi-firmware-rtw89-kmod@rtw8922a \ + \ + wifi-firmware-mt7601u-kmod>0:net/wifi-firmware-mt7601u-kmod + .if ${FLAVOR:U} != release RUN_DEPENDS+= \ diff --git a/net/wifi-firmware-kmod/Makefile.inc b/net/wifi-firmware-kmod/Makefile.inc index c8de13d05776..cd38aa13b065 100644 --- a/net/wifi-firmware-kmod/Makefile.inc +++ b/net/wifi-firmware-kmod/Makefile.inc @@ -1,6 +1,6 @@ PORTNAME= wifi-firmware-${FWDRV}-kmod PORTVERSION= ${FWDRV_VERSION} -PORTREVISION= 1 +PORTREVISION?= 1 CATEGORIES= net MASTER_SITES= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/ \ https://ams.source.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/ \ diff --git a/net/wifi-firmware-mt7601u-kmod/Makefile b/net/wifi-firmware-mt7601u-kmod/Makefile new file mode 100644 index 000000000000..4462d85747ed --- /dev/null +++ b/net/wifi-firmware-mt7601u-kmod/Makefile @@ -0,0 +1,17 @@ +BASEDIR= ${.CURDIR}/../wifi-firmware-kmod +PORTREVISION=2 +FWDRV=mt7601u +FWSUBDIR= mediatek +FWDRV_VERSION= 20241017 + +LICENSE_FILE= LICENCE.ralink_a_mediatek_company_firmware +LICENSE_NAME= Ralink, A MediaTek Company license (${FWDRV}) + +WHENCE_REGEX=mt7601u +FWSUBS= #No flavors + +DISTFILES_${FWDRV}=\ + ${FWSUBDIR}/mt7601u.bin${DISTURL_SUFFIX} +DISTFILES_${FWDRV}_lic= + +.include "${BASEDIR}/Makefile.inc" diff --git a/net/wifi-firmware-mt7601u-kmod/distinfo b/net/wifi-firmware-mt7601u-kmod/distinfo new file mode 100644 index 000000000000..f3c781108508 --- /dev/null +++ b/net/wifi-firmware-mt7601u-kmod/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1739475756 +SHA256 (linux-firmware/mt7601ufw/mediatek/mt7601u.bin?h=20241017) = 4511b1d840e22aea2bf5fdca419c91c0d94cbfb291b9ac4f8be6d9100d1a7046 +SIZE (linux-firmware/mt7601ufw/mediatek/mt7601u.bin?h=20241017) = 45412 +SHA256 (linux-firmware/mt7601ufw/LICENCE.ralink_a_mediatek_company_firmware?h=20241017) = 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 +SIZE (linux-firmware/mt7601ufw/LICENCE.ralink_a_mediatek_company_firmware?h=20241017) = 2100 +SHA256 (linux-firmware/mt7601ufw/WHENCE?h=20241017) = 7851ae8e04d71ccfc741fd2df450ef5724c4a172a0a282f69e8a8ce44877ba84 +SIZE (linux-firmware/mt7601ufw/WHENCE?h=20241017) = 291838 diff --git a/net/wifi-firmware-mtw-kmod/pkg-descr b/net/wifi-firmware-mt7601u-kmod/pkg-descr similarity index 100% rename from net/wifi-firmware-mtw-kmod/pkg-descr rename to net/wifi-firmware-mt7601u-kmod/pkg-descr diff --git a/net/wifi-firmware-mtw-kmod/Makefile b/net/wifi-firmware-mtw-kmod/Makefile deleted file mode 100644 index 02b2c7676051..000000000000 --- a/net/wifi-firmware-mtw-kmod/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -BASEDIR= ${.CURDIR}/../wifi-firmware-kmod - -FWDRV= mtw -FWSUBDIR= mediatek -FWDRV_VERSION= 20241017 - -WHENCE_REGEX= mt7601u -FWSUBS= mt7601u - -LICENSE_FILE= LICENCE.mediatek -LICENSE_NAME= mediatek - -DISTFILES_mtw=${FWSUBDIR}/mt7601u.bin - -DISTFILES_mtw_lic=${LICENCE_FILE} - -.include "${BASEDIR}/Makefile.inc" diff --git a/net/wifi-firmware-mtw-kmod/distinfo b/net/wifi-firmware-mtw-kmod/distinfo deleted file mode 100644 index cc1c11904b36..000000000000 --- a/net/wifi-firmware-mtw-kmod/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1738597992 -SHA256 (linux-firmware/mtwfw/mediatek/mt7601u.bin) = 4511b1d840e22aea2bf5fdca419c91c0d94cbfb291b9ac4f8be6d9100d1a7046 -SIZE (linux-firmware/mtwfw/mediatek/mt7601u.bin) = 45412 -SHA256 (linux-firmware/mtwfw/LICENCE.mediatek?h=20241017) = a90d3f66704d85889945fec5525ea77622549da83aced1aac99828383f8f1805 -SIZE (linux-firmware/mtwfw/LICENCE.mediatek?h=20241017) = 561 -SHA256 (linux-firmware/mtwfw/WHENCE?h=20241017) = 7851ae8e04d71ccfc741fd2df450ef5724c4a172a0a282f69e8a8ce44877ba84 -SIZE (linux-firmware/mtwfw/WHENCE?h=20241017) = 291838