eebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dVSlD6Z4wz6L6DV for ; Mon, 15 Dec 2025 18:10:00 +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 4dVSlD0H2Zz4FyC for ; Mon, 15 Dec 2025 18:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822200; 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=cvPoVFuUdNnUTgQHLGYxU+NsF+kaerQk7K34H7vxiuA=; b=eARVckXT1iGdkD2oEXhPse1vs30f+eVCiVtgYgsfSw4mrQGFwyfrPSDAiZtDrzqs5l9//y NSfmUdFal1brPwekEDeGZTboVFU6qXn6OnykA9NUpWp8/XXPo/tFK6SO6FxYb31qC1bY6f QdamUFkIpkYAe2nS0dFysbaWfxTQ+/ls1HetTxKh7UTxZzxRaBJVdaIThKiKhscHn4XVY1 LNY3DM6PStpKjZ84AQVfl9AmjruLlnqAu9WIbldAgIX0TgOiGgId3hOxN7XqYLqbpIEHib QnGGRV1/nKKRuYLPAz8+bSPnSB4qdLzRv4NRgRyOscfIlh/htIXuh5EDiBtLbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822200; 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=cvPoVFuUdNnUTgQHLGYxU+NsF+kaerQk7K34H7vxiuA=; b=dTOI9TU4jtID0+DG7Gj9ZeB0NJYI3/ilpLADLkDwXn7M2ilwb2O1t8MvymYdjbZ3okNnIL /YhpiwrsNupbzD2yMxUXu5qirgP3MzB8zo3hmPO4GgZI//6RTyrOkv/IV7X8FoRAll60dW S9OcHtfToibQEBboNykOFSnka5m4+eOkDzbdPy6MLg7ozqFVkZ5clwfITuNOfeW2vszkMi vVR0glKyZhFHorMvY/vHPfwJeW5j3HM7pPiTNKlkON+NMY2p60udmlx9AO5tX3nZ/yWYMI PMbgpYOjv6LMVNeFWKpWfkJRhrodvP0NTuLV5t1oE9ULn+SD5ha33guwzj7arA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822200; a=rsa-sha256; cv=none; b=gexUjYV0fsjwzodQ2rvFfpNb1Qo1B74cx3EH3FBH8G0nmxw3HOHG2JEJO4uU2AW8ZJSpix 5fJpsKw0Stn0+BBUmThaLVav1Hev4XyCRomrNCw8MzLodSuYmnbMbfM8jYacoxV3Q4JYzZ G5dRnTsZhspgW6ryanClJBX+JHxrnWqf5TY927pgzKOOYwfG7Qe4SfAQW3w94A3lIVjFzI KOiHNQ+zWbErAeKLO4JepoGx9asxiGjYQYfNOftm5mAIpa4jxoJE0pMeWvOpSqoG+zFQqx NtSmamV2A3vc7A0Muygfx8KoHBnygFMBc4GDvd9xgv0Uyet4mSGtJHv/tQ3DcQ== 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 4dVSlC3PGczVrn for ; Mon, 15 Dec 2025 18:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2470c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:09:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f545f8824641 - stable/15 - iwmfw(4): fix spelling of the iwm8000C firmware. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f545f88246416514b09efde44879ba0eadfa1780 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:09:59 +0000 Message-Id: <69404ef7.2470c.3392c9d2@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f545f88246416514b09efde44879ba0eadfa1780 commit f545f88246416514b09efde44879ba0eadfa1780 Author: Bjoern A. Zeeb AuthorDate: 2025-12-08 03:03:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-15 18:09:21 +0000 iwmfw(4): fix spelling of the iwm8000C firmware. When migrating the firmware to be installed as plain firmware files to /boot/firmware the iwm8000C firmware lost its "fw" suffix that iwm(4) expects. The follow-up change to defaults/loader.conf is also consistently missing the "fw". Fix both places, and add the wrongly spelt version to ObsoleteFiles.inc (entirely untested). PR: 291403 Reported by: Augustin Hoffmann (avgwst tutanota.de) Fixes: af0a81b6470aba4af4a24ae9804053722846ded4 Fixes: a0f06dfb0d188966bee7265ec7d9f20093186bb6 (cherry picked from commit f0ea859229843affe07ac94db915489756f87096) --- ObsoleteFiles.inc | 3 +++ share/firmwares/iwm/Makefile | 2 +- stand/defaults/loader.conf | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8b08bc5ff496..1390c072afbc 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251208: Rename iwm8000C to correct name. +OLD_FILES+=boot/firmware/iwm8000C + # 20251204: zpfind.9 alias to pfind.9 removed OLD_FILES+=usr/share/man/man9/zpfind.9 diff --git a/share/firmwares/iwm/Makefile b/share/firmwares/iwm/Makefile index c44f401c315e..0a242513fa3d 100644 --- a/share/firmwares/iwm/Makefile +++ b/share/firmwares/iwm/Makefile @@ -41,7 +41,7 @@ iwm7265DMODE= 644 iwm7265DPACKAGE= firmware-iwm iwm8000C= ${SRCTOP}/sys/contrib/dev/iwm/iwm-8000C-22.fw -iwm8000CNAME= iwm8000C +iwm8000CNAME= iwm8000Cfw iwm8000CDIR= /boot/firmware iwm8000CMODE= 644 iwm8000CPACKAGE= firmware-iwm diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 036479d22285..71fb052cd21b 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -195,5 +195,5 @@ iwm8265fw_type="firmware" iwm9260fw_type="firmware" iwm3168fw_type="firmware" iwm7265Dfw_type="firmware" -iwm8000C_type="firmware" +iwm8000Cfw_type="firmware" iwm9000fw_type="firmware"