From nobody Thu Dec 11 23:26:27 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 4dS7yC4V5Rz6KYCY for ; Thu, 11 Dec 2025 23:26:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dS7yC3Fl1z40fV for ; Thu, 11 Dec 2025 23:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765495587; 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=4KKh+O31hNIAYz4Z3i2sAhTU73dwrTb2XZzmjKMy560=; b=LrLdtmNhTV6pHkTjJ4830iqAeY7Am7eMv+XNbozhflJZIwPAoXLvQNHzsCDBGRz/h10RyZ Z2NmFUHmu1Cvh66e0MVAu9ffA/0Dv5EbSOVztfTD3bIGA1SOGHaxxAqSUn4gMASymM59Ch HHxzBfGwCd6kok5Sw6nyDoMRweRJrspUqxG5G230fzwgqQzTjVyAL+rJ9kG1TtqYQuJ+QS PJjjEWprJO7+cbb9riWczxd17JrSewndB99Plf2SrMHTCO5bJdrd34zRhEjFyZplfQol3p Jayvcr7O6sHzLlE9Tcoes5l/DFCXt80dbonmG1v91kKhrRhacDvVnxl5n59csg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765495587; 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=4KKh+O31hNIAYz4Z3i2sAhTU73dwrTb2XZzmjKMy560=; b=VtAy+9YvpY53GxeTY2YxOebZsHEU2oa6ogSKH+0Sw7hUfTr8OvLgyTjMfD2Vn06EaQT+Px hCQ5ti4kiT4JhimrLARemG/2kO9Jefm7Q80Iuj6b1xFD5j0M8RqxsogHaSOsc9EiSfjjiA 9vlsfb6sruk7DHS/4Nw3vR7yPH9VFRIHBzrPC1DySsTyU+usCbBjM0U2CkpmdbsdFKeT4o VLjtbpePL5ceQOqs2jFwBqa+mH/G5EQmgjOJVtH1ywLvAWjqD+M6/Kx+UQYDQW/3oWmEg3 MAJUiUFqVCPfk1GMkUVRgi/M9JuF9DhAVNtQAyQqbGIerD7ZPBvMSZzq8JjuhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765495587; a=rsa-sha256; cv=none; b=WH1Q0kraIT+H8n3xnqTB6Gf5noqQ/0+LwTYV0p1a1vMYCsGxKmwO45E9GkB4azgM7sSjgm 3PAwqu5sRP1tdUEATAMQJzqNmeZ6x3HdX4huRu5WabUWGd9HckKUsW3np3mu10vAtscm3Y A61VXWQbNRG+KB7yo+Hx7FdT5W5oUIkYV8NiNN+iTR57ANHrmboO04XNL8Fq4LdQ91LaRI 0mLRZk9ovhNzLDsvjGLMHaqd73mt2ajO3ta7vQM04P2yIGMJM3UXtwP4RQLNPcu6t5HMxW dkYykdXZlB2/oUrd6shpSj+nJsB0uEkRNyKzFtB2NRewgLT9sHxovoAD69y04g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dS7yC2pgSzsMX for ; Thu, 11 Dec 2025 23:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 930e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Dec 2025 23:26:27 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 155a1013e551 - main - net/wifi-firmware-kmod: add STRIP_FWSUBDIR logic 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: bz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 155a1013e551f568f1a436ee619e30ef9b1d4346 Auto-Submitted: auto-generated Date: Thu, 11 Dec 2025 23:26:27 +0000 Message-Id: <693b5323.930e.3f822f0@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/ports/commit/?id=155a1013e551f568f1a436ee619e30ef9b1d4346 commit 155a1013e551f568f1a436ee619e30ef9b1d4346 Author: Bjoern A. Zeeb AuthorDate: 2025-11-11 01:20:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-11 23:26:09 +0000 net/wifi-firmware-kmod: add STRIP_FWSUBDIR logic iwlwififw(4) got moved into a subdirectory in the linux-firmware.git but the driver still expects the firmware at the toplevel. The longer-term solution would be to create symlinks as the WHENCE file indicates but for the moment use the less intrusive version simply stripping the subdir during 'extract'. Sponsored by: The FreeBSD Foundation Reported by: jrm Differential Revision: https://reviews.freebsd.org/D53680 --- net/wifi-firmware-kmod/Makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/wifi-firmware-kmod/Makefile.inc b/net/wifi-firmware-kmod/Makefile.inc index 0aca6067f1d1..7719f65847d2 100644 --- a/net/wifi-firmware-kmod/Makefile.inc +++ b/net/wifi-firmware-kmod/Makefile.inc @@ -130,9 +130,9 @@ post-extract: ################################################################################ .for _f in ${DISTFILES_${FLAVOR}:O:u} # Create firmware source directory and copy in distfile. - @${MKDIR} ${WRKSRC}/fw/${_f:H} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${_f} ${WRKSRC}/fw/${_f:C@(^[^?]*)${DISTURL_SUFFIX:Q}@\1@} - @${ECHO_CMD} ${BOOTFWDIR}/${_f:C@(^[^?]*)${DISTURL_SUFFIX:Q}@\1@} >> ${PLIST}.tmp + @${MKDIR} ${WRKSRC}/fw/${_f:S@${STRIP_FWSUBDIR:Q}@@:H} + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${_f} ${WRKSRC}/fw/${_f:C@(^[^?]*)${DISTURL_SUFFIX:Q}@\1@:S@${STRIP_FWSUBDIR:Q}@@} + @${ECHO_CMD} ${BOOTFWDIR}/${_f:C@(^[^?]*)${DISTURL_SUFFIX:Q}@\1@:S@${STRIP_FWSUBDIR:Q}@@} >> ${PLIST}.tmp .endfor # Create PLIST for firmware files. (cd ${WRKSRC}/fw/ && ${FIND} . -type d -mindepth 1 | \